diff --git a/README.md b/README.md index 2d313ca37..9870e4a84 100755 --- a/README.md +++ b/README.md @@ -64,7 +64,8 @@ To get started with the Watson Services in Unity, click on each service below to * [Assistant](/Scripts/Services/Assistant/v1) * [Conversation](/Scripts/Services/Conversation/v1) * [Discovery](/Scripts/Services/Discovery/v1) -* [Language Translator](/Scripts/Services/LanguageTranslator/v2) +* [Language Translator V2](/Scripts/Services/LanguageTranslator/v2) +* [Language Translator V3](/Scripts/Services/LanguageTranslator/v3) * [Natural Language Classifier](/Scripts/Services/NaturalLanguageClassifier/v2) * [Natural Language Understanding](/Scripts/Services/NaturalLanguageUnderstanding/v1) * [Personality Insights](/Scripts/Services/PersonalityInsights/v3) diff --git a/Scripts/UnitTests/TestLanguageTranslatorV2.cs b/Scripts/UnitTests/TestLanguageTranslatorV2.cs index 939651255..df4c9edaa 100644 --- a/Scripts/UnitTests/TestLanguageTranslatorV2.cs +++ b/Scripts/UnitTests/TestLanguageTranslatorV2.cs @@ -80,7 +80,7 @@ public override IEnumerator RunTest() throw new WatsonException(r.FormattedMessages); // Set credentials from imported credntials - Credential credential = vcapCredentials.GetCredentialByname("language-translator-sdk")[0].Credentials; + Credential credential = vcapCredentials.GetCredentialByname("language-translator-sdk-v2-sdk-cf")[0].Credentials; _username = credential.Username.ToString(); _password = credential.Password.ToString(); _url = credential.Url.ToString(); diff --git a/Scripts/UnitTests/TestLanguageTranslatorV3CF.cs b/Scripts/UnitTests/TestLanguageTranslatorV3CF.cs index 9e27bfc64..bd4e6d1b2 100644 --- a/Scripts/UnitTests/TestLanguageTranslatorV3CF.cs +++ b/Scripts/UnitTests/TestLanguageTranslatorV3CF.cs @@ -81,7 +81,7 @@ public override IEnumerator RunTest() throw new WatsonException(r.FormattedMessages); // Set credentials from imported credntials - Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-cf-staging")[0].Credentials; + Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-sdk-cf")[0].Credentials; _username = credential.Username.ToString(); _password = credential.Password.ToString(); _url = credential.Url.ToString(); diff --git a/Scripts/UnitTests/TestLanguageTranslatorV3RC.cs b/Scripts/UnitTests/TestLanguageTranslatorV3RC.cs index 83a8d92df..abe227e29 100644 --- a/Scripts/UnitTests/TestLanguageTranslatorV3RC.cs +++ b/Scripts/UnitTests/TestLanguageTranslatorV3RC.cs @@ -30,22 +30,13 @@ namespace IBM.Watson.DeveloperCloud.UnitTests public class TestLanguageTranslatorV3RC : UnitTest { private string _pharseToTranslate = "Hello, welcome to IBM Watson!"; - private string _username = null; - private string _password = null; - //private string _token = ""; private fsSerializer _serializer = new fsSerializer(); private LanguageTranslator _languageTranslator; - private string _baseModelName = "en-es"; - private string _customModelName = "Texan"; - private string _forcedGlossaryFilePath; - private string _customLanguageModelId; private bool _getTranslationTested = false; private bool _getModelsTested = false; - private bool _createModelTested = false; private bool _getModelTested = false; - private bool _deleteModelTested = false; private bool _identifyTested = false; private bool _getLanguagesTested = false; private string _versionDate = "2018-05-01"; @@ -81,7 +72,7 @@ public override IEnumerator RunTest() throw new WatsonException(r.FormattedMessages); // Set credentials from imported credntials - Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-iam-staging")[0].Credentials; + Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-sdk-rc-wdc")[0].Credentials; _url = credential.Url.ToString(); // Create credential and instantiate service @@ -99,8 +90,6 @@ public override IEnumerator RunTest() _languageTranslator = new LanguageTranslator(_versionDate, credentials); - _forcedGlossaryFilePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/glossary.tmx"; - if (!_languageTranslator.GetTranslation(OnGetTranslation, OnFail, _pharseToTranslate, "en", "es")) Log.Debug("TestLanguageTranslator.GetTranslation()", "Failed to translate."); while (!_getTranslationTested) @@ -111,21 +100,11 @@ public override IEnumerator RunTest() while (!_getModelsTested) yield return null; - if (!_languageTranslator.CreateModel(OnCreateModel, OnFail, _baseModelName, _customModelName, _forcedGlossaryFilePath)) - Log.Debug("TestLanguageTranslator.CreateModel()", "Failed to create model."); - while (!_createModelTested) - yield return null; - - if (!_languageTranslator.GetModel(OnGetModel, OnFail, _customLanguageModelId)) + if (!_languageTranslator.GetModel(OnGetModel, OnFail, "en-es")) Log.Debug("TestLanguageTranslator.GetModel()", "Failed to get model."); while (!_getModelTested) yield return null; - if (!_languageTranslator.DeleteModel(OnDeleteModel, OnFail, _customLanguageModelId)) - Log.Debug("TestLanguageTranslator.DeleteModel()", "Failed to delete model."); - while (!_deleteModelTested) - yield return null; - if (!_languageTranslator.Identify(OnIdentify, OnFail, _pharseToTranslate)) Log.Debug("TestLanguageTranslator.Identify()", "Failed to identify language."); while (!_identifyTested) @@ -148,14 +127,6 @@ private void OnGetModels(TranslationModels models, Dictionary cu _getModelsTested = true; } - private void OnCreateModel(TranslationModel model, Dictionary customData) - { - Log.Debug("TestLanguageTranslator.OnCreateModel()", "Language Translator - Create model response: {0}", customData["json"].ToString()); - _customLanguageModelId = model.model_id; - Test(model != null); - _createModelTested = true; - } - private void OnGetModel(TranslationModel model, Dictionary customData) { Log.Debug("TestLanguageTranslator.OnGetModel()", "Language Translator - Get model response: {0}", customData["json"].ToString()); @@ -163,14 +134,6 @@ private void OnGetModel(TranslationModel model, Dictionary custo _getModelTested = true; } - private void OnDeleteModel(DeleteModelResult deleteModelResult, Dictionary customData) - { - Log.Debug("TestLanguageTranslator.OnDeleteModel()", "Language Translator - Delete model response: success: {0}", customData["json"].ToString()); - _customLanguageModelId = null; - Test(deleteModelResult != null); - _deleteModelTested = true; - } - private void OnGetTranslation(Translations translation, Dictionary customData) { Log.Debug("TestLanguageTranslator.OnGetTranslation()", "Langauge Translator - Translate Response: {0}", customData["json"].ToString()); diff --git a/Scripts/UnitTests/TestVisualRecognitionCF.cs b/Scripts/UnitTests/TestVisualRecognitionCF.cs index 9c47d6560..fa22b6eb8 100644 --- a/Scripts/UnitTests/TestVisualRecognitionCF.cs +++ b/Scripts/UnitTests/TestVisualRecognitionCF.cs @@ -19,6 +19,8 @@ //#define TRAIN_CLASSIFIER // Uncommnent to delete the trained classifier //#define DELETE_TRAINED_CLASSIFIER +// Uncomment to test CF +//#define TEST_CF using UnityEngine; using System.Collections; @@ -32,6 +34,7 @@ namespace IBM.Watson.DeveloperCloud.UnitTests { +#if TEST_CF public class TestVisualRecognitionCF : UnitTest { private string _apikey; @@ -93,7 +96,7 @@ public override IEnumerator RunTest() throw new WatsonException(r.FormattedMessages); // Set credentials from imported credntials - Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk")[0].Credentials; + Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk-cf")[0].Credentials; _apikey = credential.ApiKey.ToString(); _url = credential.Url.ToString(); @@ -314,4 +317,5 @@ private void OnFail(RESTConnector.Error error, Dictionary custom Log.Error("TestVisualRecognition.OnFail()", "Error received: {0}", error.ToString()); } } +#endif } diff --git a/Scripts/UnitTests/TestVisualRecognitionRC.cs b/Scripts/UnitTests/TestVisualRecognitionRC.cs index 7bdfee173..680f42c75 100644 --- a/Scripts/UnitTests/TestVisualRecognitionRC.cs +++ b/Scripts/UnitTests/TestVisualRecognitionRC.cs @@ -20,7 +20,7 @@ // Uncommnent to delete the trained classifier //#define DELETE_TRAINED_CLASSIFIER // Uncomment to test RC -//#define TEST_RC +#define TEST_RC using UnityEngine; using System.Collections; @@ -96,7 +96,7 @@ public override IEnumerator RunTest() throw new WatsonException(r.FormattedMessages); // Set credentials from imported credntials - Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-iam-sdk")[0].Credentials; + Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk-rc")[0].Credentials; // Create credential and instantiate service TokenOptions tokenOptions = new TokenOptions()