summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-05-11 15:55:06 -0700
committerYu Shan Emily Lau <yslau@google.com>2009-05-12 11:11:19 -0700
commita2eceabc9ef5dc61f99518d998f09379baed4abc (patch)
tree3114c17041d204fbe8e44f0ad9f35eb0b6b2d8a7 /tests
parent383e1628910068229ba3df34100d99574236603e (diff)
downloadpackages_apps_LegacyCamera-a2eceabc9ef5dc61f99518d998f09379baed4abc.zip
packages_apps_LegacyCamera-a2eceabc9ef5dc61f99518d998f09379baed4abc.tar.gz
packages_apps_LegacyCamera-a2eceabc9ef5dc61f99518d998f09379baed4abc.tar.bz2
Put the instrumentation test into a separate tests package.
Diffstat (limited to 'tests')
-rw-r--r--tests/AndroidManifest.xml2
-rwxr-xr-xtests/src/com/android/camera/CameraStressTestRunner.java2
-rwxr-xr-xtests/src/com/android/camera/stress/ImageCapture.java6
-rwxr-xr-xtests/src/com/android/camera/stress/SwitchPreview.java6
4 files changed, 14 insertions, 2 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 54cc132..6482945 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -26,7 +26,7 @@
android:label="Camera Launch Performance">
</instrumentation>
- <instrumentation android:name=".CameraStressTestRunner"
+ <instrumentation android:name="com.android.camera.CameraStressTestRunner"
android:targetPackage="com.android.camera"
android:label="Camera Stress Test InstrumentationRunner">
</instrumentation>
diff --git a/tests/src/com/android/camera/CameraStressTestRunner.java b/tests/src/com/android/camera/CameraStressTestRunner.java
index 7949c48..1b27408 100755
--- a/tests/src/com/android/camera/CameraStressTestRunner.java
+++ b/tests/src/com/android/camera/CameraStressTestRunner.java
@@ -31,7 +31,7 @@ import junit.framework.TestSuite;
* Running all tests:
*
* adb shell am instrument -w \
- * com.android.camera.tests/.CameraStressTestRunner
+ * com.android.camera.tests/com.android.camera.CameraStressTestRunner
*/
public class CameraStressTestRunner extends InstrumentationTestRunner {
diff --git a/tests/src/com/android/camera/stress/ImageCapture.java b/tests/src/com/android/camera/stress/ImageCapture.java
index 69deef4..b809e73 100755
--- a/tests/src/com/android/camera/stress/ImageCapture.java
+++ b/tests/src/com/android/camera/stress/ImageCapture.java
@@ -27,6 +27,12 @@ import android.view.KeyEvent;
/**
* Junit / Instrumentation test case for camera test
*
+ * Running the test suite:
+ *
+ * adb shell am instrument \
+ * -e class com.android.camera.stress.ImageCapture \
+ * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
+ *
*/
public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
diff --git a/tests/src/com/android/camera/stress/SwitchPreview.java b/tests/src/com/android/camera/stress/SwitchPreview.java
index 08cf143..f73fc85 100755
--- a/tests/src/com/android/camera/stress/SwitchPreview.java
+++ b/tests/src/com/android/camera/stress/SwitchPreview.java
@@ -27,6 +27,12 @@ import android.view.KeyEvent;
/**
* Junit / Instrumentation test case for camera test
*
+ * Running the test suite:
+ *
+ * adb shell am instrument \
+ * -e class com.android.camera.stress.SwitchPreview \
+ * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
+ *
*/
public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera>{
private String TAG = "SwitchPreview";