Skip to content

Commit 8b10c8d

Browse files
committed
Update for OkHttp3
1 parent 7725a96 commit 8b10c8d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

Parse/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ android {
4242
dependencies {
4343
compile 'com.parse.bolts:bolts-tasks:1.4.0'
4444

45-
provided 'com.squareup.okhttp3:okhttp:3.2.0'
45+
provided 'com.squareup.okhttp3:okhttp:3.3.1'
4646
provided 'com.facebook.stetho:stetho:1.3.0'
4747

4848
testCompile 'org.robolectric:robolectric:3.0'
4949
testCompile 'org.skyscreamer:jsonassert:1.2.3'
5050
testCompile 'org.mockito:mockito-core:1.10.19'
51-
testCompile 'com.squareup.okhttp3:mockwebserver:3.2.0'
51+
testCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
5252
}
5353

5454
android.libraryVariants.all { variant ->

Parse/src/test/java/com/parse/ParseOkHttpClientTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111
import com.parse.http.ParseHttpRequest;
1212
import com.parse.http.ParseHttpResponse;
1313
import com.parse.http.ParseNetworkInterceptor;
14-
import okhttp3.MediaType;
15-
import okhttp3.Protocol;
16-
import okhttp3.Request;
17-
import okhttp3.RequestBody;
18-
import okhttp3.Response;
19-
import okhttp3.ResponseBody;
20-
import okhttp3.mockwebserver.MockResponse;
21-
import okhttp3.mockwebserver.MockWebServer;
22-
import okhttp3.mockwebserver.RecordedRequest;
2314

2415
import org.json.JSONException;
2516
import org.json.JSONObject;
@@ -37,6 +28,15 @@
3728
import java.util.concurrent.TimeUnit;
3829
import java.util.zip.GZIPOutputStream;
3930

31+
import okhttp3.MediaType;
32+
import okhttp3.Protocol;
33+
import okhttp3.Request;
34+
import okhttp3.RequestBody;
35+
import okhttp3.Response;
36+
import okhttp3.ResponseBody;
37+
import okhttp3.mockwebserver.MockResponse;
38+
import okhttp3.mockwebserver.MockWebServer;
39+
import okhttp3.mockwebserver.RecordedRequest;
4040
import okio.Buffer;
4141
import okio.BufferedSource;
4242

@@ -355,7 +355,7 @@ private void verifyServerResponse(ParseHttpResponse parseResponse) throws IOExce
355355
// Generate a ParseHttpRequest sent to server
356356
private ParseHttpRequest generateClientRequest() throws Exception {
357357
Map<String, String> headers = new HashMap<>();
358-
headers.put("requestKey", "requestValue");
358+
headers.put("requestkey", "requestValue");
359359
JSONObject json = new JSONObject();
360360
json.put("key", "value");
361361
ParseHttpRequest parseRequest = new ParseHttpRequest.Builder()
@@ -372,7 +372,7 @@ private ParseHttpRequest generateClientRequest() throws Exception {
372372
private void verifyClientRequest(ParseHttpRequest parseRequest) throws IOException {
373373
assertEquals(server.url("/").toString(), parseRequest.getUrl());
374374
assertEquals(ParseHttpRequest.Method.POST, parseRequest.getMethod());
375-
assertEquals("requestValue", parseRequest.getHeader("requestKey"));
375+
assertEquals("requestValue", parseRequest.getHeader("requestkey"));
376376
assertEquals("application/json", parseRequest.getBody().getContentType());
377377
JSONObject json = new JSONObject();
378378
try {

0 commit comments

Comments
 (0)