Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0efb0868 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 1120 into donut 

* changes:
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
parents 50396063 fe176647

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

+9 −3
Original line number Diff line number Diff line
@@ -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);
@@ -119,6 +120,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
      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);
@@ -380,6 +386,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
      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);

    }

}