diff options
author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-01-26 22:50:59 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 22:50:59 -0800 |
commit | 89378fd1666cd589599a0c5a7d0c71fa2f8159a5 (patch) | |
tree | 1695693a5d59001ce8e701243722c0b76ef6def5 | |
parent | 3b728ca70a4fe6760b682589505d76848c47d765 (diff) | |
parent | d36b1f07394c3326d6629cd3bc706974ac49345a (diff) | |
download | frameworks_base-89378fd1666cd589599a0c5a7d0c71fa2f8159a5.zip frameworks_base-89378fd1666cd589599a0c5a7d0c71fa2f8159a5.tar.gz frameworks_base-89378fd1666cd589599a0c5a7d0c71fa2f8159a5.tar.bz2 |
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
2 files changed, 4 insertions, 21 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java index 868ce36..eaaa798 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Android Open Source Project + * Copyright (C) 2008 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,7 @@ 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; @@ -27,7 +26,7 @@ import android.test.InstrumentationTestSuite; /** * Instrumentation Test Runner for all MediaPlayer tests. - * + * * Running all tests: * * adb shell am instrument \ @@ -41,8 +40,6 @@ 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; } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java index b044b4d..46135ff 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Android Open Source Project + * Copyright (C) 2008 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,13 +32,6 @@ import com.android.mediaframeworktest.functional.MediaEqualizerTest; import com.android.mediaframeworktest.functional.MediaPresetReverbTest; import com.android.mediaframeworktest.functional.MediaVirtualizerTest; 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 android.test.InstrumentationTestRunner; @@ -76,13 +69,6 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner { suite.addTestSuite(MediaPresetReverbTest.class); suite.addTestSuite(MediaVirtualizerTest.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; } |