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

Merge "Improve test for the changing of DnsResolver"

Browse Source 
am: fd3e15e0c5

Change-Id: I95d74116c9de67b8915343f45b26a011d0248faa
This commit is contained in:
Luke Huang
2019-03-18 22:51:31 -07:00
committed by android-build-merger
parent 00cee53591 26cc1b4a04
commit 9ba36c075d
1 changed files with 131 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,15 +18,18 @@ package android.net.cts;
import static android.net.DnsResolver.CLASS_IN; import static android.net.DnsResolver.CLASS_IN;
import static android.net.DnsResolver.FLAG_NO_CACHE_LOOKUP; import static android.net.DnsResolver.FLAG_NO_CACHE_LOOKUP;
import static android.net.DnsResolver.TYPE_A;
import static android.net.DnsResolver.TYPE_AAAA; import static android.net.DnsResolver.TYPE_AAAA;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.DnsPacket; import android.net.DnsPacket;
import android.net.DnsResolver; import android.net.DnsResolver;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.ParseException;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.system.ErrnoException; import android.system.ErrnoException;
@@ -86,41 +89,55 @@ public class DnsResolverTest extends AndroidTestCase {
return testableNetworks.toArray(new Network[0]); return testableNetworks.toArray(new Network[0]);
} }
public void testInetAddressQuery() throws ErrnoException { public void testQueryWithInetAddressCallback() {
final String dname = "www.google.com"; final String dname = "www.google.com";
final String msg = "InetAddress query " + dname; final String msg = "Query with InetAddressAnswerCallback " + dname;
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final AtomicReference<List<InetAddress>> answers = new AtomicReference<>(); final AtomicReference<List<InetAddress>> answers = new AtomicReference<>();
final DnsResolver.InetAddressAnswerCallback callback =
mDns.query(network, dname, FLAG_NO_CACHE_LOOKUP, mHandler, answerList -> { new DnsResolver.InetAddressAnswerCallback() {
answers.set(answerList); @Override
for (InetAddress addr : answerList) { public void onAnswer(@NonNull List<InetAddress> answerList) {
Log.d(TAG, "Reported addr:" + addr.toString()); answers.set(answerList);
} for (InetAddress addr : answerList) {
latch.countDown(); Log.d(TAG, "Reported addr: " + addr.toString());
} }
); latch.countDown();
}
@Override
public void onParseException(@NonNull ParseException e) {
fail(msg + e.getMessage());
}
@Override
public void onQueryException(@NonNull ErrnoException e) {
fail(msg + e.getMessage());
}
};
mDns.query(network, dname, CLASS_IN, TYPE_A, FLAG_NO_CACHE_LOOKUP, mHandler, 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));
assertGreaterThan(msg + " returned 0 result", answers.get().size(), 0); assertGreaterThan(msg + " returned 0 result", answers.get().size(), 0);
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + " Waiting for DNS lookup was interrupted");
} }
} }
} }
static private void assertGreaterThan(String msg, int a, int b) { static private void assertGreaterThan(String msg, int first, int second) {
assertTrue(msg + ": " + a + " > " + b, a > b); assertTrue(msg + " Excepted " + first + " to be greater than " + second, first > second);
} }
static private void assertValidAnswer(String msg, @NonNull DnsAnswer ans) { static private void assertValidAnswer(String msg, @NonNull DnsAnswer ans) {
// Check rcode field.(0, No error condition). // Check rcode field.(0, No error condition).
assertTrue(msg + " Response error, rcode: " + ans.getRcode(), ans.getRcode() == 0); assertTrue(msg + " Response error, rcode: " + ans.getRcode(), ans.getRcode() == 0);
// Check answer counts. // Check answer counts.
assertTrue(msg + " No answer found", ans.getANCount() > 0); assertGreaterThan(msg + " No answer found", ans.getANCount(), 0);
// Check question counts. // Check question counts.
assertTrue(msg + " No question found", ans.getQDCount() > 0); assertGreaterThan(msg + " No question found", ans.getQDCount(), 0);
} }
static private void assertValidEmptyAnswer(String msg, @NonNull DnsAnswer ans) { static private void assertValidEmptyAnswer(String msg, @NonNull DnsAnswer ans) {
@@ -129,10 +146,10 @@ public class DnsResolverTest extends AndroidTestCase {
// Check answer counts. Expect 0 answer. // Check answer counts. Expect 0 answer.
assertTrue(msg + " Not an empty answer", ans.getANCount() == 0); assertTrue(msg + " Not an empty answer", ans.getANCount() == 0);
// Check question counts. // Check question counts.
assertTrue(msg + " No question found", ans.getQDCount() > 0); assertGreaterThan(msg + " No question found", ans.getQDCount(), 0);
} }
private class DnsAnswer extends DnsPacket { private static class DnsAnswer extends DnsPacket {
DnsAnswer(@NonNull byte[] data) throws ParseException { DnsAnswer(@NonNull byte[] data) throws ParseException {
super(data); super(data);
// Check QR field.(query (0), or a response (1)). // Check QR field.(query (0), or a response (1)).
@@ -152,34 +169,56 @@ public class DnsResolverTest extends AndroidTestCase {
} }
} }
public void testRawQuery() throws ErrnoException { class RawAnswerCallbackImpl extends DnsResolver.RawAnswerCallback {
private final CountDownLatch mLatch = new CountDownLatch(1);
private final String mMsg;
RawAnswerCallbackImpl(String msg) {
this.mMsg = msg;
}
public boolean waitForAnswer() throws InterruptedException {
return mLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
}
@Override
public void onAnswer(@NonNull byte[] answer) {
try {
assertValidAnswer(mMsg, new DnsAnswer(answer));
Log.d(TAG, "Reported blob: " + byteArrayToHexString(answer));
mLatch.countDown();
} catch (ParseException e) {
fail(mMsg + e.getMessage());
}
}
@Override
public void onParseException(@NonNull ParseException e) {
fail(mMsg + e.getMessage());
}
@Override
public void onQueryException(@NonNull ErrnoException e) {
fail(mMsg + e.getMessage());
}
}
public void testQueryWithRawAnswerCallback() {
final String dname = "www.google.com"; final String dname = "www.google.com";
final String msg = "Raw query " + dname; final String msg = "Query with RawAnswerCallback " + dname;
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final CountDownLatch latch = new CountDownLatch(1); final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg);
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP, mHandler, mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
answer -> { mHandler, callback);
if (answer == null) {
fail(msg + " no answer returned");
}
try {
assertValidAnswer(msg, new DnsAnswer(answer));
Log.d(TAG, "Reported blob:" + byteArrayToHexString(answer));
latch.countDown();
} catch (DnsPacket.ParseException e) {
fail(msg + e.getMessage());
}
}
);
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)); callback.waitForAnswer());
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + " Waiting for DNS lookup was interrupted");
} }
} }
} }
public void testRawQueryWithBlob() throws ErrnoException { public void testQueryBlobWithRawAnswerCallback() {
final byte[] blob = new byte[]{ final byte[] blob = new byte[]{
/* Header */ /* Header */
0x55, 0x66, /* Transaction ID */ 0x55, 0x66, /* Transaction ID */
@@ -194,74 +233,90 @@ public class DnsResolverTest extends AndroidTestCase {
0x00, 0x01, /* Type */ 0x00, 0x01, /* Type */
0x00, 0x01 /* Class */ 0x00, 0x01 /* Class */
}; };
final String msg = "Raw query with blob " + byteArrayToHexString(blob); final String msg = "Query with RawAnswerCallback " + byteArrayToHexString(blob);
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final CountDownLatch latch = new CountDownLatch(1); final RawAnswerCallbackImpl callback = new RawAnswerCallbackImpl(msg);
mDns.query(network, blob, FLAG_NO_CACHE_LOOKUP, mHandler, answer -> { mDns.query(network, blob, FLAG_NO_CACHE_LOOKUP, mHandler, callback);
if (answer == null) {
fail(msg + " no answer returned");
}
try {
assertValidAnswer(msg, new DnsAnswer(answer));
Log.d(TAG, "Reported blob:" + byteArrayToHexString(answer));
latch.countDown();
} catch (DnsPacket.ParseException e) {
fail(msg + e.getMessage());
}
}
);
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)); callback.waitForAnswer());
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + " Waiting for DNS lookup was interrupted");
} }
} }
} }
public void testEmptyQuery() throws ErrnoException { public void testQueryRoot() {
final String dname = ""; final String dname = "";
final String msg = "Raw query empty dname(ROOT)"; final String msg = "Query with RawAnswerCallback empty dname(ROOT) ";
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP, mHandler, final DnsResolver.RawAnswerCallback callback = new DnsResolver.RawAnswerCallback() {
answer -> { @Override
if (answer == null) { public void onAnswer(@NonNull byte[] answer) {
fail(msg + " no answer returned"); try {
} // Except no answer record because of querying with empty dname(ROOT)
try { assertValidEmptyAnswer(msg, new DnsAnswer(answer));
// Except no answer record because of querying with empty dname(ROOT) latch.countDown();
assertValidEmptyAnswer(msg, new DnsAnswer(answer)); } catch (ParseException e) {
latch.countDown(); fail(msg + e.getMessage());
} catch (DnsPacket.ParseException e) {
fail(msg + e.getMessage());
}
} }
); }
@Override
public void onParseException(@NonNull ParseException e) {
fail(msg + e.getMessage());
}
@Override
public void onQueryException(@NonNull ErrnoException e) {
fail(msg + e.getMessage());
}
};
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
mHandler, 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));
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + "Waiting for DNS lookup was interrupted");
} }
} }
} }
public void testNXQuery() throws ErrnoException { public void testQueryNXDomain() {
final String dname = "test1-nx.metric.gstatic.com"; final String dname = "test1-nx.metric.gstatic.com";
final String msg = "InetAddress query " + dname; final String msg = "Query with InetAddressAnswerCallback " + dname;
for (Network network : getTestableNetworks()) { for (Network network : getTestableNetworks()) {
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
mDns.query(network, dname, FLAG_NO_CACHE_LOOKUP, mHandler, answerList -> { final DnsResolver.InetAddressAnswerCallback callback =
if (answerList.size() == 0) { new DnsResolver.InetAddressAnswerCallback() {
latch.countDown(); @Override
return; public void onAnswer(@NonNull List<InetAddress> answerList) {
} if (answerList.size() == 0) {
fail(msg + " but get valid answers"); latch.countDown();
return;
} }
); fail(msg + " but get valid answers");
}
@Override
public void onParseException(@NonNull ParseException e) {
fail(msg + e.getMessage());
}
@Override
public void onQueryException(@NonNull ErrnoException e) {
fail(msg + e.getMessage());
}
};
mDns.query(network, dname, CLASS_IN, TYPE_AAAA, FLAG_NO_CACHE_LOOKUP,
mHandler, 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));
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + " Waiting for DNS lookup was interrupted");
} }
} }
} }