Merge "Removed out-of-date TODO in video editor performance/stress test cases" (be3835c6) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -196,7 +196,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_001
		@LargeTest
		public void testPerformanceAddRemoveVideoItem() throws Exception {
		final String videoItemFileName = INPUT_FILE_PATH +
		@@ -241,7 +240,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_002
		@LargeTest
		public void testPerformanceAddRemoveImageItem() throws Exception {
		final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg";
		@@ -280,7 +278,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_003
		@LargeTest
		public void testPerformanceAddRemoveTransition() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -360,7 +357,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_004
		@LargeTest
		public void testPerformanceExport() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -541,7 +537,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_005
		@LargeTest
		public void testPerformanceThumbnailVideoItem() throws Exception {
		final String videoItemFileName = INPUT_FILE_PATH
		@@ -574,7 +569,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_006
		@LargeTest
		public void testPerformanceOverlayVideoItem() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -629,7 +623,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_007
		@LargeTest
		public void testPerformanceVideoItemProperties() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -688,7 +681,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_008
		@LargeTest
		public void testPerformanceGeneratePreviewWithTransitions()
		throws Exception {
		@@ -740,7 +732,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_009
		@LargeTest
		public void testPerformanceWithKenBurn() throws Exception {
		final String videoItemFileName = INPUT_FILE_PATH +
		@@ -795,7 +786,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_010
		@LargeTest
		public void testPerformanceEffectOverlappingTransition() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -864,7 +854,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_011
		@LargeTest
		public void testPerformanceTransitionWithEffectOverlapping() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -994,7 +983,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_014
		@LargeTest
		public void testPerformanceWithAudioTrack() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -1049,7 +1037,6 @@ public class VideoEditorPerformance extends
		*
		* @throws Exception
		*/
		// TODO : remove PRF_015
		@LargeTest
		public void testPerformanceAddRemoveImageItem640x480() throws Exception {
		final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg";

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

+1 −16

Original line number	Diff line number	Diff line
		@@ -167,7 +167,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_001
		@LargeTest
		public void testStressAddRemoveVideoItem() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -241,7 +240,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_002
		@LargeTest
		public void testStressAddRemoveImageItem() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -310,7 +308,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_003
		@LargeTest
		public void testStressAddRemoveTransition() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -428,7 +425,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_004
		@LargeTest
		public void testStressAddRemoveOverlay() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -493,7 +489,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_005
		@LargeTest
		public void testStressAddRemoveEffects() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -590,7 +585,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_006
		@LargeTest
		public void testStressThumbnailVideoItem() throws Exception {
		final String videoItemFileName = INPUT_FILE_PATH
		@@ -651,7 +645,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_007
		@LargeTest
		public void testStressMediaProperties() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -747,7 +740,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_008
		@LargeTest
		public void testStressInsertMovieItems() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -759,7 +751,7 @@ public class VideoEditorStressTest
		"MPEG4_SP_640x480_15fps_1200kbps_AACLC_48khz_64kbps_m_1_17.3gp";
		final String[] loggingInfo = new String[1];
		int i = 0;
		writeTestCaseHeader("testStressInsertMoveItems");
		writeTestCaseHeader("testStressInsertMovieItems");

		final MediaVideoItem mediaItem1 = new MediaVideoItem(mVideoEditor,
		"m1", VideoItemFileName1, renderingMode);
		@@ -801,7 +793,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_009
		@LargeTest
		public void testStressLoadAndSave() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -916,7 +907,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_010
		@LargeTest
		public void testStressMultipleExport() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -1007,7 +997,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_011
		@LargeTest
		public void testStressOverlayTransKenBurn() throws Exception {
		final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
		@@ -1094,7 +1083,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_012
		@LargeTest
		public void testStressAudioTrackVideo() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -1147,7 +1135,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_013
		@LargeTest
		public void testStressStoryBoard() throws Exception {
		final String videoItemFileName1 = INPUT_FILE_PATH +
		@@ -1237,7 +1224,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_014
		@LargeTest
		public void testStressAudioTrackOnly() throws Exception {

		@@ -1267,7 +1253,6 @@ public class VideoEditorStressTest
		*
		* @throws Exception
		*/
		// TODO : remove TC_STR_016 -- New Test Case
		@LargeTest
		public void testStressThumbnailImageItem() throws Exception {
		final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg";