diff options
author | Xia Wang <xiaw@google.com> | 2011-03-10 15:09:46 -0800 |
---|---|---|
committer | Xia Wang <xiaw@google.com> | 2011-03-10 15:09:46 -0800 |
commit | 4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c (patch) | |
tree | 3c2266fb2f8a983cbb4fa3810e26c6f006d1b989 /core/tests | |
parent | ff25b975052ddf0e74627cccca742cddd1c8e2f2 (diff) | |
parent | 16cbe575e2fbd4894076f75babe7a28cdf879b0e (diff) | |
download | frameworks_base-4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c.zip frameworks_base-4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c.tar.gz frameworks_base-4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c.tar.bz2 |
resolved conflicts for merge of 16cbe575 to honeycomb-mr1
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
Diffstat (limited to 'core/tests')
2 files changed, 21 insertions, 19 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java index 3f78ce0..d23dfd3 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java @@ -49,13 +49,8 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn suite.addTestSuite(WifiApStress.class); suite.addTestSuite(WifiStressTest.class); } else { - // create a new test suite - suite.setName("WifiOnlyStressTests"); - String[] methodNames = {"testWifiScanning"}; - Class<WifiStressTest> testClass = WifiStressTest.class; - for (String method: methodNames) { - suite.addTest(TestSuite.createTest(testClass, method)); - } + // only the wifi stress tests + suite.addTestSuite(WifiStressTest.class); } return suite; } @@ -68,11 +63,13 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - String valueStr = (String) icicle.get("softap_iterations"); - if (valueStr != null) { - int iteration = Integer.parseInt(valueStr); - if (iteration > 0) { - mSoftapIterations = iteration; + if (!UtilHelper.isWifiOnly()) { + String valueStr = (String) icicle.get("softap_iterations"); + if (valueStr != null) { + int iteration = Integer.parseInt(valueStr); + if (iteration > 0) { + mSoftapIterations = iteration; + } } } diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java index 2f2a283..7578e67 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java @@ -18,6 +18,7 @@ package com.android.connectivitymanagertest.stress; import com.android.connectivitymanagertest.ConnectivityManagerStressTestRunner; import com.android.connectivitymanagertest.ConnectivityManagerTestActivity; +import com.android.connectivitymanagertest.UtilHelper; import android.content.Context; import android.net.ConnectivityManager; @@ -264,18 +265,22 @@ public class WifiStressTest assertTrue("Wait for Wi-Fi to idle timeout", mAct.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED, 6 * ConnectivityManagerTestActivity.SHORT_TIMEOUT)); - // use long timeout as the pppd startup may take several retries. - assertTrue("Wait for cellular connection timeout", - mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED, - ConnectivityManagerTestActivity.LONG_TIMEOUT)); + if (!UtilHelper.isWifiOnly()) { + // use long timeout as the pppd startup may take several retries. + assertTrue("Wait for cellular connection timeout", + mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED, + ConnectivityManagerTestActivity.LONG_TIMEOUT)); + } sleep(mWifiSleepTime + WIFI_IDLE_DELAY, "Interrupted while device is in sleep mode"); // Verify the wi-fi is still off and data connection is on assertEquals("Wi-Fi is reconnected", State.DISCONNECTED, 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 mAct.turnScreenOn(); |