summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTsu Chiang Chuang <tsu@google.com>2011-08-05 14:50:49 -0700
committerTsu Chiang Chuang <tsu@google.com>2011-08-05 17:58:58 -0700
commitee8caea24b3ac28f1074cebdaef43708a91538a7 (patch)
treebb9667065419ea0358b641900e8de69274dda001 /tests
parent02765c94268d7dc3531c87a638a184a3b481ad40 (diff)
downloadandroid_packages_apps_Trebuchet-ee8caea24b3ac28f1074cebdaef43708a91538a7.zip
android_packages_apps_Trebuchet-ee8caea24b3ac28f1074cebdaef43708a91538a7.tar.gz
android_packages_apps_Trebuchet-ee8caea24b3ac28f1074cebdaef43708a91538a7.tar.bz2
changing test to use hidden test api annotations.
Change-Id: If1002c80fdfdc87694890215201314e2372bbe4a
Diffstat (limited to 'tests')
-rw-r--r--tests/stress/Android.mk2
-rw-r--r--tests/stress/AndroidManifest.xml2
-rw-r--r--tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java27
3 files changed, 11 insertions, 20 deletions
diff --git a/tests/stress/Android.mk b/tests/stress/Android.mk
index da22bb9..68289bd 100644
--- a/tests/stress/Android.mk
+++ b/tests/stress/Android.mk
@@ -28,6 +28,4 @@ LOCAL_CERTIFICATE := shared
LOCAL_INSTRUMENTATION_FOR := Launcher2
-LOCAL_SDK_VERSION := current
-
include $(BUILD_PACKAGE)
diff --git a/tests/stress/AndroidManifest.xml b/tests/stress/AndroidManifest.xml
index ce5dbe4..0df3a9d 100644
--- a/tests/stress/AndroidManifest.xml
+++ b/tests/stress/AndroidManifest.xml
@@ -17,8 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.launcher.stress.launcherrotation">
- <uses-sdk android:minSdkVersion="8" />
-
<application>
<uses-library android:name="android.test.runner" />
</application>
diff --git a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java b/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
index 3d787f2..d21fd53 100644
--- a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
+++ b/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
@@ -22,7 +22,7 @@ import com.android.launcher2.Launcher;
import android.content.pm.ActivityInfo;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.TimedTest;
+import android.test.RepetitiveTest;
import android.util.Log;
/**
@@ -31,6 +31,7 @@ import android.util.Log;
public class LauncherRotationStressTest extends ActivityInstrumentationTestCase2<Launcher> {
private static final int NUM_ITERATIONS = 50;
+ private static final int WAIT_TIME_MS = 500;
private static final String LOG_TAG = "LauncherRotationStressTest";
public LauncherRotationStressTest() {
@@ -47,22 +48,16 @@ public class LauncherRotationStressTest extends ActivityInstrumentationTestCase2
super.tearDown();
}
- @TimedTest(includeDetailedStats=true)
+ @RepetitiveTest(numIterations=NUM_ITERATIONS)
public void testLauncherRotationStress() throws Exception {
Launcher launcher = getActivity();
- for (int i = 0; i < NUM_ITERATIONS; i++) {
- Log.i(LOG_TAG, "Starting LauncherRotationStressTest " + (i + 1) + " of " +
- NUM_ITERATIONS);
- getInstrumentation().waitForIdleSync();
- SystemClock.sleep(500);
- launcher.setRequestedOrientation(
- ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- getInstrumentation().waitForIdleSync();
- SystemClock.sleep(500);
- launcher.setRequestedOrientation(
- ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
- Log.i(LOG_TAG, "Finished LauncherRotationStressTest " + (i + 1) + " of " +
- NUM_ITERATIONS);
- }
+ getInstrumentation().waitForIdleSync();
+ SystemClock.sleep(WAIT_TIME_MS);
+ launcher.setRequestedOrientation(
+ ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ getInstrumentation().waitForIdleSync();
+ SystemClock.sleep(WAIT_TIME_MS);
+ launcher.setRequestedOrientation(
+ ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
}
}