test(Text to Speech): Update tests

Author: lpatino10

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsIT.java

@@ -13,8 +13,9 @@
 package com.ibm.watson.text_to_speech.v1;
 
 import com.google.common.collect.ImmutableList;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.service.exception.UnauthorizedException;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.watson.common.TestUtils;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.text_to_speech.v1.model.AddWordOptions;
@@ -76,34 +77,35 @@ public void setUp() throws Exception {
     String apiKey = getProperty("text_to_speech.apikey");
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    service = new TextToSpeech();
-    IamOptions iamOptions = new IamOptions.Builder()
-        .apiKey(apiKey)
-        .build();
-    service.setIamCredentials(iamOptions);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
+    service = new TextToSpeech(authenticator);
     service.setEndPoint(getProperty("text_to_speech.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
   private List<Word> instantiateWords() {
-    Word word1 = new Word();
-    word1.setWord("hodor");
-    word1.setTranslation("hold the door");
-    Word word2 = new Word();
-    word2.setWord("shocking");
-    word2.setTranslation("<phoneme alphabet='ibm' ph='.1Sa.0kIG'></phoneme>");
+    Word word1 = new Word.Builder()
+        .word("hodor")
+        .translation("hold the door")
+        .build();
+    Word word2 = new Word.Builder()
+        .word("shocking")
+        .translation("<phoneme alphabet='ibm' ph='.1Sa.0kIG'></phoneme>")
+        .build();
     return ImmutableList.of(word1, word2);
   }
 
   private List<Word> instantiateWordsJapanese() {
-    Word word1 = new Word();
-    word1.setWord("hodor");
-    word1.setTranslation("hold the door");
-    word1.setPartOfSpeech(Word.PartOfSpeech.JOSI);
-    Word word2 = new Word();
-    word2.setWord("clodor");
-    word2.setTranslation("close the door");
-    word2.setPartOfSpeech(Word.PartOfSpeech.HOKA);
+    Word word1 = new Word.Builder()
+        .word("hodor")
+        .translation("hold the door")
+        .partOfSpeech(Word.PartOfSpeech.JOSI)
+        .build();
+    Word word2 = new Word.Builder()
+        .word("clodor")
+        .translation("close the door")
+        .partOfSpeech(Word.PartOfSpeech.HOKA)
+        .build();
     return ImmutableList.of(word1, word2);
   }
 
@@ -359,8 +361,8 @@ public void testAddWord() {
     final Word expected = instantiateWords().get(0);
 
     AddWordOptions addOptions = new AddWordOptions.Builder()
-        .word(expected.getWord())
-        .translation(expected.getTranslation())
+        .word(expected.word())
+        .translation(expected.translation())
         .customizationId(model.getCustomizationId())
         .build();
     service.addWord(addOptions).execute().getResult();
@@ -369,12 +371,12 @@ public void testAddWord() {
         .customizationId(model.getCustomizationId())
         .build();
     final Words results = service.listWords(listOptions).execute().getResult();
-    assertEquals(1, results.getWords().size());
+    assertEquals(1, results.words().size());
 
-    final Word result = results.getWords().get(0);
+    final Word result = results.words().get(0);
     assertEquals(expected, result);
-    assertEquals(expected.getWord(), result.getWord());
-    assertEquals(expected.getTranslation(), result.getTranslation());
+    assertEquals(expected.word(), result.word());
+    assertEquals(expected.translation(), result.translation());
   }
 
   /**
@@ -396,7 +398,7 @@ public void testAddWords() {
         .customizationId(model.getCustomizationId())
         .build();
     final Words words = service.listWords(listOptions).execute().getResult();
-    assertEquals(expected.size(), words.getWords().size());
+    assertEquals(expected.size(), words.words().size());
   }
 
   /**
@@ -418,7 +420,7 @@ public void testAddWordsJapanese() {
         .customizationId(model.getCustomizationId())
         .build();
     final Words words = service.listWords(listOptions).execute().getResult();
-    assertEquals(expected.size(), words.getWords().size());
+    assertEquals(expected.size(), words.words().size());
   }
 
   /**
@@ -438,10 +440,10 @@ public void testGetWord() {
 
     GetWordOptions getOptions = new GetWordOptions.Builder()
         .customizationId(model.getCustomizationId())
-        .word(expected.get(0).getWord())
+        .word(expected.get(0).word())
         .build();
     final Translation translation = service.getWord(getOptions).execute().getResult();
-    assertEquals(expected.get(0).getTranslation(), translation.getTranslation());
+    assertEquals(expected.get(0).translation(), translation.translation());
   }
 
   /**
@@ -461,11 +463,11 @@ public void testGetWordJapanese() {
 
     GetWordOptions getOptions = new GetWordOptions.Builder()
         .customizationId(model.getCustomizationId())
-        .word(expected.get(0).getWord())
+        .word(expected.get(0).word())
         .build();
     final Translation translation = service.getWord(getOptions).execute().getResult();
-    assertEquals(expected.get(0).getTranslation(), translation.getTranslation());
-    assertEquals(expected.get(0).getPartOfSpeech(), translation.getPartOfSpeech());
+    assertEquals(expected.get(0).translation(), translation.translation());
+    assertEquals(expected.get(0).partOfSpeech(), translation.partOfSpeech());
   }
 
   /**
@@ -478,22 +480,22 @@ public void testDeleteWord() {
     final Word expected = instantiateWords().get(0);
 
     AddWordOptions addOptions = new AddWordOptions.Builder()
-        .word(expected.getWord())
-        .translation(expected.getTranslation())
+        .word(expected.word())
+        .translation(expected.translation())
         .customizationId(model.getCustomizationId())
         .build();
     service.addWord(addOptions).execute().getResult();
     DeleteWordOptions deleteOptions = new DeleteWordOptions.Builder()
         .customizationId(model.getCustomizationId())
-        .word(expected.getWord())
+        .word(expected.word())
         .build();
     service.deleteWord(deleteOptions).execute();
 
     ListWordsOptions listOptions = new ListWordsOptions.Builder()
         .customizationId(model.getCustomizationId())
         .build();
     final Words results = service.listWords(listOptions).execute().getResult();
-    assertEquals(0, results.getWords().size());
+    assertEquals(0, results.words().size());
   }
 
   /**
@@ -508,19 +510,19 @@ public void testSynthesize() throws IOException {
     final Word expected = instantiateWords().get(0);
 
     AddWordOptions addOptions = new AddWordOptions.Builder()
-        .word(expected.getWord())
-        .translation(expected.getTranslation())
+        .word(expected.word())
+        .translation(expected.translation())
         .customizationId(model.getCustomizationId())
         .build();
     service.addWord(addOptions).execute().getResult();
     SynthesizeOptions synthesizeOptions1 = new SynthesizeOptions.Builder()
-        .text(expected.getWord())
+        .text(expected.word())
         .voice(SynthesizeOptions.Voice.EN_US_MICHAELVOICE)
         .accept(SynthesizeOptions.Accept.AUDIO_WAV)
         .build();
     final InputStream stream1 = service.synthesize(synthesizeOptions1).execute().getResult();
     SynthesizeOptions synthesizeOptions2 = new SynthesizeOptions.Builder()
-        .text(expected.getWord())
+        .text(expected.word())
         .voice(SynthesizeOptions.Voice.EN_US_MICHAELVOICE)
         .accept(SynthesizeOptions.Accept.AUDIO_WAV)
         .customizationId(model.getCustomizationId())

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsTest.java

@@ -14,7 +14,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.ibm.cloud.sdk.core.security.basicauth.BasicAuthConfig;
+import com.ibm.cloud.sdk.core.security.NoAuthAuthenticator;
 import com.ibm.watson.common.WatsonServiceUnitTest;
 import com.ibm.watson.text_to_speech.v1.model.AddWordOptions;
 import com.ibm.watson.text_to_speech.v1.model.AddWordsOptions;
@@ -82,11 +82,7 @@ public class CustomizationsTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
 
-    BasicAuthConfig authConfig = new BasicAuthConfig.Builder()
-        .username("")
-        .password("")
-        .build();
-    service = new TextToSpeech(authConfig);
+    service = new TextToSpeech(new NoAuthAuthenticator());
     service.setEndPoint(getMockWebServerUrl());
 
     voiceModel = loadFixture("src/test/resources/text_to_speech/voice_model.json", VoiceModel.class);
@@ -95,18 +91,15 @@ public void setUp() throws Exception {
     voice = loadFixture("src/test/resources/text_to_speech/voice.json", Voice.class);
   }
 
-  private static List<Word> instantiateWords() {
-    Word word = new Word();
-    word.setWord("hodor");
-    word.setTranslation("hold the door");
-    return ImmutableList.of(word);
+  private static Word instantiateWord() {
+    return new Word.Builder()
+        .word("hodor")
+        .translation("hold the door")
+        .build();
   }
 
-  private static Word instantiateWord() {
-    Word word = new Word();
-    word.setWord("hodor");
-    word.setTranslation("hold the door");
-    return word;
+  private static List<Word> instantiateWords() {
+    return ImmutableList.of(instantiateWord());
   }
 
   /**
@@ -366,7 +359,7 @@ public void testListWords() throws InterruptedException {
 
     assertEquals(String.format(WORDS_PATH, CUSTOMIZATION_ID), request.getPath());
     assertEquals("GET", request.getMethod());
-    assertEquals(expected, result.getWords());
+    assertEquals(expected, result.words());
   }
 
   /**
@@ -378,17 +371,17 @@ public void testListWords() throws InterruptedException {
   public void testGetWord() throws InterruptedException {
     final Word expected = instantiateWords().get(0);
 
-    server.enqueue(jsonResponse(ImmutableMap.of(TRANSLATION, expected.getTranslation())));
+    server.enqueue(jsonResponse(ImmutableMap.of(TRANSLATION, expected.translation())));
     GetWordOptions getOptions = new GetWordOptions.Builder()
         .customizationId(CUSTOMIZATION_ID)
-        .word(expected.getWord())
+        .word(expected.word())
         .build();
     final Translation result = service.getWord(getOptions).execute().getResult();
     final RecordedRequest request = server.takeRequest();
 
-    assertEquals(String.format(WORDS_PATH, CUSTOMIZATION_ID) + "/" + expected.getWord(), request.getPath());
+    assertEquals(String.format(WORDS_PATH, CUSTOMIZATION_ID) + "/" + expected.word(), request.getPath());
     assertEquals("GET", request.getMethod());
-    assertEquals(expected.getTranslation(), result.getTranslation());
+    assertEquals(expected.translation(), result.translation());
   }
 
   /**
@@ -424,13 +417,13 @@ public void testAddWord() throws InterruptedException {
     server.enqueue(new MockResponse().setResponseCode(201));
     AddWordOptions addOptions = new AddWordOptions.Builder()
         .customizationId(CUSTOMIZATION_ID)
-        .word(expected.getWord())
-        .translation(expected.getTranslation())
+        .word(expected.word())
+        .translation(expected.translation())
         .build();
     service.addWord(addOptions).execute().getResult();
     RecordedRequest request = server.takeRequest();
 
-    assertEquals(String.format(WORD_PATH, CUSTOMIZATION_ID, expected.getWord()), request.getPath());
+    assertEquals(String.format(WORD_PATH, CUSTOMIZATION_ID, expected.word()), request.getPath());
     assertEquals("PUT", request.getMethod());
   }
 
@@ -441,7 +434,7 @@ public void testAddWord() throws InterruptedException {
    */
   @Test
   public void testDeleteWord() throws InterruptedException {
-    final String expected = instantiateWords().get(0).getWord();
+    final String expected = instantiateWords().get(0).word();
 
     server.enqueue(new MockResponse().setResponseCode(204));
     DeleteWordOptions deleteOptions = new DeleteWordOptions.Builder()

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechIT.java

@@ -13,7 +13,8 @@
 package com.ibm.watson.text_to_speech.v1;
 
 
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.common.RetryRunner;
 import com.ibm.watson.common.WatsonServiceTest;
 import com.ibm.watson.text_to_speech.v1.model.DeleteUserDataOptions;
@@ -78,11 +79,8 @@ public void setUp() throws Exception {
     String apiKey = getProperty("text_to_speech.apikey");
     Assume.assumeFalse("config.properties doesn't have valid credentials.", apiKey == null);
 
-    service = new TextToSpeech();
-    IamOptions iamOptions = new IamOptions.Builder()
-        .apiKey(apiKey)
-        .build();
-    service.setIamCredentials(iamOptions);
+    Authenticator authenticator = new IamAuthenticator(apiKey);
+    service = new TextToSpeech(authenticator);
     service.setEndPoint(getProperty("text_to_speech.url"));
     service.setDefaultHeaders(getDefaultHeaders());
     voiceName = getProperty("text_to_speech.voice_name");

text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechTest.java

@@ -15,7 +15,7 @@
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 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.util.GsonSingleton;
 import com.ibm.watson.common.TestUtils;
 import com.ibm.watson.common.WatsonServiceUnitTest;
@@ -105,11 +105,7 @@ private static void writeInputStreamToOutputStream(InputStream inputStream, Outp
   public void setUp() throws Exception {
     super.setUp();
 
-    BasicAuthConfig authConfig = new BasicAuthConfig.Builder()
-        .username("")
-        .password("")
-        .build();
-    service = new TextToSpeech(authConfig);
+    service = new TextToSpeech(new NoAuthAuthenticator());
     service.setEndPoint(getMockWebServerUrl());
 
     getVoiceResponse = loadFixture("src/test/resources/text_to_speech/get_voice_response.json", Voice.class);