summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2012-07-10 16:51:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-10 16:51:20 -0700
commit0fb362b41ef4c272148b90d16880f09160293f96 (patch)
tree4bc19115adc46dc5ea69f17be0cf068d0cfc3a78
parentec4ed1af2c0d68012e0b7f548505aaae6b7377b3 (diff)
parent413b5c19a681bb4fda4cc5a6e8347d37792aa905 (diff)
downloadframeworks_base-0fb362b41ef4c272148b90d16880f09160293f96.zip
frameworks_base-0fb362b41ef4c272148b90d16880f09160293f96.tar.gz
frameworks_base-0fb362b41ef4c272148b90d16880f09160293f96.tar.bz2
am 413b5c19: am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev
* commit '413b5c19a681bb4fda4cc5a6e8347d37792aa905': Remove the unnecssary intent call.
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
index 25b6e7f..67da6ac 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
@@ -24,6 +24,7 @@ import android.content.Intent;
import android.hardware.Camera;
import android.media.MediaPlayer;
import android.media.MediaRecorder;
+import android.os.Environment;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
@@ -66,6 +67,9 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
private int mTotalNotSeekable = 0;
private int mTotalMetaDataUpdate = 0;
+ //Test result output file
+ private static final String PLAYBACK_RESULT = "PlaybackTestResult.txt";
+
private void writeTestOutput(String filename, Writer output) throws Exception{
output.write("File Name: " + filename);
output.write(" Complete: " + CodecTest.onCompleteSuccess);
@@ -109,27 +113,19 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
@LargeTest
public void testVideoPlayback() throws Exception {
String fileWithError = "Filename:\n";
- File playbackOutput = new File("/sdcard/PlaybackTestResult.txt");
+ File playbackOutput = new File(Environment.getExternalStorageDirectory(), PLAYBACK_RESULT);
Writer output = new BufferedWriter(new FileWriter(playbackOutput, true));
boolean testResult = true;
// load directory files
boolean onCompleteSuccess = false;
File dir = new File(MediaNames.MEDIA_SAMPLE_POOL);
-
- Instrumentation inst = getInstrumentation();
- Intent intent = new Intent();
-
- intent.setClass(getInstrumentation().getTargetContext(), MediaFrameworkTest.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
String[] children = dir.list();
if (children == null) {
Log.v("MediaPlayerApiTest:testMediaSamples", "dir is empty");
return;
} else {
for (int i = 0; i < children.length; i++) {
- Activity act = inst.startActivitySync(intent);
//Get filename of directory
String filename = children[i];
onCompleteSuccess =
@@ -141,8 +137,6 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
testResult = false;
}
Thread.sleep(3000);
- //Call onCreat to recreate the surface
- act.finish();
//Write test result to an output file
writeTestOutput(filename,output);
//Get the summary