ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #8169 - Upgrade Mockwebserver (#16186) 

Upgrades Mockwebserver to 4.9.0
This commit is contained in:
Aaron Train 2020-10-27 10:19:24 -04:00 committed by GitHub
parent b8d6dbd426
commit b8fff8cef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
View File

@ -110,7 +110,7 @@ class BaselinePingTest {
do {
attempts += 1
val request = server.takeRequest(20L, TimeUnit.SECONDS) ?: break
val docType = request.path.split("/")[3]
val docType = request.path!!.split("/")[3]
if (pingName == docType) {
val parsedPayload = JSONObject(request.getPlainBody())
if (pingReason == null) {

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

@ -39,11 +39,13 @@ object MockWebServerHelper {
*/
fun createAlwaysOkMockWebServer(): MockWebServer {
return MockWebServer().apply {
setDispatcher(object : Dispatcher() {
val dispatcher = object : Dispatcher() {
@Throws(InterruptedException::class)
override fun dispatch(request: RecordedRequest): MockResponse {
return MockResponse().setBody("OK")
}
})
}
this.dispatcher = dispatcher
}
}
}
@ -62,10 +64,10 @@ const val HTTP_NOT_FOUND = 404
class AndroidAssetDispatcher : Dispatcher() {
private val mainThreadHandler = Handler(Looper.getMainLooper())
override fun dispatch(request: RecordedRequest?): MockResponse {
override fun dispatch(request: RecordedRequest): MockResponse {
val assetManager = InstrumentationRegistry.getInstrumentation().context.assets
try {
val pathWithoutQueryParams = Uri.parse(request?.path?.drop(1)).path
val pathWithoutQueryParams = Uri.parse(request.path!!.drop(1)).path
assetManager.open(pathWithoutQueryParams!!).use { inputStream ->
return fileToResponse(pathWithoutQueryParams, inputStream)
}
@ -81,7 +83,7 @@ class AndroidAssetDispatcher : Dispatcher() {
private fun fileToResponse(path: String, file: InputStream): MockResponse {
return MockResponse()
.setResponseCode(HTTP_OK)
.setBody(fileToBytes(file))
.setBody(fileToBytes(file)!!)
.addHeader("content-type: " + contentType(path))
}

2
app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
View File

@ -43,7 +43,7 @@ class MenuScreenShotTest : ScreenshotTest() {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
View File

@ -44,7 +44,7 @@ class SyncIntegrationTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
View File

@ -49,7 +49,7 @@ class BookmarksTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
View File

@ -42,7 +42,7 @@ class ContextMenusTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt
View File

@ -43,7 +43,7 @@ class DeepLinkTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
View File

@ -51,7 +51,7 @@ class DownloadTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
View File

@ -41,7 +41,7 @@ class HistoryTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
View File

@ -37,7 +37,7 @@ class MediaNotificationTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
View File

@ -38,7 +38,7 @@ class NavigationToolbarTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/ReaderViewTest.kt
View File

@ -41,7 +41,7 @@ class ReaderViewTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt
View File

@ -33,7 +33,7 @@ class SettingsAboutTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
View File

@ -39,7 +39,7 @@ class SettingsAddonsTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
View File

@ -32,7 +32,7 @@ class SettingsAdvancedTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
View File

@ -39,7 +39,7 @@ class SettingsBasicsTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeveloperToolsTest.kt
View File

@ -33,7 +33,7 @@ class SettingsDeveloperToolsTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
View File

@ -41,7 +41,7 @@ class SettingsPrivacyTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSyncTest.kt
View File

@ -32,7 +32,7 @@ class SettingsSyncTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsTest.kt
View File

@ -32,7 +32,7 @@ class SettingsTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt
View File

@ -33,7 +33,7 @@ class ShareButtonTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
View File

@ -34,7 +34,7 @@ class SmokeTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
View File

@ -42,7 +42,7 @@ class StrictEnhancedTrackingProtectionTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
View File

@ -49,7 +49,7 @@ class TabbedBrowsingTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
View File

@ -32,7 +32,7 @@ class ThreeDotMenuMainTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
View File

@ -36,7 +36,7 @@ class TopSitesTest {
@Before
fun setUp() {
mockWebServer = MockWebServer().apply {
setDispatcher(AndroidAssetDispatcher())
dispatcher = AndroidAssetDispatcher()
start()
}
}

2
buildSrc/src/main/java/Dependencies.kt
View File

@ -43,7 +43,7 @@ object Versions {
const val junit = "5.5.2"
const val mockk = "1.10.0"
const val mockwebserver = "3.11.0"
const val mockwebserver = "4.9.0"
const val uiautomator = "2.2.0"
const val google_ads_id_version = "16.0.0"