integration tests

Author: mediumTaj

Examples/ServiceExamples/Scripts/ExampleSpeechToText.cs

@@ -44,10 +44,10 @@ void Start()
 		//TestCreateSession("en-US_BroadbandModel");
 
 		//	test GetCustomizations
-		TestGetCustomizations();
+		//TestGetCustomizations();
 
 		//	test create, get and delete customizations
-		TestCreateCustomization();
+		//TestCreateCustomization();
     }
 
 	private void TestGetModels()
@@ -125,31 +125,31 @@ private void TestAddCustomCorpus(string customizationID, string corpusName, bool
 	private void TestGetCustomWords()
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to get custom words.");
-		m_SpeechToText.GetCustomWords(OnGetCustomWords, m_CreatedCustomizationID);
+		m_SpeechToText.GetCustomWords(HandleGetCustomWords, m_CreatedCustomizationID);
 	}
 
 	private void TestAddCustomWordsPath(string customizationID, string wordsJsonPath)
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to add custom words in customization {0} using Words json path {1}", customizationID, wordsJsonPath);
-		m_SpeechToText.AddCustomWords(OnAddCustomWords, customizationID, wordsJsonPath);
+		m_SpeechToText.AddCustomWords(HandleAddCustomWords, customizationID, wordsJsonPath);
 	}
 
 	private void TestAddCustomWordsWordsObject(string customizationID, Words words)
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to add custom words in customization {0} using Words object", customizationID);
-		m_SpeechToText.AddCustomWords(OnAddCustomWords, customizationID, words);
+		m_SpeechToText.AddCustomWords(HandleAddCustomWords, customizationID, words);
 	}
 
 	private void TestDeleteCustomWord(string customizationID, string word)
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to delete custom word {1} in customization {0}", customizationID, word);
-		m_SpeechToText.DeleteCustomWord(OnDeleteCustomWord, customizationID, word);
+		m_SpeechToText.DeleteCustomWord(HandleDeleteCustomWord, customizationID, word);
 	}
 
 	private void TestGetCustomWord(string customizationID, string word)
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to get custom word {1} in customization {0}", customizationID, word);
-		m_SpeechToText.GetCustomWord(OnGetCustomWord, customizationID, word);
+		m_SpeechToText.GetCustomWord(HandleGetCustomWord, customizationID, word);
 	}
 
 
@@ -203,7 +203,7 @@ private void HandleOnRecognize (SpeechRecognitionEvent result)
 				foreach( var alt in res.alternatives )
 				{
 					string text = alt.transcript;
-					Debug.Log(string.Format( "{0} ({1}, {2:0.00})\n", text, res.final ? "Final" : "Interim", alt.confidence));
+					Log.Debug("ExampleSpeechToText", string.Format( "{0} ({1}, {2:0.00})\n", text, res.final ? "Final" : "Interim", alt.confidence));
 				}
 			}
 		}
@@ -402,7 +402,7 @@ private void HandleAddCustomCorpus(bool success, string customData)
 		}
 	}
 
-	private void OnGetCustomWords(WordsList wordList, string customData)
+	private void HandleGetCustomWords(WordsList wordList, string customData)
 	{
 		if (!string.IsNullOrEmpty(customData))
 			Log.Debug("ExampleSpeechToText", "custom data: {0}", customData);
@@ -425,7 +425,7 @@ private void OnGetCustomWords(WordsList wordList, string customData)
 		}
 	}
 
-	private void OnAddCustomWords(bool success, string customData)
+	private void HandleAddCustomWords(bool success, string customData)
 	{
 		if (!string.IsNullOrEmpty(customData))
 			Log.Debug("ExampleSpeechToText", "custom data: {0}", customData);
@@ -441,7 +441,7 @@ private void OnAddCustomWords(bool success, string customData)
 		}
 	}
 
-	private void OnDeleteCustomWord(bool success, string customData)
+	private void HandleDeleteCustomWord(bool success, string customData)
 	{
 		if (!string.IsNullOrEmpty(customData))
 			Log.Debug("ExampleSpeechToText", "custom data: {0}", customData);
@@ -457,7 +457,7 @@ private void OnDeleteCustomWord(bool success, string customData)
 		}
 	}
 
-	private void OnGetCustomWord(WordData word, string customData)
+	private void HandleGetCustomWord(WordData word, string customData)
 	{
 		if (!string.IsNullOrEmpty(customData))
 			Log.Debug("ExampleSpeechToText", "custom data: {0}", customData);

Examples/ServiceExamples/TestData/test-stt-words.json

@@ -0,0 +1,25 @@
+{
+  "words": [
+    {
+      "word": "watson",
+      "sounds_like": [
+        "wat son"
+      ],
+      "display_as": "Watson"
+    },
+    {
+      "word": "unity",
+      "sounds_like": [
+        "you ni tee"
+      ],
+      "display_as": "Unity"
+    },
+    {
+      "word": "sdk",
+      "sounds_like": [
+        "S.D.K."
+      ],
+      "display_as": "SDK"
+    }
+  ]
+}

Examples/ServiceExamples/TestData/test-stt-words.json.meta

@@ -670,7 +670,7 @@ public class Word
 		/// <summary>
 		/// What the word sounds like.
 		/// </summary>
-		public string sounds_like { get; set; }
+		public string[] sounds_like { get; set; }
 		/// <summary>
 		/// How the word is displayed.
 		/// </summary>

Scripts/Services/SpeechToText/DataModels.cs

@@ -901,7 +901,7 @@ private void OnGetCustomizationsResp(RESTConnector.Request req, RESTConnector.Re
 			CustomLanguage customLanguage = new CustomLanguage();
 			customLanguage.name = name;
 			customLanguage.base_model_name = base_model_name;
-			customLanguage.description = description;
+			customLanguage.description = string.IsNullOrEmpty(description) ? name : description;
 
 			fsData data;
 			sm_Serializer.TrySerialize(customLanguage.GetType(), customLanguage, out data).AssertSuccessWithoutWarnings();
@@ -1484,7 +1484,7 @@ private void OnDeleteCustomCorpusResp(RESTConnector.Request req, RESTConnector.R
 			req.Data = customData;
 			req.Headers["Content-Type"] = "application/x-www-form-urlencoded";
 			req.Headers["Accept"] = "application/json";
-			req.Parameters["allow_overwrite"] = allowOverwrite;
+			req.Parameters["allow_overwrite"] = allowOverwrite.ToString();
 			req.Forms = new Dictionary<string, RESTConnector.Form>();
 			req.Forms["body"] = new RESTConnector.Form(trainingData, "trainingData.txt", "text/plain");
 			req.OnResponse = OnAddCustomCorpusResp;
@@ -1628,7 +1628,9 @@ private void OnGetCustomWordsResp(RESTConnector.Request req, RESTConnector.Respo
 			if (string.IsNullOrEmpty(wordsJsonPath))
 				throw new ArgumentNullException("A wordsJsonPath is required to add words to a custom language model.");
 
-			return AddCustomWords(callback, customizationID, File.ReadAllText(wordsJsonPath));
+			string wordsJson = File.ReadAllText(wordsJsonPath);
+
+			return AddCustomWords(callback, customizationID, wordsJson);
 		}
 
 		public bool AddCustomWords(AddCustomWordsCallback callback, string customizationID, Words words, string customData = default(string))