From b511c888ec8d115a751bf46b24ed0b5ed24454f0 Mon Sep 17 00:00:00 2001 From: Brian Muramatsu Date: Mon, 20 Dec 2010 13:57:14 -0800 Subject: [PATCH] Nuke TrafficStatsTest#testTrafficStatsWithHost... Bug 3189208 Removing this test due to potential problems with GB. This will need to be brought back and investigated. Change-Id: Ifeafdf44464c652b063edfb51c5f7931624b6973 --- .../src/android/net/cts/TrafficStatsTest.java | 73 ++----------------- 1 file changed, 6 insertions(+), 67 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java index 9d23a874da..183f891637 100644 --- a/tests/cts/net/src/android/net/cts/TrafficStatsTest.java +++ b/tests/cts/net/src/android/net/cts/TrafficStatsTest.java @@ -16,24 +16,20 @@ package android.net.cts; -import android.os.Process; -import android.net.TrafficStats; -import android.test.AndroidTestCase; - -import dalvik.annotation.TestTargets; import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargetClass; +import dalvik.annotation.TestTargetNew; +import dalvik.annotation.TestTargets; + +import android.net.TrafficStats; +import android.os.Process; +import android.test.AndroidTestCase; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; -import java.net.UnknownHostException; -import java.util.Random; @TestTargetClass(TrafficStats.class) public class TrafficStatsTest extends AndroidTestCase { @@ -57,63 +53,6 @@ public class TrafficStatsTest extends AndroidTestCase { TrafficStats.getMobileRxBytes() >= 0); } - @TestTargets({ - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getTotalTxPackets"), - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getTotalRxPackets"), - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getTotalTxBytes"), - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getTotalRxBytes"), - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getUidTxBytes"), - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getUidRxBytes") - }) - public void testTrafficStatsWithHostLookup() { - long txPacketsBefore = TrafficStats.getTotalTxPackets(); - long rxPacketsBefore = TrafficStats.getTotalRxPackets(); - long txBytesBefore = TrafficStats.getTotalTxBytes(); - long rxBytesBefore = TrafficStats.getTotalRxBytes(); - long uidTxBytesBefore = TrafficStats.getUidTxBytes(Process.myUid()); - long uidRxBytesBefore = TrafficStats.getUidRxBytes(Process.myUid()); - - // Look up random hostnames in a wildcard domain owned by Google. - // This will require a DNS request, which should generate traffic. - - int found = 0; - Random r = new Random(); - for (int i = 0; i < 10; i++) { - try { - String host = "test" + r.nextInt(100000) + ".clients.google.com"; - InetAddress[] addr = InetAddress.getAllByName(host); - if (addr.length > 0) found++; - } catch (UnknownHostException e) { - // Ignore -- our purpose is not to test network connectivity, - // and we'd rather have false positives than a flaky test. - } - } - - long txPacketsAfter = TrafficStats.getTotalTxPackets(); - long rxPacketsAfter = TrafficStats.getTotalRxPackets(); - long txBytesAfter = TrafficStats.getTotalTxBytes(); - long rxBytesAfter = TrafficStats.getTotalRxBytes(); - long uidTxBytesAfter = TrafficStats.getUidTxBytes(Process.myUid()); - long uidRxBytesAfter = TrafficStats.getUidRxBytes(Process.myUid()); - - // Make some conservative assertions about the data used: - // each successful resolution should exchange at least one packet, - // and at least 20 bytes in each direction. - - assertTrue("txp: " + txPacketsBefore + " [" + found + "] " + txPacketsAfter, - txPacketsAfter >= txPacketsBefore + found); - assertTrue("rxp: " + rxPacketsBefore + " [" + found + "] " + rxPacketsAfter, - rxPacketsAfter >= rxPacketsBefore + found); - assertTrue("txb: " + txBytesBefore + " [" + found + "] " + txBytesAfter, - txBytesAfter >= txBytesBefore + found * 20); - assertTrue("rxb: " + rxBytesBefore + " [" + found + "] " + rxBytesAfter, - rxBytesAfter >= rxBytesBefore + found * 20); - assertTrue("uidtxb: " + uidTxBytesBefore + " [" + found + "] " + uidTxBytesAfter, - uidTxBytesAfter >= uidTxBytesBefore + found * 20); - assertTrue("uidrxb: " + uidRxBytesBefore + " [" + found + "] " + uidRxBytesAfter, - uidRxBytesAfter >= uidRxBytesBefore + found * 20); - } - @TestTargets({ @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getMobileTxPackets"), @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "getMobileRxPackets"),