test(Language Translator): Update tests

Author: lpatino10

language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorIT.java

@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
 import com.ibm.cloud.sdk.core.http.Response;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.WatsonHttpHeaders;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.language_translator.v3.model.DeleteDocumentOptions;
@@ -81,10 +81,8 @@ public void setUp() throws Exception {
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.", (iamApiKey == null));
 
-    IamOptions iamOptions = new IamOptions.Builder()
-        .apiKey(iamApiKey)
-        .build();
-    service = new LanguageTranslator("2018-05-01", iamOptions);
+    IamAuthenticator authenticator = new IamAuthenticator(iamApiKey);
+    service = new LanguageTranslator("2018-05-01", authenticator);
     service.setEndPoint(getProperty("language_translator.url"));
 
     // issue currently where document translation fails with learning opt-out
@@ -144,7 +142,7 @@ public void testListModelsWithOptions() {
     ListModelsOptions options = new ListModelsOptions.Builder()
         .source("en")
         .target("es")
-        .defaultModels(true)
+        .xdefault(true)
         .build();
     List<TranslationModel> models = service.listModels(options).execute().getResult().getModels();
 
@@ -190,8 +188,8 @@ public void testTranslateMultiple() {
         .modelId(ENGLISH_TO_SPANISH).build();
     TranslationResult results = service.translate(options).execute().getResult();
     assertEquals(2, results.getTranslations().size());
-    assertEquals(translations.get(texts.get(0)), results.getTranslations().get(0).getTranslationOutput());
-    assertEquals(translations.get(texts.get(1)), results.getTranslations().get(1).getTranslationOutput());
+    assertEquals(translations.get(texts.get(0)), results.getTranslations().get(0).getTranslation());
+    assertEquals(translations.get(texts.get(1)), results.getTranslations().get(1).getTranslation());
 
     TranslateOptions.Builder builder = new TranslateOptions.Builder();
     builder.source(Language.ENGLISH).target(Language.SPANISH);
@@ -200,8 +198,8 @@ public void testTranslateMultiple() {
     }
     results = service.translate(builder.build()).execute().getResult();
     assertEquals(2, results.getTranslations().size());
-    assertEquals(translations.get(texts.get(0)), results.getTranslations().get(0).getTranslationOutput());
-    assertEquals(translations.get(texts.get(1)), results.getTranslations().get(1).getTranslationOutput());
+    assertEquals(translations.get(texts.get(0)), results.getTranslations().get(0).getTranslation());
+    assertEquals(translations.get(texts.get(1)), results.getTranslations().get(1).getTranslation());
   }
 
   /**
@@ -272,7 +270,7 @@ private void testTranslationResult(String text, String result, TranslationResult
     assertEquals(translationResult.getCharacterCount().intValue(), text.length());
     assertEquals(translationResult.getWordCount().intValue(), text.split(" ").length);
     assertNotNull(translationResult.getTranslations());
-    assertNotNull(translationResult.getTranslations().get(0).getTranslationOutput());
-    assertEquals(result, translationResult.getTranslations().get(0).getTranslationOutput());
+    assertNotNull(translationResult.getTranslations().get(0).getTranslation());
+    assertEquals(result, translationResult.getTranslations().get(0).getTranslation());
   }
 }

language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorTest.java

@@ -18,7 +18,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.security.basicauth.BasicAuthConfig;
+import com.ibm.cloud.sdk.core.security.NoAuthAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import com.ibm.watson.common.WatsonServiceUnitTest;
@@ -102,11 +102,7 @@ public class LanguageTranslatorTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
 
-    BasicAuthConfig authConfig = new BasicAuthConfig.Builder()
-        .username("")
-        .password("")
-        .build();
-    service = new LanguageTranslator("2018-05-01", authConfig);
+    service = new LanguageTranslator("2018-05-01", new NoAuthAuthenticator());
     service.setEndPoint(getMockWebServerUrl());
 
     // fixtures
@@ -290,8 +286,8 @@ public void testTranslateMultiple() throws InterruptedException {
     assertEquals("POST", request.getMethod());
     assertEquals(GSON.toJson(requestBody), request.getBody().readUtf8());
     assertEquals(2, translationResult.getTranslations().size());
-    assertEquals(translations.get(texts.get(0)), translationResult.getTranslations().get(0).getTranslationOutput());
-    assertEquals(translations.get(texts.get(1)), translationResult.getTranslations().get(1).getTranslationOutput());
+    assertEquals(translations.get(texts.get(0)), translationResult.getTranslations().get(0).getTranslation());
+    assertEquals(translations.get(texts.get(1)), translationResult.getTranslations().get(1).getTranslation());
   }
 
   /**
@@ -327,7 +323,7 @@ private void testTranslationResult(String text, TranslationResult translationRes
     assertNotNull(translationResult);
     assertEquals(translationResult.getWordCount().intValue(), text.split(" ").length);
     assertNotNull(translationResult.getTranslations());
-    assertNotNull(translationResult.getTranslations().get(0).getTranslationOutput());
+    assertNotNull(translationResult.getTranslations().get(0).getTranslation());
   }
 
   /**