From d2952766e429c3ef30d20b9d57a2cbc0ec25cf25 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sun, 20 Sep 2020 23:05:28 +0200
Subject: [PATCH] update OkHttp mockwebserver

---
 app/build.gradle                                          | 2 +-
 .../api/availability/NewMotionAvailabilityDetectorTest.kt | 4 ++--
 .../evmap/api/goingelectric/GoingElectricApiTest.kt       | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 48d12fe9..c940d9b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
     testImplementation 'junit:junit:4.13'
-    testImplementation "com.squareup.okhttp3:mockwebserver:3.14.7"
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt b/app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt
index bbec9ae2..6d6532a9 100644
--- a/app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt
+++ b/app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt
@@ -33,11 +33,11 @@ class NewMotionAvailabilityDetectorTest {
             val notFoundResponse = MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_FOUND)
 
             override fun dispatch(request: RecordedRequest): MockResponse {
-                val segments = request.requestUrl.pathSegments
+                val segments = request.requestUrl!!.pathSegments
                 val urlHead = segments.subList(0, 2).joinToString("/")
                 when (urlHead) {
                     "ge/chargepoints" -> {
-                        val id = request.requestUrl.queryParameter("ge_id")
+                        val id = request.requestUrl!!.queryParameter("ge_id")
                         return okResponse("/chargers/$id.json")
                     }
                     "nm/markers" -> {
diff --git a/app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt b/app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt
index f26d8ef5..b691377c 100644
--- a/app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt
+++ b/app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt
@@ -24,18 +24,18 @@ class GoingElectricApiTest {
 
         webServer.dispatcher = object : Dispatcher() {
             override fun dispatch(request: RecordedRequest): MockResponse {
-                val segments = request.requestUrl.pathSegments
+                val segments = request.requestUrl!!.pathSegments
                 val urlHead = segments.subList(0, 2).joinToString("/")
                 when (urlHead) {
                     "ge/chargepoints" -> {
-                        val id = request.requestUrl.queryParameter("ge_id")
+                        val id = request.requestUrl!!.queryParameter("ge_id")
                         if (id != null) {
                             return okResponse("/chargers/$id.json")
                         } else {
                             val freeparking =
-                                request.requestUrl.queryParameter("freeparking")!!.toBoolean()
+                                request.requestUrl!!.queryParameter("freeparking")!!.toBoolean()
                             val freecharging =
-                                request.requestUrl.queryParameter("freecharging")!!.toBoolean()
+                                request.requestUrl!!.queryParameter("freecharging")!!.toBoolean()
                             return if (freeparking && freecharging) {
                                 okResponse("/chargers/list-empty.json")
                             } else if (freecharging) {