Camera tests were recently merged with Gallery. Updating TF tests to reflect this.
Change-Id: I71a13eb21d240a662ca5dcd0ca285ec4cdf3d55e
diff --git a/src/com/android/media/tests/CameraLatencyTest.java b/src/com/android/media/tests/CameraLatencyTest.java
index 48c4878..911868b 100644
--- a/src/com/android/media/tests/CameraLatencyTest.java
+++ b/src/com/android/media/tests/CameraLatencyTest.java
@@ -57,7 +57,7 @@
ITestDevice mTestDevice = null;
// Constants for running the tests
- private static final String TEST_PACKAGE_NAME = "com.google.android.camera.tests";
+ private static final String TEST_PACKAGE_NAME = "com.google.android.gallery3d.tests";
private final String mOutputPath = "mediaStressOut.txt";
@@ -94,7 +94,7 @@
// Startup tests
TestInfo t = new TestInfo();
t.mTestName = "startup";
- t.mClassName = "com.android.camera.stress.CameraStartUp";
+ t.mClassName = "com.android.gallery3d.stress.CameraStartUp";
t.mTestMetricsName = "CameraVideoRecorderStartup";
RegexTrie<String> map = t.mPatternMap;
map = t.mPatternMap;
@@ -107,7 +107,7 @@
// Latency tests
t = new TestInfo();
t.mTestName = "latency";
- t.mClassName = "com.android.camera.stress.CameraLatency";
+ t.mClassName = "com.android.gallery3d.stress.CameraLatency";
t.mTestMetricsName = "CameraLatency";
map = t.mPatternMap;
map.put("AutoFocus", "^Avg AutoFocus = (\\d+)");
@@ -298,7 +298,7 @@
mTestInfo = new TestInfo();
TestInfo t = mTestInfo; // convenience alias
t.mTestName = "startup";
- t.mClassName = "com.android.camera.stress.CameraStartUp";
+ t.mClassName = "com.android.gallery3d.stress.CameraStartUp";
t.mTestMetricsName = "camera_video_recorder_startup";
RegexTrie<String> map = t.mPatternMap;
map.put("FirstCameraStartup", "^First Camera Startup: (\\d+)");
diff --git a/src/com/android/media/tests/CameraShotToShotLatencyTest.java b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
index f60a456..3d64292 100644
--- a/src/com/android/media/tests/CameraShotToShotLatencyTest.java
+++ b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
@@ -47,8 +47,8 @@
private static final Pattern STANDARD_DEVIATION_PATTERN =
Pattern.compile("(Shot to shot latency - standard deviation:)(\\s*)(\\d+\\.\\d*)");
- private static final String TEST_CLASS_NAME = "com.android.camera.stress.ShotToShotLatency";
- private static final String TEST_PACKAGE_NAME = "com.google.android.camera.tests";
+ private static final String TEST_CLASS_NAME = "com.android.gallery3d.stress.ShotToShotLatency";
+ private static final String TEST_PACKAGE_NAME = "com.google.android.gallery3d.tests";
private static final String TEST_RUNNER_NAME = "android.test.InstrumentationTestRunner";
private static final String LATENCY_KEY_MEAN = "Shot2ShotLatencyMean";
diff --git a/src/com/android/media/tests/CameraStressTest.java b/src/com/android/media/tests/CameraStressTest.java
index bd807c5..a3a0f5d 100644
--- a/src/com/android/media/tests/CameraStressTest.java
+++ b/src/com/android/media/tests/CameraStressTest.java
@@ -46,6 +46,7 @@
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Set;
/**
* Runs the Camera stress testcases.
@@ -59,7 +60,7 @@
ITestDevice mTestDevice = null;
// Constants for running the tests
- private static final String TEST_PACKAGE_NAME = "com.google.android.camera.tests";
+ private static final String TEST_PACKAGE_NAME = "com.google.android.gallery3d.tests";
//Max test timeout - 3 hrs
private static final int MAX_TEST_TIMEOUT = 3 * 60 * 60 * 1000;
@@ -80,6 +81,7 @@
public String mTestName = null;
public String mClassName = null;
public String mTestMetricsName = null;
+ public Map<String, String> mInstrumentationArgs = new HashMap<String, String>();
public RegexTrie<String> mPatternMap = new RegexTrie<String>();
@Override
@@ -124,23 +126,25 @@
// Image capture stress test
TestInfo t = new TestInfo();
t.mTestName = "imagecap";
- t.mClassName = "com.android.camera.stress.ImageCapture";
+ t.mClassName = "com.android.gallery3d.stress.ImageCapture";
t.mTestMetricsName = "CameraApplicationStress";
+ t.mInstrumentationArgs.put("image_iterations", Integer.toString(100));
t.mPatternMap = patMap;
mTestCases.add(t);
// Image capture stress test
t = new TestInfo();
t.mTestName = "videocap";
- t.mClassName = "com.android.camera.stress.VideoCapture";
+ t.mClassName = "com.android.gallery3d.stress.VideoCapture";
t.mTestMetricsName = "CameraApplicationStress";
+ t.mInstrumentationArgs.put("video_iterations", Integer.toString(100));
t.mPatternMap = patMap;
mTestCases.add(t);
// "SwitchPreview" stress test
t = new TestInfo();
t.mTestName = "switch";
- t.mClassName = "com.android.camera.stress.SwitchPreview";
+ t.mClassName = "com.android.gallery3d.stress.SwitchPreview";
t.mTestMetricsName = "CameraApplicationStress";
t.mPatternMap = patMap;
mTestCases.add(t);
@@ -167,6 +171,12 @@
runner.setClassName(test.mClassName);
runner.setMaxtimeToOutputResponse(MAX_TEST_TIMEOUT);
+
+ Set<String> argumentKeys = test.mInstrumentationArgs.keySet();
+ for (String s : argumentKeys) {
+ runner.addInstrumentationArg(s, test.mInstrumentationArgs.get(s));
+ }
+
mTestDevice.runInstrumentationTests(runner, listener, auxListener);
// Grab a bugreport if warranted
@@ -374,7 +384,7 @@
mTestInfo = new TestInfo();
TestInfo t = mTestInfo; // for convenience
t.mTestName = "capture";
- t.mClassName = "com.android.camera.stress.ImageCapture";
+ t.mClassName = "com.android.gallery3d.stress.ImageCapture";
t.mTestMetricsName = "camera_application_stress";
t.mPatternMap = getPatternMap();
}
