test(language translator): Update tests for new credential keys

Author: lpatino10

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

@@ -67,15 +67,15 @@ public class LanguageTranslatorIT extends WatsonServiceTest {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    String username = getProperty("language_translator.username");
-    String password = getProperty("language_translator.password");
+    String username = getProperty("language_translator_v2.username");
+    String password = getProperty("language_translator_v2.password");
 
     Assume.assumeFalse("config.properties doesn't have valid credentials.",
         (username == null) || username.equals(PLACEHOLDER));
 
     service = new LanguageTranslator();
     service.setUsernameAndPassword(username, password);
-    service.setEndPoint(getProperty("language_translator.url"));
+    service.setEndPoint(getProperty("language_translator.url_cf"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 

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

@@ -78,7 +78,7 @@ public void setUp() throws Exception {
 
     service = new LanguageTranslator("2018-05-01");
     service.setUsernameAndPassword(username, password);
-    service.setEndPoint(getProperty("language_translator.url"));
+    service.setEndPoint(getProperty("language_translator.url_cf"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
@@ -94,43 +94,6 @@ public void testReadme() throws InterruptedException, IOException {
     System.out.println(translationResult);
   }
 
-  /**
-   * Test create and delete model.
-   */
-  @Test
-  public void testCreateAndDeleteModel() throws IOException {
-
-    String modelName = "integration-test";
-    String baseModelId = "en-es";
-
-    InputStream glossary = new FileInputStream(new File(RESOURCE + "glossary.tmx"));
-    CreateModelOptions options = new CreateModelOptions.Builder()
-        .name(modelName)
-        .baseModelId(baseModelId)
-        .forcedGlossary(glossary)
-        .forcedGlossaryFilename("test_glossary")
-        .build();
-
-    TranslationModel model = null;
-    try {
-      model = service.createModel(options).execute();
-      Thread.sleep(3000);
-      assertNotNull(model);
-      assertTrue(model.getModelId() != null && model.getModelId().length() > 0);
-      assertEquals(model.getName(), modelName);
-      assertEquals(model.getBaseModelId(), baseModelId);
-      assertEquals(model.isCustomizable(), false);
-      assertEquals(model.isDefaultModel(), false);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    } finally {
-      if (model != null) {
-        DeleteModelOptions deleteOptions = new DeleteModelOptions.Builder(model.getModelId()).build();
-        service.deleteModel(deleteOptions).execute();
-      }
-    }
-  }
-
   /**
    * Test Get Identifiable languages.
    */

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

@@ -9,8 +9,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
- *//*
-
+ */
 package com.ibm.watson.developer_cloud.language_translator.v3;
 
 import static org.junit.Assert.assertEquals;
@@ -47,11 +46,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.ibm.watson.developer_cloud.WatsonServiceTest;
 
-*/
 /**
  * Language Translator integration test.
- *//*
-
+ */
 public class LanguageTranslatorITRC extends WatsonServiceTest {
 
   private static final String ENGLISH_TO_SPANISH = "en-es";
@@ -66,12 +63,10 @@ public class LanguageTranslatorITRC extends WatsonServiceTest {
       "Bienvenidos a la era cognitiva");
   private final List<String> texts = ImmutableList.copyOf(translations.keySet());
 
-  */
-/*
+  /*
    * (non-Javadoc)
    * @see com.ibm.watson.developercloud.WatsonServiceTest#setUp()
-   *//*
-
+   */
   @Override
   @Before
   public void setUp() throws Exception {
@@ -85,15 +80,13 @@ public void setUp() throws Exception {
         .apiKey(iamApiKey)
         .build();
     service.setIamCredentials(iamOptions);
-    service.setEndPoint(getProperty("language_translator_v3.url"));
+    service.setEndPoint(getProperty("language_translator.url_rc"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
-  */
-/**
+  /**
    * Test README.
-   *//*
-
+   */
   @Test
   public void testReadme() throws InterruptedException, IOException {
     TranslateOptions translateOptions = new TranslateOptions.Builder()
@@ -103,74 +96,29 @@ public void testReadme() throws InterruptedException, IOException {
     System.out.println(translationResult);
   }
 
-  */
-/**
-   * Test create and delete model.
-   *//*
-
-  @Test
-  public void testCreateAndDeleteModel() throws IOException {
-
-    String modelName = "integration-test";
-    String baseModelId = "en-es";
-
-    InputStream glossary = new FileInputStream(new File(RESOURCE + "glossary.tmx"));
-    CreateModelOptions options = new CreateModelOptions.Builder()
-        .name(modelName)
-        .baseModelId(baseModelId)
-        .forcedGlossary(glossary)
-        .forcedGlossaryFilename("test_glossary")
-        .build();
-
-    TranslationModel model = null;
-    try {
-      model = service.createModel(options).execute();
-      Thread.sleep(3000);
-      assertNotNull(model);
-      assertTrue(model.getModelId() != null && model.getModelId().length() > 0);
-      assertEquals(model.getName(), modelName);
-      assertEquals(model.getBaseModelId(), baseModelId);
-      assertEquals(model.isCustomizable(), false);
-      assertEquals(model.isDefaultModel(), false);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    } finally {
-      if (model != null) {
-        DeleteModelOptions deleteOptions = new DeleteModelOptions.Builder(model.getModelId()).build();
-        service.deleteModel(deleteOptions).execute();
-      }
-    }
-  }
-
-  */
-/**
+  /**
    * Test Get Identifiable languages.
-   *//*
-
+   */
   @Test
   public void testGetIdentifiableLanguages() {
     final List<IdentifiableLanguage> languages = service.listIdentifiableLanguages().execute().getLanguages();
     assertNotNull(languages);
     assertTrue(!languages.isEmpty());
   }
 
-  */
-/**
+  /**
    * Test Get model by id.
-   *//*
-
+   */
   @Test
   public void testGetModel() {
     GetModelOptions getOptions = new GetModelOptions.Builder(ENGLISH_TO_SPANISH).build();
     final TranslationModel model = service.getModel(getOptions).execute();
     assertNotNull(model);
   }
 
-  */
-/**
+  /**
    * Test List Models.
-   *//*
-
+   */
   @Test
   public void testListModels() {
     final List<TranslationModel> models = service.listModels(null).execute().getModels();
@@ -179,11 +127,9 @@ public void testListModels() {
     assertFalse(models.isEmpty());
   }
 
-  */
-/**
+  /**
    * Test List Models with Options.
-   *//*
-
+   */
   @Test
   public void testListModelsWithOptions() {
     ListModelsOptions options = new ListModelsOptions.Builder()
@@ -199,11 +145,9 @@ public void testListModelsWithOptions() {
     assertEquals(models.get(0).getTarget(), options.target());
   }
 
-  */
-/**
+  /**
    * Test Identify.
-   *//*
-
+   */
   @Test
   public void testIdentify() {
 
@@ -213,11 +157,9 @@ public void testIdentify() {
     assertFalse(identifiedLanguages.isEmpty());
   }
 
-  */
-/**
+  /**
    * Test translate.
-   *//*
-
+   */
   @Test
   public void testTranslate() {
     for (String text : texts) {
@@ -230,11 +172,9 @@ public void testTranslate() {
     }
   }
 
-  */
-/**
+  /**
    * Test translate multiple.
-   *//*
-
+   */
   @Test
   public void testTranslateMultiple() {
     TranslateOptions options = new TranslateOptions.Builder(texts)
@@ -255,11 +195,9 @@ public void testTranslateMultiple() {
     assertEquals(translations.get(texts.get(1)), results.getTranslations().get(1).getTranslationOutput());
   }
 
-  */
-/**
+  /**
    * Test delete all models.
-   *//*
-
+   */
   @Test
   @Ignore
   public void testDeleteAllModels() {
@@ -270,15 +208,13 @@ public void testDeleteAllModels() {
     }
   }
 
-  */
-/**
+  /**
    * Test translation result.
    *
    * @param text the text
    * @param result the result
    * @param translationResult the translation result
-   *//*
-
+   */
   private void testTranslationResult(String text, String result, TranslationResult translationResult) {
     assertNotNull(translationResult);
     assertEquals(translationResult.getCharacterCount().intValue(), text.length());
@@ -289,4 +225,3 @@ private void testTranslationResult(String text, String result, TranslationResult
   }
 
 }
-*/