Skip to content

Commit 50f57e7

Browse files
mediumTajmediumTaj
authored
Merge pull request #403 from watson-developer-cloud/rc-2.4.0
Merge release changes into develop
2 parents a17b82a + 09a0c7e commit 50f57e7

File tree

6 files changed

+13
-45
lines changed

6 files changed

+13
-45
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ To get started with the Watson Services in Unity, click on each service below to
6464
* [Assistant](/Scripts/Services/Assistant/v1)
6565
* [Conversation](/Scripts/Services/Conversation/v1)
6666
* [Discovery](/Scripts/Services/Discovery/v1)
67-
* [Language Translator](/Scripts/Services/LanguageTranslator/v2)
67+
* [Language Translator V2](/Scripts/Services/LanguageTranslator/v2)
68+
* [Language Translator V3](/Scripts/Services/LanguageTranslator/v3)
6869
* [Natural Language Classifier](/Scripts/Services/NaturalLanguageClassifier/v2)
6970
* [Natural Language Understanding](/Scripts/Services/NaturalLanguageUnderstanding/v1)
7071
* [Personality Insights](/Scripts/Services/PersonalityInsights/v3)

‎Scripts/UnitTests/TestLanguageTranslatorV2.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public override IEnumerator RunTest()
8080
throw new WatsonException(r.FormattedMessages);
8181

8282
// Set credentials from imported credntials
83-
Credential credential = vcapCredentials.GetCredentialByname("language-translator-sdk")[0].Credentials;
83+
Credential credential = vcapCredentials.GetCredentialByname("language-translator-sdk-v2-sdk-cf")[0].Credentials;
8484
_username = credential.Username.ToString();
8585
_password = credential.Password.ToString();
8686
_url = credential.Url.ToString();

‎Scripts/UnitTests/TestLanguageTranslatorV3CF.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public override IEnumerator RunTest()
8181
throw new WatsonException(r.FormattedMessages);
8282

8383
// Set credentials from imported credntials
84-
Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-cf-staging")[0].Credentials;
84+
Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-sdk-cf")[0].Credentials;
8585
_username = credential.Username.ToString();
8686
_password = credential.Password.ToString();
8787
_url = credential.Url.ToString();

