summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Noguchi <jnoguchi@google.com>2013-07-31 14:16:31 -0700
committerJason Noguchi <jnoguchi@google.com>2013-08-02 16:31:46 -0700
commit4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3 (patch)
tree5bcc939b6c10c6ee40648629cc1a0a1060d5d9a0
parenta1168a948830022c599a6164d92ce537794a1247 (diff)
downloadandroid_packages_apps_Snap-4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3.zip
android_packages_apps_Snap-4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3.tar.gz
android_packages_apps_Snap-4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3.tar.bz2
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context. Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
-rwxr-xr-xtests/src/com/android/gallery3d/stress/CameraLatency.java1
-rw-r--r--tests/src/com/android/gallery3d/stress/CameraStartUp.java2
-rwxr-xr-xtests/src/com/android/gallery3d/stress/ImageCapture.java2
-rw-r--r--tests/src/com/android/gallery3d/stress/ShotToShotLatency.java1
-rwxr-xr-xtests/src/com/android/gallery3d/stress/SwitchPreview.java1
-rwxr-xr-xtests/src/com/android/gallery3d/stress/VideoCapture.java3
6 files changed, 0 insertions, 10 deletions
diff --git a/tests/src/com/android/gallery3d/stress/CameraLatency.java b/tests/src/com/android/gallery3d/stress/CameraLatency.java
index 7177abe..2cdc2f1 100755
--- a/tests/src/com/android/gallery3d/stress/CameraLatency.java
+++ b/tests/src/com/android/gallery3d/stress/CameraLatency.java
@@ -66,7 +66,6 @@ public class CameraLatency extends ActivityInstrumentationTestCase2 <CameraActiv
super.tearDown();
}
- @LargeTest
public void testImageCapture() {
Log.v(TAG, "start testImageCapture test");
Instrumentation inst = getInstrumentation();
diff --git a/tests/src/com/android/gallery3d/stress/CameraStartUp.java b/tests/src/com/android/gallery3d/stress/CameraStartUp.java
index 8524465..3ca1632 100644
--- a/tests/src/com/android/gallery3d/stress/CameraStartUp.java
+++ b/tests/src/com/android/gallery3d/stress/CameraStartUp.java
@@ -112,7 +112,6 @@ public class CameraStartUp extends InstrumentationTestCase {
}
}
- @LargeTest
public void testLaunchVideo() throws Exception {
String individualStartupTime;
individualStartupTime = "Individual Video Startup Time = ";
@@ -133,7 +132,6 @@ public class CameraStartUp extends InstrumentationTestCase {
writeToOutputFile(totalStartupTime, individualStartupTime, false, "Video");
}
- @LargeTest
public void testLaunchCamera() throws Exception {
String individualStartupTime;
individualStartupTime = "Individual Camera Startup Time = ";
diff --git a/tests/src/com/android/gallery3d/stress/ImageCapture.java b/tests/src/com/android/gallery3d/stress/ImageCapture.java
index e322eb5..5a9ee6a 100755
--- a/tests/src/com/android/gallery3d/stress/ImageCapture.java
+++ b/tests/src/com/android/gallery3d/stress/ImageCapture.java
@@ -89,7 +89,6 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <CameraActivi
}
}
- @LargeTest
public void testBackImageCapture() throws Exception {
Instrumentation inst = getInstrumentation();
Intent intent = new Intent();
@@ -104,7 +103,6 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <CameraActivi
act.finish();
}
- @LargeTest
public void testFrontImageCapture() throws Exception {
Instrumentation inst = getInstrumentation();
Intent intent = new Intent();
diff --git a/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java b/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java
index a27bd90..0d5749e 100644
--- a/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java
+++ b/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java
@@ -83,7 +83,6 @@ public class ShotToShotLatency extends ActivityInstrumentationTestCase2<CameraAc
}
}
- @LargeTest
public void testShotToShotLatency() {
long sigmaOfDiffFromMeanSquared = 0;
double mean = 0;
diff --git a/tests/src/com/android/gallery3d/stress/SwitchPreview.java b/tests/src/com/android/gallery3d/stress/SwitchPreview.java
index 955d092..3545f3b 100755
--- a/tests/src/com/android/gallery3d/stress/SwitchPreview.java
+++ b/tests/src/com/android/gallery3d/stress/SwitchPreview.java
@@ -86,7 +86,6 @@ public class SwitchPreview extends ActivityInstrumentationTestCase2 <CameraActiv
}
}
- @LargeTest
public void testSwitchMode() {
//Switching the video and the video recorder mode
Instrumentation inst = getInstrumentation();
diff --git a/tests/src/com/android/gallery3d/stress/VideoCapture.java b/tests/src/com/android/gallery3d/stress/VideoCapture.java
index dbbd124..8211bad 100755
--- a/tests/src/com/android/gallery3d/stress/VideoCapture.java
+++ b/tests/src/com/android/gallery3d/stress/VideoCapture.java
@@ -66,7 +66,6 @@ public class VideoCapture extends ActivityInstrumentationTestCase2 <CameraActivi
super.tearDown();
}
- @LargeTest
public void captureVideos(String reportTag, Instrumentation inst) throws Exception{
boolean memoryResult = false;
int total_num_of_videos = CameraStressTestRunner.mVideoIterations;
@@ -83,7 +82,6 @@ public class VideoCapture extends ActivityInstrumentationTestCase2 <CameraActivi
}
}
- @LargeTest
public void testBackVideoCapture() throws Exception {
Instrumentation inst = getInstrumentation();
Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
@@ -98,7 +96,6 @@ public class VideoCapture extends ActivityInstrumentationTestCase2 <CameraActivi
act.finish();
}
- @LargeTest
public void testFrontVideoCapture() throws Exception {
Instrumentation inst = getInstrumentation();
Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);