Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Video editor CTS: Framework modifications" into honeycomb

Browse Source
This commit is contained in:
Basavapatna Dattaguru
2011-01-26 21:48:02 -08:00
committed by Android (Google) Code Review
parent 643e8476e1 eb6d6ecf4b
commit 9af5da5258
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2011 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
package com.android.mediaframeworktest; package com.android.mediaframeworktest;
import com.android.mediaframeworktest.performance.MediaPlayerPerformance; import com.android.mediaframeworktest.performance.MediaPlayerPerformance;
/*Video Editor performance Test cases*/
import com.android.mediaframeworktest.performance.VideoEditorPerformance;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import android.test.InstrumentationTestRunner; import android.test.InstrumentationTestRunner;
@@ -40,6 +41,8 @@ public class MediaFrameworkPerfTestRunner extends InstrumentationTestRunner {
public TestSuite getAllTests() { public TestSuite getAllTests() {
TestSuite suite = new InstrumentationTestSuite(this); TestSuite suite = new InstrumentationTestSuite(this);
suite.addTestSuite(MediaPlayerPerformance.class); suite.addTestSuite(MediaPlayerPerformance.class);
/*Video Editor performance Test cases*/
suite.addTestSuite(VideoEditorPerformance.class);
return suite; return suite;
} }

16
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2011 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -32,6 +32,13 @@ import com.android.mediaframeworktest.functional.MediaEqualizerTest;
import com.android.mediaframeworktest.functional.MediaPresetReverbTest; import com.android.mediaframeworktest.functional.MediaPresetReverbTest;
import com.android.mediaframeworktest.functional.MediaVirtualizerTest; import com.android.mediaframeworktest.functional.MediaVirtualizerTest;
import com.android.mediaframeworktest.functional.MediaVisualizerTest; import com.android.mediaframeworktest.functional.MediaVisualizerTest;
/*import for VideoEditor Test cases*/
import com.android.mediaframeworktest.functional.MediaItemThumbnailTest;
import com.android.mediaframeworktest.functional.MediaPropertiesTest;
import com.android.mediaframeworktest.functional.VideoEditorAPITest;
import com.android.mediaframeworktest.functional.VideoEditorExportTest;
import com.android.mediaframeworktest.functional.VideoEditorPreviewTest;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import android.test.InstrumentationTestRunner; import android.test.InstrumentationTestRunner;
@@ -69,6 +76,13 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner {
suite.addTestSuite(MediaPresetReverbTest.class); suite.addTestSuite(MediaPresetReverbTest.class);
suite.addTestSuite(MediaVirtualizerTest.class); suite.addTestSuite(MediaVirtualizerTest.class);
suite.addTestSuite(MediaVisualizerTest.class); suite.addTestSuite(MediaVisualizerTest.class);
/*Test for Video Editor*/
suite.addTestSuite(MediaItemThumbnailTest.class);
suite.addTestSuite(MediaPropertiesTest.class);
suite.addTestSuite(VideoEditorAPITest.class);
suite.addTestSuite(VideoEditorExportTest.class);
suite.addTestSuite(VideoEditorPreviewTest.class);
return suite; return suite;
} }