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

Merge "Minor changes for DnsResolverTest"

Browse Source 
am: e445f54934

Change-Id: I176d2e3538d20acef4e04f082735b55c5cca07e6
This commit is contained in:
Luke Huang
2019-04-12 10:50:04 -07:00
committed by android-build-merger
parent 8999684430 e445f54934
commit c8ecc806ad
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,9 +144,8 @@ public class DnsResolverTest extends AndroidTestCase {
private DnsAnswer mDnsAnswer; private DnsAnswer mDnsAnswer;
VerifyCancelCallback(@NonNull String msg, @Nullable CancellationSignal cancel) { VerifyCancelCallback(@NonNull String msg, @Nullable CancellationSignal cancel) {
this.mMsg = msg; mMsg = msg;
this.mCancelSignal = cancel; mCancelSignal = cancel;
this.mDnsAnswer = null;
} }
VerifyCancelCallback(@NonNull String msg) { VerifyCancelCallback(@NonNull String msg) {
@@ -187,15 +186,15 @@ public class DnsResolverTest extends AndroidTestCase {
} }
private void assertValidAnswer() { private void assertValidAnswer() {
assertTrue(mMsg + "No valid answer", mDnsAnswer != null); assertNotNull(mMsg + " No valid answer", mDnsAnswer);
assertTrue(mMsg + " Unexpected error: reported rcode" + mRcode + assertEquals(mMsg + " Unexpected error: reported rcode" + mRcode +
" blob's rcode " + mDnsAnswer.getRcode(), mRcode == mDnsAnswer.getRcode()); " blob's rcode " + mDnsAnswer.getRcode(), mRcode, mDnsAnswer.getRcode());
} }
public void assertHasAnswer() { public void assertHasAnswer() {
assertValidAnswer(); assertValidAnswer();
// Check rcode field.(0, No error condition). // Check rcode field.(0, No error condition).
assertTrue(mMsg + " Response error, rcode: " + mRcode, mRcode == 0); assertEquals(mMsg + " Response error, rcode: " + mRcode, mRcode, 0);
// Check answer counts. // Check answer counts.
assertGreaterThan(mMsg + " No answer found", mDnsAnswer.getANCount(), 0); assertGreaterThan(mMsg + " No answer found", mDnsAnswer.getANCount(), 0);
// Check question counts. // Check question counts.
@@ -205,9 +204,9 @@ public class DnsResolverTest extends AndroidTestCase {
public void assertNXDomain() { public void assertNXDomain() {
assertValidAnswer(); assertValidAnswer();
// Check rcode field.(3, NXDomain). // Check rcode field.(3, NXDomain).
assertTrue(mMsg + " Unexpected rcode: " + mRcode, mRcode == NXDOMAIN); assertEquals(mMsg + " Unexpected rcode: " + mRcode, mRcode, NXDOMAIN);
// Check answer counts. Expect 0 answer. // Check answer counts. Expect 0 answer.
assertTrue(mMsg + " Not an empty answer", mDnsAnswer.getANCount() == 0); assertEquals(mMsg + " Not an empty answer", mDnsAnswer.getANCount(), 0);
// Check question counts. // Check question counts.
assertGreaterThan(mMsg + " No question found", mDnsAnswer.getQDCount(), 0); assertGreaterThan(mMsg + " No question found", mDnsAnswer.getQDCount(), 0);
} }
@@ -215,9 +214,9 @@ public class DnsResolverTest extends AndroidTestCase {
public void assertEmptyAnswer() { public void assertEmptyAnswer() {
assertValidAnswer(); assertValidAnswer();
// Check rcode field.(0, No error condition). // Check rcode field.(0, No error condition).
assertTrue(mMsg + " Response error, rcode: " + mRcode, mRcode == 0); assertEquals(mMsg + " Response error, rcode: " + mRcode, mRcode, 0);
// Check answer counts. Expect 0 answer. // Check answer counts. Expect 0 answer.
assertTrue(mMsg + " Not an empty answer", mDnsAnswer.getANCount() == 0); assertEquals(mMsg + " Not an empty answer", mDnsAnswer.getANCount(), 0);
// Check question counts. // Check question counts.
assertGreaterThan(mMsg + " No question found", mDnsAnswer.getQDCount(), 0); assertGreaterThan(mMsg + " No question found", mDnsAnswer.getQDCount(), 0);
} }
@@ -279,10 +278,10 @@ public class DnsResolverTest extends AndroidTestCase {
try { try {
assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.", assertTrue(msg + " but no answer after " + TIMEOUT_MS + "ms.",
callback.waitForAnswer()); callback.waitForAnswer());
// Except no answer record because of querying with empty dname(ROOT) // Except no answer record because the root does not have AAAA records.
callback.assertEmptyAnswer(); callback.assertEmptyAnswer();
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(msg + "Waiting for DNS lookup was interrupted"); fail(msg + " Waiting for DNS lookup was interrupted");
} }
} }
} }
@@ -331,7 +330,7 @@ public class DnsResolverTest extends AndroidTestCase {
assertTrue(msg + " query was not cancelled", assertTrue(msg + " query was not cancelled",
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"); fail(msg + " Waiting for DNS lookup was interrupted");
} }
} while (retry); } while (retry);
} }
@@ -508,7 +507,7 @@ public class DnsResolverTest extends AndroidTestCase {
assertTrue(msg + " query was not cancelled", assertTrue(msg + " query was not cancelled",
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"); fail(msg + " Waiting for DNS lookup was interrupted");
} }
} while (retry); } while (retry);
} }