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

Merge "Alter CTS tests for change of async DNS API" am: 54661bb3c1

Browse Source 
am: e30011cdf0

Change-Id: I29999bfaffe610ffa947bd36ae733ffa0d975efc
This commit is contained in:
Luke Huang
2019-03-18 23:20:22 -07:00
committed by android-build-merger
parent 25fdf4f34b e30011cdf0
commit 846bb5c53e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/cts/DnsResolverTest.java
View File

@@ -40,6 +40,7 @@ import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@@ -51,14 +52,14 @@ public class DnsResolverTest extends AndroidTestCase {
static final int TIMEOUT_MS = 12_000; static final int TIMEOUT_MS = 12_000;
private ConnectivityManager mCM; private ConnectivityManager mCM;
private Handler mHandler; private Executor mExecutor;
private DnsResolver mDns; private DnsResolver mDns;
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
mCM = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); mCM = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
mHandler = new Handler(Looper.getMainLooper());
mDns = DnsResolver.getInstance(); mDns = DnsResolver.getInstance();
mExecutor = new Handler(Looper.getMainLooper())::post;
} }
private static String byteArrayToHexString(byte[] bytes) { private static String byteArrayToHexString(byte[] bytes) {
@@ -116,7 +117,8 @@ public class DnsResolverTest extends AndroidTestCase {
fail(msg + e.getMessage()); fail(msg + e.getMessage());
} }
}; };
mDns.query(network, dname, CLASS_IN, TYPE_A, FLAG_NO_CACHE_LOOKUP, mHandler, callback); mDns.query(network, dname, CLASS_IN, TYPE_A, FLAG_NO_CACHE_LOOKUP,
mExecutor, callback);
try { try {
assertTrue(msg + " but no valid answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + " but no valid answer after " + TIMEOUT_MS + "ms.",
latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
@@ -208,7 +210,7 @@ public class DnsResolverTest extends AndroidTestCase {
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg); final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg);
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP, mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
mHandler, callback); mExecutor, callback);
try { try {
assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.",
callback.waitForAnswer()); callback.waitForAnswer());
@@ -236,7 +238,7 @@ public class DnsResolverTest extends AndroidTestCase {
final String msg = "Query with RawAnswerCallback " + byteArrayToHexString(blob); final String msg = "Query with RawAnswerCallback " + byteArrayToHexString(blob);
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg); final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg);
mDns.query(network, blob, FLAG_NO_CACHE_LOOKUP, mHandler, callback); mDns.query(network, blob, FLAG_NO_CACHE_LOOKUP, mExecutor, callback);
try { try {
assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.",
callback.waitForAnswer()); callback.waitForAnswer());
@@ -274,7 +276,7 @@ public class DnsResolverTest extends AndroidTestCase {
} }
}; };
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP, mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
mHandler, callback); mExecutor, callback);
try { try {
assertTrue(msg + "but no answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + "but no answer after " + TIMEOUT_MS + "ms.",
latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
@@ -311,7 +313,7 @@ public class DnsResolverTest extends AndroidTestCase {
} }
}; };
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP, mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
mHandler, callback); mExecutor, callback);
try { try {
assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.",
latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));