Merge "MediaFrameworkTest: Fix storage path" into qt-dev (e83c7779) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import android.hardware.Camera.PictureCallback;
	import android.hardware.Camera.PreviewCallback;		import android.hardware.Camera.PreviewCallback;
	import android.hardware.Camera.ShutterCallback;		import android.hardware.Camera.ShutterCallback;
	import android.os.ConditionVariable;		import android.os.ConditionVariable;
	import android.os.Environment;
	import android.os.Looper;		import android.os.Looper;
	import android.test.ActivityInstrumentationTestCase;		import android.test.ActivityInstrumentationTestCase;
	import android.test.suitebuilder.annotation.LargeTest;		import android.test.suitebuilder.annotation.LargeTest;
	@@ -159,7 +158,7 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe
	if (rawData != null) {		if (rawData != null) {
	int rawDataLength = rawData.length;		int rawDataLength = rawData.length;
	File rawoutput = new File(		File rawoutput = new File(
	Environment.getExternalStorageDirectory().toString(), "/test.bmp");		mContext.getExternalFilesDir(null).getPath(), "/test.bmp");
	FileOutputStream outstream = new FileOutputStream(rawoutput);		FileOutputStream outstream = new FileOutputStream(rawoutput);
	outstream.write(rawData);		outstream.write(rawData);
	Log.v(TAG, "JpegPictureCallback rawDataLength = " + rawDataLength);		Log.v(TAG, "JpegPictureCallback rawDataLength = " + rawDataLength);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestHelper.java

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,10 +22,11 @@ import android.hardware.Camera;
	import android.hardware.Camera.Parameters;		import android.hardware.Camera.Parameters;
	import android.hardware.Camera.PictureCallback;		import android.hardware.Camera.PictureCallback;
	import android.hardware.Camera.ShutterCallback;		import android.hardware.Camera.ShutterCallback;
	import android.os.Environment;
	import android.util.Log;		import android.util.Log;
	import android.view.SurfaceHolder;		import android.view.SurfaceHolder;

			import androidx.test.InstrumentationRegistry;

	import java.io.File;		import java.io.File;
	import java.io.FileNotFoundException;		import java.io.FileNotFoundException;
	import java.io.FileOutputStream;		import java.io.FileOutputStream;
	@@ -70,7 +71,8 @@ public class CameraTestHelper {
	try {		try {
	Log.v(TAG, "JPEG picture taken");		Log.v(TAG, "JPEG picture taken");
	fos = new FileOutputStream(String.format("%s/%s/%s-%d.jpg",		fos = new FileOutputStream(String.format("%s/%s/%s-%d.jpg",
	Environment.getExternalStorageDirectory(), CAMERA_STRESS_IMAGES_DIRECTORY,		InstrumentationRegistry.getInstrumentation().getTargetContext()
			.getExternalFilesDir(null).getPath(), CAMERA_STRESS_IMAGES_DIRECTORY,
	CAMERA_STRESS_IMAGES_PREFIX, System.currentTimeMillis()));		CAMERA_STRESS_IMAGES_PREFIX, System.currentTimeMillis()));
	fos.write(data);		fos.write(data);
	} catch (FileNotFoundException e) {		} catch (FileNotFoundException e) {
	@@ -95,7 +97,8 @@ public class CameraTestHelper {
	public void setupCameraTest() {		public void setupCameraTest() {
	// Create the test images directory if it doesn't exist		// Create the test images directory if it doesn't exist
	File stressImagesDirectory = new File(String.format("%s/%s",		File stressImagesDirectory = new File(String.format("%s/%s",
	Environment.getExternalStorageDirectory(), CAMERA_STRESS_IMAGES_DIRECTORY));		InstrumentationRegistry.getInstrumentation().getTargetContext()
			.getExternalFilesDir(null).getPath(), CAMERA_STRESS_IMAGES_DIRECTORY));
	if (!stressImagesDirectory.exists()) {		if (!stressImagesDirectory.exists()) {
	stressImagesDirectory.mkdir();		stressImagesDirectory.mkdir();
	}		}
	@@ -129,7 +132,8 @@ public class CameraTestHelper {
	public void cleanupTestImages() {		public void cleanupTestImages() {
	try {		try {
	File stressImagesDirectory = new File(String.format("%s/%s",		File stressImagesDirectory = new File(String.format("%s/%s",
	Environment.getExternalStorageDirectory(), CAMERA_STRESS_IMAGES_DIRECTORY));		InstrumentationRegistry.getInstrumentation().getTargetContext()
			.getExternalFilesDir(null).getPath(), CAMERA_STRESS_IMAGES_DIRECTORY));
	File[] stressImages = stressImagesDirectory.listFiles();		File[] stressImages = stressImagesDirectory.listFiles();
	for (File f : stressImages) {		for (File f : stressImages) {
	f.delete();		f.delete();

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,6 @@ import android.media.Image.Plane;
	import android.media.ImageReader;		import android.media.ImageReader;
	import android.media.ImageWriter;		import android.media.ImageWriter;
	import android.os.Build;		import android.os.Build;
	import android.os.Environment;
	import android.os.Handler;		import android.os.Handler;
	import android.util.Log;		import android.util.Log;
	import android.util.Pair;		import android.util.Pair;
	@@ -63,6 +62,8 @@ import android.view.Display;
	import android.view.Surface;		import android.view.Surface;
	import android.view.WindowManager;		import android.view.WindowManager;

			import androidx.test.InstrumentationRegistry;

	import java.io.FileOutputStream;		import java.io.FileOutputStream;
	import java.io.IOException;		import java.io.IOException;
	import java.lang.reflect.Array;		import java.lang.reflect.Array;
	@@ -128,7 +129,8 @@ public class CameraTestUtils extends Assert {
	private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);		private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);

	protected static final String DEBUG_FILE_NAME_BASE =		protected static final String DEBUG_FILE_NAME_BASE =
	Environment.getExternalStorageDirectory().getPath();		InstrumentationRegistry.getInstrumentation().getTargetContext()
			.getExternalFilesDir(null).getPath();

	static {		static {
	sTestLocation0.setTime(1199145600L);		sTestLocation0.setTime(1199145600L);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2SwitchPreviewTest.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,6 @@ public class Camera2SwitchPreviewTest extends Camera2SurfaceViewTestCase {
	private static final double AE_COMPENSATION_ERROR_TOLERANCE = 0.2;		private static final double AE_COMPENSATION_ERROR_TOLERANCE = 0.2;
	// 5 percent error margin for resulting metering regions		// 5 percent error margin for resulting metering regions
	private static final float METERING_REGION_ERROR_PERCENT_DELTA = 0.05f;		private static final float METERING_REGION_ERROR_PERCENT_DELTA = 0.05f;
	private final String VIDEO_FILE_PATH = Environment.getExternalStorageDirectory().getPath();

	private static final boolean DEBUG_DUMP = Log.isLoggable(TAG, Log.DEBUG);		private static final boolean DEBUG_DUMP = Log.isLoggable(TAG, Log.DEBUG);
	private static final int RECORDING_DURATION_MS = 3000;		private static final int RECORDING_DURATION_MS = 3000;
	@@ -137,10 +136,12 @@ public class Camera2SwitchPreviewTest extends Camera2SurfaceViewTestCase {
	private int mVideoFrameRate;		private int mVideoFrameRate;
	private Size mVideoSize;		private Size mVideoSize;
	private long mRecordingStartTime;		private long mRecordingStartTime;
			private String mVideoFilePath;

	@Override		@Override
	protected void setUp() throws Exception {		protected void setUp() throws Exception {
	super.setUp();		super.setUp();
			mVideoFilePath = mContext.getExternalFilesDir(null).getPath();
	}		}

	@Override		@Override
	@@ -371,9 +372,9 @@ public class Camera2SwitchPreviewTest extends Camera2SurfaceViewTestCase {
	}		}

	// Configure preview and recording surfaces.		// Configure preview and recording surfaces.
	mOutMediaFileName = VIDEO_FILE_PATH + "/test_video.mp4";		mOutMediaFileName = mVideoFilePath + "/test_video.mp4";
	if (DEBUG_DUMP) {		if (DEBUG_DUMP) {
	mOutMediaFileName = VIDEO_FILE_PATH + "/test_video_" + cameraId + "_"		mOutMediaFileName = mVideoFilePath + "/test_video_" + cameraId + "_"
	+ videoSz.toString() + ".mp4";		+ videoSz.toString() + ".mp4";
	}		}

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
	import java.util.List;		import java.util.List;

	import android.hardware.Camera.Parameters;		import android.hardware.Camera.Parameters;
	import android.os.Environment;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Looper;		import android.os.Looper;
	import android.test.ActivityInstrumentationTestCase2;		import android.test.ActivityInstrumentationTestCase2;
	@@ -36,6 +35,8 @@ import android.test.suitebuilder.annotation.LargeTest;
	import android.util.Log;		import android.util.Log;
	import android.view.SurfaceHolder;		import android.view.SurfaceHolder;

			import androidx.test.InstrumentationRegistry;

	/**		/**
	* Junit / Instrumentation test case for the following camera APIs:		* Junit / Instrumentation test case for the following camera APIs:
	* - camera zoom		* - camera zoom
	@@ -85,7 +86,8 @@ public class CameraStressTest extends ActivityInstrumentationTestCase2<MediaFram

	mCameraTestHelper = new CameraTestHelper();		mCameraTestHelper = new CameraTestHelper();
	File stressOutFile = new File(String.format("%s/%s",		File stressOutFile = new File(String.format("%s/%s",
	Environment.getExternalStorageDirectory(), CAMERA_STRESS_OUTPUT));		InstrumentationRegistry.getInstrumentation().getTargetContext()
			.getExternalFilesDir(null).getPath(), CAMERA_STRESS_OUTPUT));
	mOutput = new BufferedWriter(new FileWriter(stressOutFile, true));		mOutput = new BufferedWriter(new FileWriter(stressOutFile, true));
	mOutput.write(this.getName() + "\n");		mOutput.write(this.getName() + "\n");
	}		}