Merge "VideoEditor:IssueID:3396697: Added Performance test code" (3ed54d03) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@
		package com.android.mediaframeworktest;

		import com.android.mediaframeworktest.performance.MediaPlayerPerformance;

		/Video Editor performance Test cases/
		import com.android.mediaframeworktest.performance.VideoEditorPerformance;
		import junit.framework.TestSuite;

		import android.test.InstrumentationTestRunner;
		@@ -40,6 +41,8 @@ public class MediaFrameworkPerfTestRunner extends InstrumentationTestRunner {
		public TestSuite getAllTests() {
		TestSuite suite = new InstrumentationTestSuite(this);
		suite.addTestSuite(MediaPlayerPerformance.class);
		/Video Editor performance Test cases/
		suite.addTestSuite(VideoEditorPerformance.class);
		return suite;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package com.android.mediaframeworktest;
		import android.test.InstrumentationTestRunner;
		import android.test.InstrumentationTestSuite;
		import com.android.mediaframeworktest.stress.MediaPlayerStressTest;
		/** Import for Video Editor Stress Test cases*/
		import com.android.mediaframeworktest.stress.VideoEditorStressTest;

		import junit.framework.TestSuite;

		@@ -28,6 +30,8 @@ public class MediaPlayerStressTestRunner extends InstrumentationTestRunner {
		public TestSuite getAllTests() {
		TestSuite suite = new InstrumentationTestSuite(this);
		suite.addTestSuite(MediaPlayerStressTest.class);
		/** Video Editor Stress Test cases*/
		suite.addTestSuite(VideoEditorStressTest.class);
		return suite;
		}

0 → 100644

+1086 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100755

+1317 −0

File added.

Preview size limit exceeded, changes collapsed.