LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Do not use mockito to create HttpURLConnection" am: 83c77c088b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784391

Change-Id: Ic167c952e137d56edfe8266f65db1a224ba65ff6
This commit is contained in:
Remi NGUYEN VAN
2021-08-03 08:07:10 +00:00
committed by Automerger Merge Worker
parent 4972bf1971 83c77c088b
commit 526015114e
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
View File

@@ -36,7 +36,6 @@ import org.mockito.Mockito.spy
import java.io.ByteArrayInputStream
import java.net.HttpURLConnection
import java.net.URL
import java.net.URLConnection
import java.nio.charset.StandardCharsets
private const val TEST_NETID = 42
@@ -63,6 +62,28 @@ class TestNetworkStackService : Service() {
override fun getPrivateDnsBypassNetwork(network: Network?) = privateDnsBypassNetwork
}
/**
* Mock [HttpURLConnection] to simulate reply from a server.
*/
private class MockConnection(
url: URL,
private val response: HttpResponse
) : HttpURLConnection(url) {
private val responseBytes = response.content.toByteArray(StandardCharsets.UTF_8)
override fun getResponseCode() = response.responseCode
override fun getContentLengthLong() = responseBytes.size.toLong()
override fun getHeaderField(field: String): String? {
return when (field) {
"location" -> response.redirectUrl
else -> null
}
}
override fun getInputStream() = ByteArrayInputStream(responseBytes)
override fun connect() = Unit
override fun disconnect() = Unit
override fun usingProxy() = false
}
private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(
context, TestPermissionChecker(), NetworkStackService.Dependencies()) {
@@ -70,17 +91,8 @@ class TestNetworkStackService : Service() {
private val privateDnsBypassNetwork = TestNetwork(TEST_NETID)
private inner class TestNetwork(netId: Int) : Network(netId) {
override fun openConnection(url: URL): URLConnection {
val response = InstrumentationConnector.processRequest(url)
val responseBytes = response.content.toByteArray(StandardCharsets.UTF_8)
val connection = mock(HttpURLConnection::class.java)
doReturn(response.responseCode).`when`(connection).responseCode
doReturn(responseBytes.size.toLong()).`when`(connection).contentLengthLong
doReturn(response.redirectUrl).`when`(connection).getHeaderField("location")
doReturn(ByteArrayInputStream(responseBytes)).`when`(connection).inputStream
return connection
}
override fun openConnection(url: URL) = MockConnection(
url, InstrumentationConnector.processRequest(url))
}
override fun makeNetworkMonitor(