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

Commit 10366b93 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android (Google) Code Review
Browse files

Merge "Remove the unnecssary intent call." into jb-dev

parents d2246930 e60393ae
Loading
Loading
Loading
Loading
+5 −11
Original line number Diff line number Diff line
@@ -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