am 54b4f235: Merge "Make packet count test more robust" into jb-mr1-dev

* commit '54b4f235779385a0286675b0a2b1491ff0ebd854':
  Make packet count test more robust
This commit is contained in:
Irfan Sheriff
2012-10-17 16:51:22 -07:00
committed by Android Git Automerger

View File

@@ -399,30 +399,39 @@ public class WifiManagerTest extends AndroidTestCase {
}
assertTrue(mWifiManager.isWifiEnabled());
// Wait for a WiFi connection
connectWifi();
int i = 0;
for (; i < 15; i++) {
// Wait for a WiFi connection
connectWifi();
// Read TX packet counter
int txcount1 = getTxPacketCount();
// Read TX packet counter
int txcount1 = getTxPacketCount();
// Do some network operations
HttpURLConnection connection = null;
try {
URL url = new URL("http://www.google.com/");
connection = (HttpURLConnection) url.openConnection();
connection.setInstanceFollowRedirects(false);
connection.setConnectTimeout(TIMEOUT_MSEC);
connection.setReadTimeout(TIMEOUT_MSEC);
connection.setUseCaches(false);
connection.getInputStream();
} catch (Exception e) {
// ignore
} finally {
if (connection != null) connection.disconnect();
// Do some network operations
HttpURLConnection connection = null;
try {
URL url = new URL("http://www.google.com/");
connection = (HttpURLConnection) url.openConnection();
connection.setInstanceFollowRedirects(false);
connection.setConnectTimeout(TIMEOUT_MSEC);
connection.setReadTimeout(TIMEOUT_MSEC);
connection.setUseCaches(false);
connection.getInputStream();
} catch (Exception e) {
// ignore
} finally {
if (connection != null) connection.disconnect();
}
// Read TX packet counter again and make sure it increases
int txcount2 = getTxPacketCount();
if (txcount2 > txcount1) {
break;
} else {
Thread.sleep(DURATION);
}
}
// Read TX packet counter again and make sure it increases
int txcount2 = getTxPacketCount();
assertTrue(txcount2 > txcount1);
assertTrue(i < 15);
}
}