Merge pull request #952 from watson-developer-cloud/generated-updates

Tests for LT

Author: lpatino10

config.properties.enc

@@ -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/v2/LanguageTranslatorIT.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/LanguageTranslatorITCF.java

@@ -80,7 +80,7 @@ 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());
   }
 
@@ -96,43 +96,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.
    */