test(Speech to Text): Update unit tests

Author: lpatino10

speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java

@@ -150,6 +150,8 @@ public class SpeechToTextTest extends WatsonServiceUnitTest {
   private static final File SAMPLE_WAV = new File("src/test/resources/speech_to_text/sample1.wav");
   private static final File SAMPLE_WEBM = new File("src/test/resources/speech_to_text/sample1.webm");
 
+  private static final String UPDATED = "2019-10-11T19:16:58.547Z";
+
   private SpeechModel speechModel;
   private SpeechModels speechModels;
   private SpeechRecognitionResults recognitionResults;
@@ -182,6 +184,81 @@ public void setUp() throws Exception {
     grammar = loadFixture("src/test/resources/speech_to_text/grammar.json", Grammar.class);
   }
 
+  // --- MODELS ---
+
+  @Test
+  public void testDeleteUserDataOptionsBuilder() {
+    String customerId = "customerId";
+
+    DeleteUserDataOptions deleteOptions = new DeleteUserDataOptions.Builder()
+        .customerId(customerId)
+        .build();
+
+    assertEquals(deleteOptions.customerId(), customerId);
+  }
+
+  @Test
+  public void testAddGrammarOptions() throws FileNotFoundException {
+    String customizationId = "id";
+    String grammarName = "grammar_name";
+    InputStream grammarFile = new FileInputStream(SAMPLE_WAV);
+
+    AddGrammarOptions addGrammarOptions = new AddGrammarOptions.Builder()
+        .customizationId(customizationId)
+        .grammarName(grammarName)
+        .grammarFile(grammarFile)
+        .contentType(AddGrammarOptions.ContentType.APPLICATION_SRGS)
+        .allowOverwrite(true)
+        .build();
+
+    assertEquals(customizationId, addGrammarOptions.customizationId());
+    assertEquals(grammarName, addGrammarOptions.grammarName());
+    assertEquals(grammarFile, addGrammarOptions.grammarFile());
+    assertEquals(AddGrammarOptions.ContentType.APPLICATION_SRGS, addGrammarOptions.contentType());
+    assertTrue(addGrammarOptions.allowOverwrite());
+  }
+
+  @Test
+  public void testListGrammarsOptions() {
+    String customizationId = "id";
+
+    ListGrammarsOptions listGrammarsOptions = new ListGrammarsOptions.Builder()
+        .customizationId(customizationId)
+        .build();
+
+    assertEquals(customizationId, listGrammarsOptions.customizationId());
+  }
+
+  @Test
+  public void testGetGrammarOptions() {
+    String customizationId = "id";
+    String grammarName = "grammar_name";
+
+    GetGrammarOptions getGrammarOptions = new GetGrammarOptions.Builder()
+        .customizationId(customizationId)
+        .grammarName(grammarName)
+        .build();
+
+    assertEquals(customizationId, getGrammarOptions.customizationId());
+    assertEquals(grammarName, getGrammarOptions.grammarName());
+  }
+
+  @Test
+  public void testDeleteGrammarOptions() {
+    String customizationId = "id";
+    String grammarName = "grammar_name";
+
+    DeleteGrammarOptions deleteGrammarOptions = new DeleteGrammarOptions.Builder()
+        .customizationId(customizationId)
+        .grammarName(grammarName)
+        .build();
+
+    assertEquals(customizationId, deleteGrammarOptions.customizationId());
+    assertEquals(grammarName, deleteGrammarOptions.grammarName());
+  }
+
+  // --- METHODS ---
+
   /**
    * Test get model.
    *
@@ -655,6 +732,7 @@ public void testGetLanguageModel() throws InterruptedException, FileNotFoundExce
     assertEquals("GET", request.getMethod());
     assertEquals(String.format(PATH_CUSTOMIZATION, id), request.getPath());
     assertEquals(result.toString(), model.toString());
+    assertEquals(UPDATED, result.getUpdated());
   }
 
   /**
@@ -1163,6 +1241,7 @@ public void testGetAcousticModel() throws InterruptedException, FileNotFoundExce
     assertEquals("GET", request.getMethod());
     assertEquals(String.format(PATH_ACOUSTIC_CUSTOMIZATION, id), request.getPath());
     assertEquals(result.toString(), model.toString());
+    assertEquals(UPDATED, result.getUpdated());
   }
 
   /**
@@ -1424,38 +1503,6 @@ public void testClosingInputStreamClosesWebSocket() throws Exception {
     callback.assertOnTranscriptionComplete();
   }
 
-  @Test
-  public void testDeleteUserDataOptionsBuilder() {
-    String customerId = "customerId";
-
-    DeleteUserDataOptions deleteOptions = new DeleteUserDataOptions.Builder()
-        .customerId(customerId)
-        .build();
-
-    assertEquals(deleteOptions.customerId(), customerId);
-  }
-
-  @Test
-  public void testAddGrammarOptions() throws FileNotFoundException {
-    String customizationId = "id";
-    String grammarName = "grammar_name";
-    InputStream grammarFile = new FileInputStream(SAMPLE_WAV);
-
-    AddGrammarOptions addGrammarOptions = new AddGrammarOptions.Builder()
-        .customizationId(customizationId)
-        .grammarName(grammarName)
-        .grammarFile(grammarFile)
-        .contentType(AddGrammarOptions.ContentType.APPLICATION_SRGS)
-        .allowOverwrite(true)
-        .build();
-
-    assertEquals(customizationId, addGrammarOptions.customizationId());
-    assertEquals(grammarName, addGrammarOptions.grammarName());
-    assertEquals(grammarFile, addGrammarOptions.grammarFile());
-    assertEquals(AddGrammarOptions.ContentType.APPLICATION_SRGS, addGrammarOptions.contentType());
-    assertTrue(addGrammarOptions.allowOverwrite());
-  }
-
   @Test
   public void testAddGrammar() throws FileNotFoundException, InterruptedException {
     MockResponse desiredResponse = new MockResponse().setResponseCode(200);
@@ -1477,17 +1524,6 @@ public void testAddGrammar() throws FileNotFoundException, InterruptedException
     assertEquals(POST, request.getMethod());
   }
 
-  @Test
-  public void testListGrammarsOptions() {
-    String customizationId = "id";
-
-    ListGrammarsOptions listGrammarsOptions = new ListGrammarsOptions.Builder()
-        .customizationId(customizationId)
-        .build();
-
-    assertEquals(customizationId, listGrammarsOptions.customizationId());
-  }
-
   @Test
   public void testListGrammars() throws InterruptedException {
     server.enqueue(jsonResponse(grammars));
@@ -1504,20 +1540,6 @@ public void testListGrammars() throws InterruptedException {
     assertEquals(grammars, response);
   }
 
-  @Test
-  public void testGetGrammarOptions() {
-    String customizationId = "id";
-    String grammarName = "grammar_name";
-
-    GetGrammarOptions getGrammarOptions = new GetGrammarOptions.Builder()
-        .customizationId(customizationId)
-        .grammarName(grammarName)
-        .build();
-
-    assertEquals(customizationId, getGrammarOptions.customizationId());
-    assertEquals(grammarName, getGrammarOptions.grammarName());
-  }
-
   @Test
   public void testGetGrammar() throws InterruptedException {
     server.enqueue(jsonResponse(grammar));
@@ -1536,20 +1558,6 @@ public void testGetGrammar() throws InterruptedException {
     assertEquals(grammar, response);
   }
 
-  @Test
-  public void testDeleteGrammarOptions() {
-    String customizationId = "id";
-    String grammarName = "grammar_name";
-
-    DeleteGrammarOptions deleteGrammarOptions = new DeleteGrammarOptions.Builder()
-        .customizationId(customizationId)
-        .grammarName(grammarName)
-        .build();
-
-    assertEquals(customizationId, deleteGrammarOptions.customizationId());
-    assertEquals(grammarName, deleteGrammarOptions.grammarName());
-  }
-
   @Test
   public void testDeleteGrammar() throws InterruptedException {
     MockResponse desiredResponse = new MockResponse().setResponseCode(200);
@@ -1568,6 +1576,8 @@ public void testDeleteGrammar() throws InterruptedException {
     assertEquals(DELETE, request.getMethod());
   }
 
+  // --- HELPERS ---
+
   private static class TestRecognizeCallback implements RecognizeCallback {
 
     private final BlockingQueue<SpeechRecognitionResults> speechResults = new LinkedBlockingQueue<>();

speech-to-text/src/test/resources/speech_to_text/acoustic-model.json

@@ -7,5 +7,6 @@
   "description": "Acoustic model used to test the SDKs",
   "progress": 0,
   "language": "en-US",
-  "status": "pending"
+  "status": "pending",
+  "updated": "2019-10-11T19:16:58.547Z"
 }

speech-to-text/src/test/resources/speech_to_text/customization.json

@@ -7,5 +7,6 @@
   "description": "Customization model used to test the SDKs",
   "progress": 0,
   "language": "en-US",
-  "status": "pending"
+  "status": "pending",
+  "updated": "2019-10-11T19:16:58.547Z"
 }