diff options
| author | Eric Rowe <erowe@google.com> | 2010-08-10 11:53:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 11:53:59 -0700 |
| commit | edae848eb62e27b8e987aa89557d1456304fada7 (patch) | |
| tree | 2cbf755ef8284b29c71f1f4f7c56b926d07dedb7 /core | |
| parent | 235be391f3b9cd79e525de87757e361ae044940d (diff) | |
| parent | 301c437b554e2152f3f6fffadc680f5cbf8e8231 (diff) | |
| download | frameworks_base-edae848eb62e27b8e987aa89557d1456304fada7.zip frameworks_base-edae848eb62e27b8e987aa89557d1456304fada7.tar.gz frameworks_base-edae848eb62e27b8e987aa89557d1456304fada7.tar.bz2 | |
am 301c437b: Remove @LargeTest annotations
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
Diffstat (limited to 'core')
| -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()) { |