Skip to content

Tests for LT #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2018
Merged

Tests for LT #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
169dc82
build(credentials): Update credentials for LT
lpatino10 Jun 12, 2018
4eb3a82
test(language translator): Update tests for new credential keys
lpatino10 Jun 12, 2018
f23d566
Merge branch 'develop' into generated-updates
lpatino10 Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified config.properties.enc
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...test/java/com/ibm/watson/developer_cloud/language_translator/v2/LanguageTranslatorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
39 changes: 1 addition & 38 deletions ...st/java/com/ibm/watson/developer_cloud/language_translator/v3/LanguageTranslatorITCF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -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.
*/
Expand Down
39 changes: 1 addition & 38 deletions ...st/java/com/ibm/watson/developer_cloud/language_translator/v3/LanguageTranslatorITRC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -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.
*/
Expand Down