Skip to content

Commit be3835c

Browse files
James DongAndroid (Google) Code Review
James Dong
authored and
Android (Google) Code Review
committed
Merge "Removed out-of-date TODO in video editor performance/stress test cases"
2 parents 3bf96c9 + d5ade13 commit be3835c

File tree

2 files changed

+1
-29
lines changed

2 files changed

+1
-29
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ private void removeImageItems(MediaImageItem[] mIi) throws Exception {
196196
*
197197
* @throws Exception
198198
*/
199-
// TODO : remove PRF_001
200199
@LargeTest
201200
public void testPerformanceAddRemoveVideoItem() throws Exception {
202201
final String videoItemFileName = INPUT_FILE_PATH +
@@ -241,7 +240,6 @@ public void testPerformanceAddRemoveVideoItem() throws Exception {
241240
*
242241
* @throws Exception
243242
*/
244-
// TODO : remove PRF_002
245243
@LargeTest
246244
public void testPerformanceAddRemoveImageItem() throws Exception {
247245
final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg";
@@ -280,7 +278,6 @@ public void testPerformanceAddRemoveImageItem() throws Exception {
280278
*
281279
* @throws Exception
282280
*/
283-
// TODO : remove PRF_003
284281
@LargeTest
285282
public void testPerformanceAddRemoveTransition() throws Exception {
286283
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -360,7 +357,6 @@ public void testPerformanceAddRemoveTransition() throws Exception {
360357
*
361358
* @throws Exception
362359
*/
363-
// TODO : remove PRF_004
364360
@LargeTest
365361
public void testPerformanceExport() throws Exception {
366362
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -541,7 +537,6 @@ public void onProgress(VideoEditor ve,
541537
*
542538
* @throws Exception
543539
*/
544-
// TODO : remove PRF_005
545540
@LargeTest
546541
public void testPerformanceThumbnailVideoItem() throws Exception {
547542
final String videoItemFileName = INPUT_FILE_PATH
@@ -574,7 +569,6 @@ public void testPerformanceThumbnailVideoItem() throws Exception {
574569
*
575570
* @throws Exception
576571
*/
577-
// TODO : remove PRF_006
578572
@LargeTest
579573
public void testPerformanceOverlayVideoItem() throws Exception {
580574
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -629,7 +623,6 @@ public void testPerformanceOverlayVideoItem() throws Exception {
629623
*
630624
* @throws Exception
631625
*/
632-
// TODO : remove PRF_007
633626
@LargeTest
634627
public void testPerformanceVideoItemProperties() throws Exception {
635628
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -688,7 +681,6 @@ public void testPerformanceVideoItemProperties() throws Exception {
688681
*
689682
* @throws Exception
690683
*/
691-
// TODO : remove PRF_008
692684
@LargeTest
693685
public void testPerformanceGeneratePreviewWithTransitions()
694686
throws Exception {
@@ -740,7 +732,6 @@ public void onProgress(Object item, int action, int progress) {
740732
*
741733
* @throws Exception
742734
*/
743-
// TODO : remove PRF_009
744735
@LargeTest
745736
public void testPerformanceWithKenBurn() throws Exception {
746737
final String videoItemFileName = INPUT_FILE_PATH +
@@ -795,7 +786,6 @@ public void onProgress(Object item, int action, int progress) {
795786
*
796787
* @throws Exception
797788
*/
798-
// TODO : remove PRF_010
799789
@LargeTest
800790
public void testPerformanceEffectOverlappingTransition() throws Exception {
801791
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -864,7 +854,6 @@ public void onProgress(Object item, int action, int progress) {
864854
*
865855
* @throws Exception
866856
*/
867-
// TODO : remove PRF_011
868857
@LargeTest
869858
public void testPerformanceTransitionWithEffectOverlapping() throws Exception {
870859
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -994,7 +983,6 @@ public void testThumbnailH264AnIFrame() throws Exception {
994983
*
995984
* @throws Exception
996985
*/
997-
// TODO : remove PRF_014
998986
@LargeTest
999987
public void testPerformanceWithAudioTrack() throws Exception {
1000988
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -1049,7 +1037,6 @@ public void onProgress(Object item, int action, int progress) {
10491037
*
10501038
* @throws Exception
10511039
*/
1052-
// TODO : remove PRF_015
10531040
@LargeTest
10541041
public void testPerformanceAddRemoveImageItem640x480() throws Exception {
10551042
final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg";

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ private void getAfterMemory_updateLog(String[] loggingInfo, boolean when,
167167
*
168168
* @throws Exception
169169
*/
170-
// TODO : remove TC_STR_001
171170
@LargeTest
172171
public void testStressAddRemoveVideoItem() throws Exception {
173172
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -241,7 +240,6 @@ public void testStressAddRemoveVideoItem() throws Exception {
241240
*
242241
* @throws Exception
243242
*/
244-
// TODO : remove TC_STR_002
245243
@LargeTest
246244
public void testStressAddRemoveImageItem() throws Exception {
247245
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -310,7 +308,6 @@ public void testStressAddRemoveImageItem() throws Exception {
310308
*
311309
* @throws Exception
312310
*/
313-
// TODO : remove TC_STR_003
314311
@LargeTest
315312
public void testStressAddRemoveTransition() throws Exception {
316313
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -428,7 +425,6 @@ public void testStressAddRemoveTransition() throws Exception {
428425
*
429426
* @throws Exception
430427
*/
431-
// TODO : remove TC_STR_004
432428
@LargeTest
433429
public void testStressAddRemoveOverlay() throws Exception {
434430
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -493,7 +489,6 @@ public void testStressAddRemoveOverlay() throws Exception {
493489
*
494490
* @throws Exception
495491
*/
496-
// TODO : remove TC_STR_005
497492
@LargeTest
498493
public void testStressAddRemoveEffects() throws Exception {
499494
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -590,7 +585,6 @@ public void testStressAddRemoveEffects() throws Exception {
590585
*
591586
* @throws Exception
592587
*/
593-
// TODO : remove TC_STR_006
594588
@LargeTest
595589
public void testStressThumbnailVideoItem() throws Exception {
596590
final String videoItemFileName = INPUT_FILE_PATH
@@ -651,7 +645,6 @@ public void testStressThumbnailVideoItem() throws Exception {
651645
*
652646
* @throws Exception
653647
*/
654-
// TODO : remove TC_STR_007
655648
@LargeTest
656649
public void testStressMediaProperties() throws Exception {
657650
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -747,7 +740,6 @@ public void testStressMediaProperties() throws Exception {
747740
*
748741
* @throws Exception
749742
*/
750-
// TODO : remove TC_STR_008
751743
@LargeTest
752744
public void testStressInsertMovieItems() throws Exception {
753745
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -759,7 +751,7 @@ public void testStressInsertMovieItems() throws Exception {
759751
"MPEG4_SP_640x480_15fps_1200kbps_AACLC_48khz_64kbps_m_1_17.3gp";
760752
final String[] loggingInfo = new String[1];
761753
int i = 0;
762-
writeTestCaseHeader("testStressInsertMoveItems");
754+
writeTestCaseHeader("testStressInsertMovieItems");
763755

764756
final MediaVideoItem mediaItem1 = new MediaVideoItem(mVideoEditor,
765757
"m1", VideoItemFileName1, renderingMode);
@@ -801,7 +793,6 @@ public void testStressInsertMovieItems() throws Exception {
801793
*
802794
* @throws Exception
803795
*/
804-
// TODO : remove TC_STR_009
805796
@LargeTest
806797
public void testStressLoadAndSave() throws Exception {
807798
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -916,7 +907,6 @@ public void onProgress(Object item, int action, int progress) {
916907
*
917908
* @throws Exception
918909
*/
919-
// TODO : remove TC_STR_010
920910
@LargeTest
921911
public void testStressMultipleExport() throws Exception {
922912
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -1007,7 +997,6 @@ public void onProgress(VideoEditor ve, String outFileName,
1007997
*
1008998
* @throws Exception
1009999
*/
1010-
// TODO : remove TC_STR_011
10111000
@LargeTest
10121001
public void testStressOverlayTransKenBurn() throws Exception {
10131002
final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER;
@@ -1094,7 +1083,6 @@ public void testStressOverlayTransKenBurn() throws Exception {
10941083
*
10951084
* @throws Exception
10961085
*/
1097-
// TODO : remove TC_STR_012
10981086
@LargeTest
10991087
public void testStressAudioTrackVideo() throws Exception {
11001088
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -1147,7 +1135,6 @@ public void onProgress(Object item, int action, int progress) {
11471135
*
11481136
* @throws Exception
11491137
*/
1150-
// TODO : remove TC_STR_013
11511138
@LargeTest
11521139
public void testStressStoryBoard() throws Exception {
11531140
final String videoItemFileName1 = INPUT_FILE_PATH +
@@ -1237,7 +1224,6 @@ public void testStressStoryBoard() throws Exception {
12371224
*
12381225
* @throws Exception
12391226
*/
1240-
// TODO : remove TC_STR_014
12411227
@LargeTest
12421228
public void testStressAudioTrackOnly() throws Exception {
12431229

@@ -1267,7 +1253,6 @@ public void testStressAudioTrackOnly() throws Exception {
12671253
*
12681254
* @throws Exception
12691255
*/
1270-
// TODO : remove TC_STR_016 -- New Test Case
12711256
@LargeTest
12721257
public void testStressThumbnailImageItem() throws Exception {
12731258
final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg";

0 commit comments

Comments
 (0)