Skip to content
This repository was archived by the owner on Mar 10, 2022. It is now read-only.

Commit 38627a6

Browse files
pasinpasin
committed
Update OKHttp to v3.11.0
* Updated OKHttp to v3.11.0 * Fixed unit tests * https://github.com/couchbase/couchbase-lite-java-core/issues/1684
1 parent 84023a3 commit 38627a6

File tree

6 files changed

+17
-3
lines changed

6 files changed

+17
-3
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
'com.couchbase.lite:couchbase-lite-android-forestdb:' + version
7878

7979
androidTestCompile 'commons-io:commons-io:2.0.1'
80-
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
80+
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.11.0'
8181

8282
// For JavaScript query test
8383
androidTestCompile ('com.couchbase.lite:couchbase-lite-java-javascript:1.4.+'){

‎libraries/couchbase-lite-java-core‎

‎libraries/couchbase-lite-java-forestdb‎

‎src/androidTest/java/com/couchbase/lite/replicator/ChangeTrackerTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public Response intercept(Chain chain) throws IOException {
8989
Response.Builder builder = new Response.Builder()
9090
.request(request)
9191
.code(200)
92+
.message("OK")
9293
.protocol(Protocol.HTTP_1_1)
9394
.body(ResponseBody.create(OkHttpUtils.JSON, json));
9495
return builder.build();
@@ -275,6 +276,7 @@ public Response intercept(Chain chain) throws IOException {
275276
Response.Builder builder = new Response.Builder()
276277
.request(request)
277278
.code(200)
279+
.message("OK")
278280
.protocol(Protocol.HTTP_1_1)
279281
.body(ResponseBody.create(OkHttpUtils.JSON, json));
280282
return builder.build();
@@ -292,6 +294,7 @@ public Response intercept(Chain chain) throws IOException {
292294
Response.Builder builder = new Response.Builder()
293295
.request(request)
294296
.code(code)
297+
.message(message)
295298
.protocol(Protocol.HTTP_1_1)
296299
.body(ResponseBody.create(OkHttpUtils.TEXT, message));
297300
return builder.build();

‎src/androidTest/java/com/couchbase/lite/replicator/CustomizableMockInterceptor.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public Response execute(Request request) throws IOException {
116116
return new Response.Builder()
117117
.request(request)
118118
.code(200)
119+
.message("OK")
119120
.protocol(Protocol.HTTP_1_1)
120121
.body(ResponseBody.create(JSON, json)).build();
121122
}
@@ -139,6 +140,7 @@ public Response execute(Request request) throws IOException {
139140
return new Response.Builder()
140141
.request(request)
141142
.code(200)
143+
.message("OK")
142144
.protocol(Protocol.HTTP_1_1)
143145
.body(ResponseBody.create(JSON, json)).build();
144146
}
@@ -153,6 +155,7 @@ public Response execute(Request request) throws IOException {
153155
return new Response.Builder()
154156
.request(request)
155157
.code(404)
158+
.message("Not Found")
156159
.protocol(Protocol.HTTP_1_1)
157160
.body(ResponseBody.create(JSON, json)).build();
158161
}
@@ -219,6 +222,7 @@ public static Response fakeBulkDocs(Request request) throws IOException {
219222
return new Response.Builder()
220223
.request(request)
221224
.code(200)
225+
.message("OK")
222226
.protocol(Protocol.HTTP_1_1)
223227
.body(ResponseBody.create(JSON, json)).build();
224228
}
@@ -253,6 +257,7 @@ public static Response fakeRevsDiff(Request request) throws IOException {
253257
return new Response.Builder()
254258
.request(request)
255259
.code(200)
260+
.message("OK")
256261
.protocol(Protocol.HTTP_1_1)
257262
.body(ResponseBody.create(JSON, json)).build();
258263
}

‎src/androidTest/java/com/couchbase/lite/replicator/ReplicationMockHttpClientTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public Response execute(Request request) throws IOException {
122122
return new Response.Builder()
123123
.request(request)
124124
.code(404)
125+
.message("Not Found")
125126
.protocol(Protocol.HTTP_1_1)
126127
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
127128
}
@@ -207,6 +208,7 @@ public Response execute(Request request) throws IOException {
207208
return new Response.Builder()
208209
.request(request)
209210
.code(200)
211+
.message("OK")
210212
.protocol(Protocol.HTTP_1_1)
211213
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
212214
}
@@ -250,6 +252,7 @@ public Response execute(Request request) throws IOException {
250252
return new Response.Builder()
251253
.request(request)
252254
.code(200)
255+
.message("OK")
253256
.protocol(Protocol.HTTP_1_1)
254257
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
255258
}
@@ -266,6 +269,7 @@ public Response execute(Request request) throws IOException {
266269
return new Response.Builder()
267270
.request(request)
268271
.code(200)
272+
.message("OK")
269273
.protocol(Protocol.HTTP_1_1)
270274
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
271275
}
@@ -315,6 +319,7 @@ public Response execute(Request request) throws IOException {
315319
return new Response.Builder()
316320
.request(request)
317321
.code(415)
322+
.message("Unsupported Media Type")
318323
.protocol(Protocol.HTTP_1_1)
319324
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
320325
}
@@ -328,6 +333,7 @@ public Response execute(Request request) throws IOException {
328333
return new Response.Builder()
329334
.request(request)
330335
.code(200)
336+
.message("OK")
331337
.protocol(Protocol.HTTP_1_1)
332338
.body(ResponseBody.create(OkHttpUtils.JSON, json)).build();
333339
}

0 commit comments

Comments
 (0)