diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-07 09:34:39 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-07 09:34:39 -0700 |
| commit | 2bbaaf72ea2ca9003f7b6023ccc078445e38c722 (patch) | |
| tree | 34e702605130e4e4f8e9e458799e70fedcd8e8b7 /media/tests | |
| parent | a15f0fc6f70a5a67e3546e2816f63e6c5174cc6d (diff) | |
| parent | 0efb0868841cc1c2b5a669b39880d931f54f705a (diff) | |
| download | frameworks_base-2bbaaf72ea2ca9003f7b6023ccc078445e38c722.zip frameworks_base-2bbaaf72ea2ca9003f7b6023ccc078445e38c722.tar.gz frameworks_base-2bbaaf72ea2ca9003f7b6023ccc078445e38c722.tar.bz2 | |
am 0efb086: Merge change 1120 into donut
Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'
* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
Diffstat (limited to 'media/tests')
2 files changed, 13 insertions, 3 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java index 364e1af..3715913 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java @@ -170,21 +170,25 @@ public class MediaMetadataTest extends AndroidTestCase { validateMetatData(non_mp3_test_file.WAV.ordinal(), MediaNames.META_DATA_OTHERS); } + @Suppress @MediumTest public static void testWma9_Metadata() throws Exception { validateMetatData(non_mp3_test_file.WMA9.ordinal(), MediaNames.META_DATA_OTHERS); } + @Suppress @MediumTest public static void testWma10_Metadata() throws Exception { validateMetatData(non_mp3_test_file.WMA10.ordinal(), MediaNames.META_DATA_OTHERS); } + @Suppress @MediumTest public static void testWmv9_Metadata() throws Exception { validateMetatData(non_mp3_test_file.WMV9.ordinal(), MediaNames.META_DATA_OTHERS); } + @Suppress @MediumTest public static void testWmv10_Metadata() throws Exception { validateMetatData(non_mp3_test_file.WMV7.ordinal(), MediaNames.META_DATA_OTHERS); diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java index cfcc521..8be7058 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java @@ -78,6 +78,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("MIDI getDuration", duratoinWithinTolerence); } + @Suppress @MediumTest public void testWMA9GetDuration() throws Exception { int duration = CodecTest.getDuration(MediaNames.WMA9); @@ -118,7 +119,8 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra boolean currentPosition = CodecTest.getCurrentPosition(MediaNames.MIDI); assertTrue("MIDI GetCurrentPosition", currentPosition); } - + + @Suppress @LargeTest public void testWMA9GetCurrentPosition() throws Exception { boolean currentPosition = CodecTest.getCurrentPosition(MediaNames.WMA9); @@ -156,6 +158,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("MIDI Pause", isPaused); } + @Suppress @LargeTest public void testWMA9Pause() throws Exception { boolean isPaused = CodecTest.pause(MediaNames.WMA9); @@ -227,6 +230,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("MIDI setLooping", isLoop); } + @Suppress @LargeTest public void testWMA9SetLooping() throws Exception { boolean isLoop = CodecTest.setLooping(MediaNames.WMA9); @@ -265,6 +269,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("MIDI seekTo", isLoop); } + @Suppress @LargeTest public void testWMA9SeekTo() throws Exception { boolean isLoop = CodecTest.seekTo(MediaNames.WMA9); @@ -304,6 +309,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("MIDI seekToEnd", isEnd); } + @Suppress @LargeTest public void testWMA9SeekToEnd() throws Exception { boolean isEnd = CodecTest.seekToEnd(MediaNames.WMA9); @@ -379,7 +385,8 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra boolean isSeek = CodecTest.videoSeekTo(MediaNames.VIDEO_H264_AMR); assertTrue("H264AMR SeekTo", isSeek); } - + + @Suppress @LargeTest public void testVideoWMVSeekTo() throws Exception { boolean isSeek = CodecTest.videoSeekTo(MediaNames.VIDEO_WMV); @@ -450,4 +457,3 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess); } } - |