Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cbdfe79 authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Merge "Move FakeDns to net-tests-utils lib" am: 6e5adbdc am: e417d63a am: d36a1f3c 

am: 31d6c5a0

Change-Id: Ibe3c4588c0694e6e9470eae9099bfa066f532526
parents b8776d5a 31d6c5a0

tests/lib/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -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
@@ -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
@@ -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>) {
@@ -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()) {