blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #4688 - Try to use context instead of targetContext (#4765)

master
Emily Kager 2019-08-16 13:12:56 -04:00 committed by Sawyer Blatz
parent 3e96bce93b
commit c9598bc4d1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt
View File

@ -4,18 +4,16 @@
package org.mozilla.fenix.helpers package org.mozilla.fenix.helpers
import android.content.Context
import java.io.IOException
import android.net.Uri import android.net.Uri
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import androidx.test.core.app.ApplicationProvider import androidx.test.platform.app.InstrumentationRegistry
import okhttp3.mockwebserver.Dispatcher import okhttp3.mockwebserver.Dispatcher
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.MockWebServer
import okhttp3.mockwebserver.RecordedRequest import okhttp3.mockwebserver.RecordedRequest
import org.mozilla.fenix.helpers.ext.toUri import org.mozilla.fenix.helpers.ext.toUri
import java.io.IOException
object MockWebServerHelper { object MockWebServerHelper {
@ -48,7 +46,7 @@ class AndroidAssetDispatcher : Dispatcher() {
private val mainThreadHandler = Handler(Looper.getMainLooper()) private val mainThreadHandler = Handler(Looper.getMainLooper())
override fun dispatch(request: RecordedRequest): MockResponse { override fun dispatch(request: RecordedRequest): MockResponse {
val assetManager = ApplicationProvider.getApplicationContext<Context>().assets val assetManager = InstrumentationRegistry.getInstrumentation().context.assets
val assetContents = try { val assetContents = try {
val pathNoLeadingSlash = request.path.drop(1) val pathNoLeadingSlash = request.path.drop(1)
assetManager.open(pathNoLeadingSlash).use { inputStream -> assetManager.open(pathNoLeadingSlash).use { inputStream ->