Loading tests/lib/Android.bp +12 −0 Original line number Diff line number Diff line Loading @@ -20,7 +20,19 @@ java_library { "src/**/*.java", "src/**/*.kt", ], defaults: ["lib_mockito_extended"], static_libs: [ "kotlin-test", ], } java_defaults { name: "lib_mockito_extended", static_libs: [ "mockito-target-extended-minus-junit4" ], jni_libs: [ "libdexmakerjvmtiagent", "libstaticjvmtiagent", ], } tests/unit/src/android/networkstack/util/FakeDns.kt→tests/lib/src/android/networkstack/util/FakeDns.kt +3 −3 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ import android.net.InetAddresses import android.os.Looper import android.os.Handler import com.android.internal.annotations.GuardedBy import com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG import java.net.InetAddress import java.util.concurrent.Executor import org.mockito.invocation.InvocationOnMock Loading @@ -29,6 +28,7 @@ import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.doAnswer const val TYPE_UNSPECIFIED = -1 // TODO: Integrate with NetworkMonitorTest. class FakeDns(val mockResolver: DnsResolver) { class DnsEntry(val hostname: String, val type: Int, val addresses: List<InetAddress>) { Loading Loading @@ -78,7 +78,7 @@ class FakeDns(val mockResolver: DnsResolver) { val hostname = it.arguments[posHos] as String val executor = it.arguments[posExecutor] as Executor val callback = it.arguments[posCallback] as DnsResolver.Callback<List<InetAddress>> var type = if (posType != -1) it.arguments[posType] as Int else TYPE_ADDRCONFIG var type = if (posType != -1) it.arguments[posType] as Int else TYPE_UNSPECIFIED val answer = getAnswer(hostname, type) if (!answer?.addresses.isNullOrEmpty()) { Loading Loading
tests/lib/Android.bp +12 −0 Original line number Diff line number Diff line Loading @@ -20,7 +20,19 @@ java_library { "src/**/*.java", "src/**/*.kt", ], defaults: ["lib_mockito_extended"], static_libs: [ "kotlin-test", ], } java_defaults { name: "lib_mockito_extended", static_libs: [ "mockito-target-extended-minus-junit4" ], jni_libs: [ "libdexmakerjvmtiagent", "libstaticjvmtiagent", ], }
tests/unit/src/android/networkstack/util/FakeDns.kt→tests/lib/src/android/networkstack/util/FakeDns.kt +3 −3 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ import android.net.InetAddresses import android.os.Looper import android.os.Handler import com.android.internal.annotations.GuardedBy import com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG import java.net.InetAddress import java.util.concurrent.Executor import org.mockito.invocation.InvocationOnMock Loading @@ -29,6 +28,7 @@ import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.doAnswer const val TYPE_UNSPECIFIED = -1 // TODO: Integrate with NetworkMonitorTest. class FakeDns(val mockResolver: DnsResolver) { class DnsEntry(val hostname: String, val type: Int, val addresses: List<InetAddress>) { Loading Loading @@ -78,7 +78,7 @@ class FakeDns(val mockResolver: DnsResolver) { val hostname = it.arguments[posHos] as String val executor = it.arguments[posExecutor] as Executor val callback = it.arguments[posCallback] as DnsResolver.Callback<List<InetAddress>> var type = if (posType != -1) it.arguments[posType] as Int else TYPE_ADDRCONFIG var type = if (posType != -1) it.arguments[posType] as Int else TYPE_UNSPECIFIED val answer = getAnswer(hostname, type) if (!answer?.addresses.isNullOrEmpty()) { Loading