‎Scripts/UnitTests/TestLanguageTranslatorV3RC.cs‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,13 @@ namespace IBM.Watson.DeveloperCloud.UnitTests
3030
public class TestLanguageTranslatorV3RC : UnitTest
3131
{
3232
private string _pharseToTranslate = "Hello, welcome to IBM Watson!";
33-
private string _username = null;
34-
private string _password = null;
35-
//private string _token = "<authentication-token>";
3633
private fsSerializer _serializer = new fsSerializer();
3734

3835
private LanguageTranslator _languageTranslator;
39-
private string _baseModelName = "en-es";
40-
private string _customModelName = "Texan";
41-
private string _forcedGlossaryFilePath;
42-
private string _customLanguageModelId;
4336

4437
private bool _getTranslationTested = false;
4538
private bool _getModelsTested = false;
46-
private bool _createModelTested = false;
4739
private bool _getModelTested = false;
48-
private bool _deleteModelTested = false;
4940
private bool _identifyTested = false;
5041
private bool _getLanguagesTested = false;
5142
private string _versionDate = "2018-05-01";
@@ -81,7 +72,7 @@ public override IEnumerator RunTest()
8172
throw new WatsonException(r.FormattedMessages);
8273

8374
// Set credentials from imported credntials
84-
Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-iam-staging")[0].Credentials;
75+
Credential credential = vcapCredentials.GetCredentialByname("language-translator-v3-sdk-rc-wdc")[0].Credentials;
8576
_url = credential.Url.ToString();
8677

8778
// Create credential and instantiate service
@@ -99,8 +90,6 @@ public override IEnumerator RunTest()
9990

10091
_languageTranslator = new LanguageTranslator(_versionDate, credentials);
10192

102-
_forcedGlossaryFilePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/glossary.tmx";
103-
10493
if (!_languageTranslator.GetTranslation(OnGetTranslation, OnFail, _pharseToTranslate, "en", "es"))
10594
Log.Debug("TestLanguageTranslator.GetTranslation()", "Failed to translate.");
10695
while (!_getTranslationTested)
@@ -111,21 +100,11 @@ public override IEnumerator RunTest()
111100
while (!_getModelsTested)
112101
yield return null;
113102

114-
if (!_languageTranslator.CreateModel(OnCreateModel, OnFail, _baseModelName, _customModelName, _forcedGlossaryFilePath))
115-
Log.Debug("TestLanguageTranslator.CreateModel()", "Failed to create model.");
116-
while (!_createModelTested)
117-
yield return null;
118-
119-
if (!_languageTranslator.GetModel(OnGetModel, OnFail, _customLanguageModelId))
103+
if (!_languageTranslator.GetModel(OnGetModel, OnFail, "en-es"))
120104
Log.Debug("TestLanguageTranslator.GetModel()", "Failed to get model.");
121105
while (!_getModelTested)
122106
yield return null;
123107

124-
if (!_languageTranslator.DeleteModel(OnDeleteModel, OnFail, _customLanguageModelId))
125-
Log.Debug("TestLanguageTranslator.DeleteModel()", "Failed to delete model.");
126-
while (!_deleteModelTested)
127-
yield return null;
128-
129108
if (!_languageTranslator.Identify(OnIdentify, OnFail, _pharseToTranslate))
130109
Log.Debug("TestLanguageTranslator.Identify()", "Failed to identify language.");
131110
while (!_identifyTested)
@@ -148,29 +127,13 @@ private void OnGetModels(TranslationModels models, Dictionary<string, object> cu
148127
_getModelsTested = true;
149128
}
150129

151-
private void OnCreateModel(TranslationModel model, Dictionary<string, object> customData)
152-
{
153-
Log.Debug("TestLanguageTranslator.OnCreateModel()", "Language Translator - Create model response: {0}", customData["json"].ToString());
154-
_customLanguageModelId = model.model_id;
155-
Test(model != null);
156-
_createModelTested = true;
157-
}
158-
159130
private void OnGetModel(TranslationModel model, Dictionary<string, object> customData)
160131
{
161132
Log.Debug("TestLanguageTranslator.OnGetModel()", "Language Translator - Get model response: {0}", customData["json"].ToString());
162133
Test(model != null);
163134
_getModelTested = true;
164135
}
165136

166-
private void OnDeleteModel(DeleteModelResult deleteModelResult, Dictionary<string, object> customData)
167-
{
168-
Log.Debug("TestLanguageTranslator.OnDeleteModel()", "Language Translator - Delete model response: success: {0}", customData["json"].ToString());
169-
_customLanguageModelId = null;
170-
Test(deleteModelResult != null);
171-
_deleteModelTested = true;
172-
}
173-
174137
private void OnGetTranslation(Translations translation, Dictionary<string, object> customData)
175138
{
176139
Log.Debug("TestLanguageTranslator.OnGetTranslation()", "Langauge Translator - Translate Response: {0}", customData["json"].ToString());

‎Scripts/UnitTests/TestVisualRecognitionCF.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
//#define TRAIN_CLASSIFIER
2020
// Uncommnent to delete the trained classifier
2121
//#define DELETE_TRAINED_CLASSIFIER
22+
// Uncomment to test CF
23+
//#define TEST_CF
2224

2325
using UnityEngine;
2426
using System.Collections;
@@ -32,6 +34,7 @@
3234

3335
namespace IBM.Watson.DeveloperCloud.UnitTests
3436
{
37+
#if TEST_CF
3538
public class TestVisualRecognitionCF : UnitTest
3639
{
3740
private string _apikey;
@@ -93,7 +96,7 @@ public override IEnumerator RunTest()
9396
throw new WatsonException(r.FormattedMessages);
9497

9598
// Set credentials from imported credntials
96-
Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk")[0].Credentials;
99+
Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk-cf")[0].Credentials;
97100
_apikey = credential.ApiKey.ToString();
98101
_url = credential.Url.ToString();
99102

@@ -314,4 +317,5 @@ private void OnFail(RESTConnector.Error error, Dictionary<string, object> custom
314317
Log.Error("TestVisualRecognition.OnFail()", "Error received: {0}", error.ToString());
315318
}
316319
}
320+
#endif
317321
}

‎Scripts/UnitTests/TestVisualRecognitionRC.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Uncommnent to delete the trained classifier
2121
//#define DELETE_TRAINED_CLASSIFIER
2222
// Uncomment to test RC
23-
//#define TEST_RC
23+
#define TEST_RC
2424

2525
using UnityEngine;
2626
using System.Collections;
@@ -96,7 +96,7 @@ public override IEnumerator RunTest()
9696
throw new WatsonException(r.FormattedMessages);
9797

9898
// Set credentials from imported credntials
99-
Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-iam-sdk")[0].Credentials;
99+
Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk-rc")[0].Credentials;
100100

101101
// Create credential and instantiate service
102102
TokenOptions tokenOptions = new TokenOptions()

0 commit comments

Comments
 (0)