diff options
| author | Eric Rowe <erowe@google.com> | 2010-08-10 12:04:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 12:04:04 -0700 |
| commit | 542cf2c9cf9aac4c5678c39754110cd656cb859d (patch) | |
| tree | 9a1e860c46884ffbb571dd2d7d84c75e519cc946 /core/tests | |
| parent | ac4bbc2e181fb9505b38e2410ff9035dddfbab9b (diff) | |
| parent | 7cb0fc588042f7642f13ea2cc404eae04bd5509a (diff) | |
| download | frameworks_base-542cf2c9cf9aac4c5678c39754110cd656cb859d.zip frameworks_base-542cf2c9cf9aac4c5678c39754110cd656cb859d.tar.gz frameworks_base-542cf2c9cf9aac4c5678c39754110cd656cb859d.tar.bz2 | |
am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'
* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
Remove @LargeTest annotations
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java b/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java index 0fe83e1..cbd8714 100644 --- a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java +++ b/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java @@ -17,13 +17,11 @@ package android.bluetooth; import android.app.Instrumentation; -import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; public class BluetoothStressTest extends InstrumentationTestCase { @@ -161,7 +159,6 @@ public class BluetoothStressTest extends InstrumentationTestCase { mContext.unregisterReceiver(mReceiver); } - @LargeTest public void testEnableDisable() { BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); @@ -172,7 +169,6 @@ public class BluetoothStressTest extends InstrumentationTestCase { } } - @LargeTest public void testDiscoverable() { BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); enable(adapter); @@ -186,7 +182,6 @@ public class BluetoothStressTest extends InstrumentationTestCase { disable(adapter); } - @LargeTest public void testScan() { BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); enable(adapter); @@ -336,7 +331,7 @@ public class BluetoothStressTest extends InstrumentationTestCase { mReceiver.resetFiredFlags(); if (!adapter.isEnabled()) { - fail("undiscoverable(): bluetooth not enabled"); + fail("undiscoverable() bluetooth not enabled"); } int scanMode = adapter.getScanMode(); @@ -374,7 +369,7 @@ public class BluetoothStressTest extends InstrumentationTestCase { mReceiver.resetFiredFlags(); if (!adapter.isEnabled()) { - fail("startScan(): bluetooth not enabled"); + fail("startScan() bluetooth not enabled"); } if (adapter.isDiscovering()) { @@ -404,7 +399,7 @@ public class BluetoothStressTest extends InstrumentationTestCase { mReceiver.resetFiredFlags(); if (!adapter.isEnabled()) { - fail("stopScan(): bluetooth not enabled"); + fail("stopScan() bluetooth not enabled"); } if (!adapter.isDiscovering()) { |