Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 301c437b: Remove @LargeTest annotations

Browse Source 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
This commit is contained in:
Eric Rowe
2010-08-10 11:53:59 -07:00
committed by Android Git Automerger
parent 235be391f3 301c437b55
commit edae848eb6
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java
View File

@@ -17,13 +17,11 @@
package android.bluetooth; package android.bluetooth;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log; import android.util.Log;
public class BluetoothStressTest extends InstrumentationTestCase { public class BluetoothStressTest extends InstrumentationTestCase {
@@ -161,7 +159,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
mContext.unregisterReceiver(mReceiver); mContext.unregisterReceiver(mReceiver);
} }
@LargeTest
public void testEnableDisable() { public void testEnableDisable() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
@@ -172,7 +169,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
} }
} }
@LargeTest
public void testDiscoverable() { public void testDiscoverable() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
enable(adapter); enable(adapter);
@@ -186,7 +182,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
disable(adapter); disable(adapter);
} }
@LargeTest
public void testScan() { public void testScan() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
enable(adapter); enable(adapter);
@@ -336,7 +331,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
mReceiver.resetFiredFlags(); mReceiver.resetFiredFlags();
if (!adapter.isEnabled()) { if (!adapter.isEnabled()) {
fail("undiscoverable(): bluetooth not enabled"); fail("undiscoverable() bluetooth not enabled");
} }
int scanMode = adapter.getScanMode(); int scanMode = adapter.getScanMode();
@@ -374,7 +369,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
mReceiver.resetFiredFlags(); mReceiver.resetFiredFlags();
if (!adapter.isEnabled()) { if (!adapter.isEnabled()) {
fail("startScan(): bluetooth not enabled"); fail("startScan() bluetooth not enabled");
} }
if (adapter.isDiscovering()) { if (adapter.isDiscovering()) {
@@ -404,7 +399,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
mReceiver.resetFiredFlags(); mReceiver.resetFiredFlags();
if (!adapter.isEnabled()) { if (!adapter.isEnabled()) {
fail("stopScan(): bluetooth not enabled"); fail("stopScan() bluetooth not enabled");
} }
if (!adapter.isDiscovering()) { if (!adapter.isDiscovering()) {