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

Commit 9d7e75eb authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

am bf964e6a: Merge change Ic060d86f into eclair 

Merge commit 'bf964e6a' into eclair-mr2

* commit 'bf964e6a':
  Check whether test server is up before running tests which use streaming files.
parents b262f50a bf964e6a

media/tests/MediaFrameworkTest/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    

    <uses-permission android:name="android.permission.RECORD_AUDIO" />

    <uses-permission android:name="android.permission.CAMERA" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application>    

        <uses-library android:name="android.test.runner" />

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

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.mediaframeworktest.MediaNames; 


import java.io.File;

import java.io.FileDescriptor;

import java.net.InetAddress;



 

public class MediaFrameworkTest extends Activity {
@@ -142,4 +143,9 @@ public class MediaFrameworkTest extends Activity { 
      return super.onKeyDown(keyCode, event);

     

  }  



  public static boolean checkStreamingServer() throws Exception {

      InetAddress address = InetAddress.getByAddress(MediaNames.STREAM_SERVER);

      return address.isReachable(10000);

  }

}

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ public class MediaNames { 
  };

  

  //Streaming test files

  public static final byte [] STREAM_SERVER = new byte[] {(byte)75,(byte)17,(byte)48,(byte)204};

  public static final String STREAM_H264_480_360_1411k = 

      "http://75.17.48.204:10088/yslau/stress_media/h264_regular.mp4";

  public static final String STREAM_WMV =

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

+3 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @MediumTest

    public void testPrepareAsyncReset() throws Exception {

      assertTrue(MediaFrameworkTest.checkStreamingServer());

      boolean isReset = CodecTest.prepareAsyncReset(MediaNames.STREAM_MP3);

      assertTrue("PrepareAsync Reset", isReset);         

    }
@@ -471,6 +472,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @LargeTest

    public void testStreamPrepareAsyncCallback() throws Exception {

        assertTrue(MediaFrameworkTest.checkStreamingServer());

        boolean onPrepareSuccess = 

            CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, false);

        assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);
@@ -478,6 +480,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @LargeTest

    public void testStreamPrepareAsyncCallbackReset() throws Exception {

        assertTrue(MediaFrameworkTest.checkStreamingServer());

        boolean onPrepareSuccess = 

            CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, true);

        assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi 


        mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder();

        try {

            assertTrue(MediaFrameworkTest.checkStreamingServer());

            for (int i = 0; i < NUMBER_OF_STRESS_LOOPS; i++) {

                MediaPlayer mp = new MediaPlayer();

                mp.setDataSource(MediaNames.STREAM_H264_480_360_1411k);