From 043f8829c90bfb8b850a37cc7fd7e8e9d5f3b6ef Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Fri, 16 Aug 2019 13:12:56 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/4688 - Try to use context instead of targetContext (https://github.com/mozilla-mobile/fenix/pull/4765) --- .../java/org/mozilla/fenix/helpers/MockWebServer.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt index 46c5fd914..c51a826b3 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt @@ -4,18 +4,16 @@ package org.mozilla.fenix.helpers -import android.content.Context -import java.io.IOException - import android.net.Uri import android.os.Handler import android.os.Looper -import androidx.test.core.app.ApplicationProvider +import androidx.test.platform.app.InstrumentationRegistry import okhttp3.mockwebserver.Dispatcher import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.RecordedRequest import org.mozilla.fenix.helpers.ext.toUri +import java.io.IOException object MockWebServerHelper { @@ -48,7 +46,7 @@ class AndroidAssetDispatcher : Dispatcher() { private val mainThreadHandler = Handler(Looper.getMainLooper()) override fun dispatch(request: RecordedRequest): MockResponse { - val assetManager = ApplicationProvider.getApplicationContext().assets + val assetManager = InstrumentationRegistry.getInstrumentation().context.assets val assetContents = try { val pathNoLeadingSlash = request.path.drop(1) assetManager.open(pathNoLeadingSlash).use { inputStream ->