add a unit test index to select credential index for all unit tests

mediumTaj · mediumTaj · commit 2bc73d277603 · 2017-08-15T16:35:45.000-05:00
diff --git a/Examples/ServiceExamples/Scripts/ExampleConversation.cs b/Examples/ServiceExamples/Scripts/ExampleConversation.cs
@@ -69,7 +69,7 @@ void Start()
             throw new WatsonException(r.FormattedMessages);
 
         //  Set credentials from imported credntials
-        Credential credential = vcapCredentials.VCAP_SERVICES["conversation"][0].Credentials;
+        Credential credential = vcapCredentials.VCAP_SERVICES["conversation"][1].Credentials;
         _username = credential.Username.ToString();
         _password = credential.Password.ToString();
         _url = credential.Url.ToString();
diff --git a/Scripts/Editor/Help/Working/obj/Debug.meta b/Scripts/Editor/Help/Working/obj/Debug.meta
diff --git a/Scripts/UnitTests/TestAlchemyLanguage.cs b/Scripts/UnitTests/TestAlchemyLanguage.cs
@@ -30,7 +30,6 @@ namespace IBM.Watson.DeveloperCloud.UnitTests
     public class TestAlchemyAPI : UnitTest
     {
         private string _apikey;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
 
         private AlchemyAPI _alchemyAPI;
@@ -134,7 +133,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["alchemy_api"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["alchemy_api"][TestCredentialIndex].Credentials;
             _apikey = credential.Apikey.ToString();
             _url = credential.Url.ToString();
 
diff --git a/Scripts/UnitTests/TestConversation.cs b/Scripts/UnitTests/TestConversation.cs
@@ -29,7 +29,6 @@ public class TestConversation : UnitTest
 {
     private string _username;
     private string _password;
-    private string _url;
     private string _workspaceId;
     //private string _token = "<authentication-token>";
 
@@ -69,7 +68,7 @@ public override IEnumerator RunTest()
             throw new WatsonException(r.FormattedMessages);
 
         //  Set credentials from imported credntials
-        Credential credential = vcapCredentials.VCAP_SERVICES["conversation"][0].Credentials;
+        Credential credential = vcapCredentials.VCAP_SERVICES["conversation"][TestCredentialIndex].Credentials;
         _username = credential.Username.ToString();
         _password = credential.Password.ToString();
         _url = credential.Url.ToString();
@@ -161,6 +160,8 @@ private void OnMessage(object resp, string data)
             _context = _tempContext as Dictionary<string, object>;
         else
             Log.Debug("ExampleConversation", "Failed to get context");
+
+        Test(messageResponse != null);
         _waitingForResponse = false;
     }
 }
diff --git a/Scripts/UnitTests/TestDiscovery.cs b/Scripts/UnitTests/TestDiscovery.cs
@@ -29,7 +29,6 @@ public class TestDiscovery : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -98,7 +97,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["discovery"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["discovery"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestDocumentConversion.cs b/Scripts/UnitTests/TestDocumentConversion.cs
@@ -31,7 +31,6 @@ public class TestDocumentConversion : UnitTest
         private DocumentConversion _documentConversion;
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -66,7 +65,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["document_conversion"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["document_conversion"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestLanguageTranslation.cs b/Scripts/UnitTests/TestLanguageTranslation.cs
@@ -89,7 +89,7 @@
 //        {
 //            Test(translation != null);
 //            if (translation != null && translation.translations.Length > 0)
-//                Log.Status("TestTranslate", "Translation: {0}", translation.translations[0].translation);
+//                Log.Status("TestTranslate", "Translation: {0}", translation.translations[TestCredentialIndex].translation);
 //            m_TranslateTested = true;
 //        }
 
diff --git a/Scripts/UnitTests/TestLanguageTranslator.cs b/Scripts/UnitTests/TestLanguageTranslator.cs
@@ -31,7 +31,6 @@ public class TestLanguageTranslator : UnitTest
         private string _pharseToTranslate = "Hello, welcome to IBM Watson!";
         private string _username;
         private string _password;
-        private string _url;
         //private string _token = "<authentication-token>";
         private fsSerializer _serializer = new fsSerializer();
 
@@ -76,7 +75,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["language_translator"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["language_translator"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestNaturalLanguageClassifier.cs b/Scripts/UnitTests/TestNaturalLanguageClassifier.cs
@@ -36,7 +36,6 @@ public class TestNaturalLanguageClassifier : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -85,7 +84,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["natural_language_classifier"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["natural_language_classifier"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestNaturalLanguageUnderstanding.cs b/Scripts/UnitTests/TestNaturalLanguageUnderstanding.cs
@@ -29,7 +29,6 @@ public class TestNaturalLanguageUnderstanding : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -65,7 +64,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["natural_language_understanding"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["natural_language_understanding"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestPersonalityInsightsV3.cs b/Scripts/UnitTests/TestPersonalityInsightsV3.cs
@@ -32,7 +32,6 @@ public class TestPersonalityInsightsV3 : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
 
         private PersonalityInsights _personalityInsights;
@@ -72,7 +71,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["personality_insights"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["personality_insights"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestRetrieveAndRank.cs b/Scripts/UnitTests/TestRetrieveAndRank.cs
@@ -33,7 +33,6 @@ public class TestRetrieveAndRank : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -113,7 +112,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["retrieve_and_rank"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["retrieve_and_rank"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestSpeechToText.cs b/Scripts/UnitTests/TestSpeechToText.cs
@@ -32,7 +32,6 @@ public class TestSpeechToText : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -97,7 +96,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["speech_to_text"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["speech_to_text"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestTextToSpeech.cs b/Scripts/UnitTests/TestTextToSpeech.cs
@@ -30,7 +30,6 @@ public class TestTextToSpeech : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -85,7 +84,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["text_to_speech"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["text_to_speech"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestToneAnalyzer.cs b/Scripts/UnitTests/TestToneAnalyzer.cs
@@ -29,7 +29,6 @@ public class TestToneAnalyzer : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -66,7 +65,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["tone_analyzer"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["tone_analyzer"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestTradeoffAnalytics.cs b/Scripts/UnitTests/TestTradeoffAnalytics.cs
@@ -31,7 +31,6 @@ public class TestTradeoffAnalytics : UnitTest
     {
         private string _username;
         private string _password;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
         //private string _token = "<authentication-token>";
 
@@ -66,7 +65,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["tradeoff_analytics"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["tradeoff_analytics"][TestCredentialIndex].Credentials;
             _username = credential.Username.ToString();
             _password = credential.Password.ToString();
             _url = credential.Url.ToString();
diff --git a/Scripts/UnitTests/TestVisualRecognition.cs b/Scripts/UnitTests/TestVisualRecognition.cs
@@ -35,7 +35,6 @@ namespace IBM.Watson.DeveloperCloud.UnitTests
     public class TestVisualRecognition : UnitTest
     {
         private string _apikey;
-        private string _url;
         private fsSerializer _serializer = new fsSerializer();
 
         private VisualRecognition _visualRecognition;
@@ -91,7 +90,7 @@ public override IEnumerator RunTest()
                 throw new WatsonException(r.FormattedMessages);
 
             //  Set credentials from imported credntials
-            Credential credential = vcapCredentials.VCAP_SERVICES["visual_recognition"][0].Credentials;
+            Credential credential = vcapCredentials.VCAP_SERVICES["visual_recognition"][TestCredentialIndex].Credentials;
             _apikey = credential.Apikey.ToString();
             _url = credential.Url.ToString();
 
diff --git a/Scripts/UnitTests/UnitTest.cs b/Scripts/UnitTests/UnitTest.cs
@@ -15,6 +15,9 @@
 *
 */
 
+//  Uncomment to print the current service endpoint.
+#define PRINT_ENDPOINT
+
 using IBM.Watson.DeveloperCloud.Logging;
 using System.Collections;
 using UnityEngine;
@@ -26,10 +29,17 @@ namespace IBM.Watson.DeveloperCloud.UnitTests
     /// </summary>
     public abstract class UnitTest
     {
+        /// <summary>
+        /// Which credential should the tests use. Default is 0.
+        /// </summary>
+        public int TestCredentialIndex = 0;
+
         public bool TestFailed { get; set; }
 
         public abstract IEnumerator RunTest();
 
+        protected string _url;
+
         /// <summary>
         /// Utility function that fails this test if false.
         /// </summary>
@@ -44,6 +54,9 @@ public void Test(bool condition)
             else
             {
                 Log.Status("UnitTest", "UnitTest {0} has passed.", GetType().Name);
+#if PRINT_ENDPOINT
+                Log.Status("UnitTest", "endpoint: {0}", _url);
+#endif
             }
         }
 
diff --git a/ThirdParty/WebSocketSharp/websocket-sharp.csproj.meta b/ThirdParty/WebSocketSharp/websocket-sharp.csproj.meta
