test: Update path tests for new OkHttp version

Author: lpatino10

discovery/src/test/java/com/ibm/watson/developer_cloud/discovery/v1/DiscoveryServiceTest.java

@@ -142,11 +142,11 @@ public class DiscoveryServiceTest extends WatsonServiceUnitTest {
       + VERSION;
   private static final String Q1_PATH = "/v1/environments/mock_envid/collections/mock_collid/query?version="
       + VERSION
-      + "&filter=field:1"
-      + "&query=field:1&count=5&return=field&offset=5";
+      + "&filter=field%3A1&query=field%3A1&count=5&return=field&offset=5"
+      + "&similar=true&similar.document_ids=doc1%2Cdoc2&similar.fields=field1%2Cfield2";
   private static final String Q2_PATH = "/v1/environments/mock_envid/collections/mock_collid/query?version="
       + VERSION
-      + "&aggregation=term(field)";
+      + "&aggregation=term%28field%29";
   private static final String Q3_PATH = "/v1/environments/mock_envid/query?version="
       + VERSION + "&collection_ids=mock_collid";
   private static final String Q4_PATH = "/v1/environments/mock_envid/notices?version="
@@ -720,8 +720,7 @@ public void queryIsSuccessful() throws InterruptedException {
     QueryResponse response = discoveryService.query(queryBuilder.build()).execute();
     RecordedRequest request = server.takeRequest();
 
-    assertEquals(Q1_PATH + "&similar=true&similar.document_ids=doc1,doc2&similar.fields=field1,field2",
-        request.getPath());
+    assertEquals(Q1_PATH, request.getPath());
     assertEquals(GET, request.getMethod());
     assertEquals(GsonSingleton.getGson().toJsonTree(queryResp), GsonSingleton.getGson().toJsonTree(response));
   }

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

@@ -72,6 +72,7 @@
 import com.ibm.watson.developer_cloud.speech_to_text.v1.util.MediaTypeUtils;
 import com.ibm.watson.developer_cloud.speech_to_text.v1.websocket.RecognizeCallback;
 import com.ibm.watson.developer_cloud.util.GsonSingleton;
+import com.ibm.watson.developer_cloud.util.RequestUtils;
 import com.ibm.watson.developer_cloud.util.TestUtils;
 import okhttp3.WebSocket;
 import okhttp3.internal.ws.WebSocketRecorder;
@@ -474,7 +475,7 @@ public void testCreateJob() throws InterruptedException, FileNotFoundException {
         + "&base_model_version=" + version
         + "&customization_weight=" + customizationWeight
         + "&inactivity_timeout=" + inactivityTimeout
-        + "&keywords=" + StringUtils.join(keywords, ',')
+        + "&keywords=" + RequestUtils.encode(StringUtils.join(keywords, ','))
         + "&keywords_threshold=" + keywordsThreshold
         + "&word_confidence=" + wordConfidence
         + "&timestamps=" + timestamps
@@ -1302,7 +1303,8 @@ public void testRegisterCallback() throws FileNotFoundException, InterruptedExce
     final RecordedRequest registerRequest = server.takeRequest();
 
     assertEquals("POST", registerRequest.getMethod());
-    assertEquals(String.format(REGISTER_CALLBACK, callbackUrl, secret), registerRequest.getPath());
+    assertEquals(String.format(REGISTER_CALLBACK, RequestUtils.encode(callbackUrl), RequestUtils.encode(secret)),
+        registerRequest.getPath());
     assertEquals(RegisterStatus.Status.CREATED, result.getStatus());
     assertEquals(callbackUrl, result.getUrl());
   }
@@ -1319,7 +1321,7 @@ public void testUnregisterCallback() throws InterruptedException {
     final RecordedRequest unregisterRequest = server.takeRequest();
 
     assertEquals("POST", unregisterRequest.getMethod());
-    assertEquals(String.format(UNREGISTER_CALLBACK, callbackUrl), unregisterRequest.getPath());
+    assertEquals(String.format(UNREGISTER_CALLBACK, RequestUtils.encode(callbackUrl)), unregisterRequest.getPath());
   }
 
   @Test

tone-analyzer/src/test/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzerTest.java

@@ -21,6 +21,7 @@
 import java.util.List;
 
 import com.ibm.watson.developer_cloud.tone_analyzer.v3.model.UtteranceAnalyses;
+import com.ibm.watson.developer_cloud.util.RequestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -148,7 +149,7 @@ public void testtones() throws InterruptedException, IOException {
         .build();
     serviceResponse = service.tone(toneOptions1).execute();
     request = server.takeRequest();
-    path = path + "&tones=emotion,language,social";
+    path = path + "&tones=" + RequestUtils.encode("emotion,language,social");
     assertEquals(path, request.getPath());
   }