From 4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3 Mon Sep 17 00:00:00 2001
From: Jason Noguchi <jnoguchi@google.com>
Date: Wed, 31 Jul 2013 14:16:31 -0700
Subject: 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
---
 tests/src/com/android/gallery3d/stress/CameraLatency.java     | 1 -
 tests/src/com/android/gallery3d/stress/CameraStartUp.java     | 2 --
 tests/src/com/android/gallery3d/stress/ImageCapture.java      | 2 --
 tests/src/com/android/gallery3d/stress/ShotToShotLatency.java | 1 -
 tests/src/com/android/gallery3d/stress/SwitchPreview.java     | 1 -
 tests/src/com/android/gallery3d/stress/VideoCapture.java      | 3 ---
 6 files changed, 10 deletions(-)

diff --git a/tests/src/com/android/gallery3d/stress/CameraLatency.java b/tests/src/com/android/gallery3d/stress/CameraLatency.java
index 7177abe6c..2cdc2f1b7 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 8524465ac..3ca163227 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 e322eb516..5a9ee6a6c 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 a27bd90e6..0d5749e7d 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 955d092a6..3545f3b3e 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 dbbd124d0..8211badf7 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);
-- 
cgit v1.2.3