diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2019-08-02 10:21:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-02 10:21:56 +0000 |
| commit | 6e5adbdcaecd257843ae3fe74386be960b9caa29 (patch) | |
| tree | f4fb33c38909da3c8221dcc1aaa8c3574a0bc99b | |
| parent | 98ed332579d20a8304b5cdbba761d49bcad75fd3 (diff) | |
| parent | 0ceff045f73dec5d9bff975def0f48e587c9b46a (diff) | |
Merge "Move FakeDns to net-tests-utils lib"
| -rw-r--r-- | tests/lib/Android.bp | 12 | ||||
| -rw-r--r-- | tests/lib/src/android/networkstack/util/FakeDns.kt (renamed from tests/unit/src/android/networkstack/util/FakeDns.kt) | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/tests/lib/Android.bp b/tests/lib/Android.bp index f45a81c..1d52fa0 100644 --- a/tests/lib/Android.bp +++ b/tests/lib/Android.bp @@ -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", + ], +} diff --git a/tests/unit/src/android/networkstack/util/FakeDns.kt b/tests/lib/src/android/networkstack/util/FakeDns.kt index f0d44d0..157b6ce 100644 --- a/tests/unit/src/android/networkstack/util/FakeDns.kt +++ b/tests/lib/src/android/networkstack/util/FakeDns.kt @@ -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()) { @@ -91,4 +91,4 @@ class FakeDns(val mockResolver: DnsResolver) { fun clearAll() = synchronized(answers) { answers.clear() } -}
\ No newline at end of file +} |