update OkHttp mockwebserver

This commit is contained in:
johan12345
2020-09-20 23:05:28 +02:00
parent 40503b6bd2
commit d2952766e4
3 changed files with 7 additions and 7 deletions

View File

@@ -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'

View File

@@ -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" -> {

View File

@@ -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) {