drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Ic060d86f into eclair

Browse Source 
* changes:
  Check whether test server is up before running tests which use streaming files.
This commit is contained in:
Android (Google) Code Review
2009-11-10 10:04:40 -08:00
parent 13ce56bdbc c060d86f7d
commit bf964e6a04
5 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/tests/MediaFrameworkTest/AndroidManifest.xml
View File

@ -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" />

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

@ -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);
}
}

1
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
View File

@ -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 =

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

@ -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);

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

@ -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);