Added tests, fixed empty body error

arcao · arcao · commit 9787c7df70ed · 2016-11-29T11:19:00.000+01:00
diff --git a/scribejava-httpclient-okhttp/pom.xml b/scribejava-httpclient-okhttp/pom.xml
@@ -25,6 +25,12 @@
             <artifactId>okhttp</artifactId>
             <version>3.4.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>3.4.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClient.java b/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClient.java
@@ -47,7 +47,7 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
 
         // prepare body
         RequestBody body = null;
-        if (bodyContents != null && !bodyContents.isEmpty() && HttpMethod.permitsRequestBody(method)) {
+        if (bodyContents != null && HttpMethod.permitsRequestBody(method)) {
             final String contentType = headers.containsKey(AbstractRequest.CONTENT_TYPE) ?
                                          headers.get(AbstractRequest.CONTENT_TYPE) : DEFAULT_CONTENT_TYPE;
             body = RequestBody.create(MediaType.parse(contentType), bodyContents);
diff --git a/scribejava-httpclient-okhttp/src/test/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClientTest.java b/scribejava-httpclient-okhttp/src/test/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClientTest.java
@@ -0,0 +1,87 @@
+package com.github.scribejava.httpclient.okhttp;
+
+import com.github.scribejava.core.model.*;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import com.github.scribejava.core.oauth.OAuthService;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.MalformedURLException;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class OkHttpHttpClientTest {
+    private OAuthService<?> oAuthService;
+
+    @Before
+    public void setUp() throws MalformedURLException {
+        HttpClient client = new OkHttpHttpClient(new OkHttpClient());
+        oAuthService = new OAuth20Service(null,
+                new OAuthConfig("test", "test", null, null, null, null, null, null, null, null, null, null, client));
+    }
+
+
+    @Test
+    public void shouldSendGetRequest() throws Exception {
+        String expectedResponseBody = "response body";
+
+        MockWebServer server = new MockWebServer();
+        server.enqueue(new MockResponse().setBody(expectedResponseBody));
+        server.start();
+
+        HttpUrl baseUrl = server.url("/testUrl");
+
+        OAuthRequestAsync request = new OAuthRequestAsync(Verb.GET, baseUrl.toString(), oAuthService);
+        Response response = request.sendAsync(null).get(30, TimeUnit.SECONDS);
+
+        assertEquals(expectedResponseBody, response.getBody());
+
+        RecordedRequest recordedRequest = server.takeRequest();
+        assertEquals("GET", recordedRequest.getMethod());
+
+        server.shutdown();
+    }
+
+    @Test
+    public void shouldSendPostRequest() throws Exception {
+        String expectedResponseBody = "response body";
+        String expectedRequestBody = "request body";
+
+        MockWebServer server = new MockWebServer();
+        server.enqueue(new MockResponse().setBody(expectedResponseBody));
+        server.enqueue(new MockResponse().setBody(expectedResponseBody));
+        server.start();
+
+        HttpUrl baseUrl = server.url("/testUrl");
+
+        // request with body
+        OAuthRequestAsync request = new OAuthRequestAsync(Verb.POST, baseUrl.toString(), oAuthService);
+        request.addPayload(expectedRequestBody);
+        Response response = request.sendAsync(null).get(30, TimeUnit.SECONDS);
+
+        assertEquals(expectedResponseBody, response.getBody());
+
+        RecordedRequest recordedRequest = server.takeRequest();
+        assertEquals("POST", recordedRequest.getMethod());
+        assertEquals(expectedRequestBody, recordedRequest.getBody().readUtf8());
+
+
+        // request with empty body
+        request = new OAuthRequestAsync(Verb.POST, baseUrl.toString(), oAuthService);
+        response = request.sendAsync(null).get(30, TimeUnit.SECONDS);
+
+        assertEquals(expectedResponseBody, response.getBody());
+
+        recordedRequest = server.takeRequest();
+        assertEquals("POST", recordedRequest.getMethod());
+        assertEquals("", recordedRequest.getBody().readUtf8());
+
+        server.shutdown();
+    }
+}
