drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1

Browse Source 
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.
This commit is contained in:
Xia Wang
2011-03-10 15:57:27 -08:00
committed by Android Git Automerger
parent a4865ec73f cf994cc57d
commit 05ab5caa80
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java
View File

@ -49,13 +49,8 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn
suite.addTestSuite(WifiApStress.class); suite.addTestSuite(WifiApStress.class);
suite.addTestSuite(WifiStressTest.class); suite.addTestSuite(WifiStressTest.class);
} else { } else {
// create a new test suite // only the wifi stress tests
suite.setName("WifiOnlyStressTests"); suite.addTestSuite(WifiStressTest.class);
String[] methodNames = {"testWifiScanning"};
Class<WifiStressTest> testClass = WifiStressTest.class;
for (String method: methodNames) {
suite.addTest(TestSuite.createTest(testClass, method));
}
} }
return suite; return suite;
} }
@ -68,11 +63,13 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
String valueStr = (String) icicle.get("softap_iterations"); if (!UtilHelper.isWifiOnly()) {
if (valueStr != null) { String valueStr = (String) icicle.get("softap_iterations");
int iteration = Integer.parseInt(valueStr); if (valueStr != null) {
if (iteration > 0) { int iteration = Integer.parseInt(valueStr);
mSoftapIterations = iteration; if (iteration > 0) {
mSoftapIterations = iteration;
}
} }
} }

19
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java
View File

@ -18,6 +18,7 @@ package com.android.connectivitymanagertest.stress;
import com.android.connectivitymanagertest.ConnectivityManagerStressTestRunner; import com.android.connectivitymanagertest.ConnectivityManagerStressTestRunner;
import com.android.connectivitymanagertest.ConnectivityManagerTestActivity; import com.android.connectivitymanagertest.ConnectivityManagerTestActivity;
import com.android.connectivitymanagertest.UtilHelper;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@ -264,18 +265,22 @@ public class WifiStressTest
assertTrue("Wait for Wi-Fi to idle timeout", assertTrue("Wait for Wi-Fi to idle timeout",
mAct.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED, mAct.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED,
6 * ConnectivityManagerTestActivity.SHORT_TIMEOUT)); 6 * ConnectivityManagerTestActivity.SHORT_TIMEOUT));
// use long timeout as the pppd startup may take several retries. if (!UtilHelper.isWifiOnly()) {
assertTrue("Wait for cellular connection timeout", // use long timeout as the pppd startup may take several retries.
mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED, assertTrue("Wait for cellular connection timeout",
ConnectivityManagerTestActivity.LONG_TIMEOUT)); mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED,
ConnectivityManagerTestActivity.LONG_TIMEOUT));
}
sleep(mWifiSleepTime + WIFI_IDLE_DELAY, "Interrupted while device is in sleep mode"); sleep(mWifiSleepTime + WIFI_IDLE_DELAY, "Interrupted while device is in sleep mode");
// Verify the wi-fi is still off and data connection is on // Verify the wi-fi is still off and data connection is on
assertEquals("Wi-Fi is reconnected", State.DISCONNECTED, assertEquals("Wi-Fi is reconnected", State.DISCONNECTED,
mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState()); mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState());
assertEquals("Cellular connection is down", State.CONNECTED,
mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState());
assertTrue("Mobile is connected, but no data connection.", mAct.pingTest(null)); if (!UtilHelper.isWifiOnly()) {
assertEquals("Cellular connection is down", State.CONNECTED,
mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState());
assertTrue("Mobile is connected, but no data connection.", mAct.pingTest(null));
}
// Turn screen on again // Turn screen on again
mAct.turnScreenOn(); mAct.turnScreenOn();