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

Commit 3e7b3c0f authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by The Android Open Source Project
Browse files

Automated import from //branches/master/...@142150,142150

parent 9ea028f1
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ import android.graphics.Bitmap;
import java.io.FileOutputStream;
import android.test.AndroidTestCase;
import com.android.mediaframeworktest.MediaNames;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
import android.test.suitebuilder.annotation.*;

/**
 * WARNING:
@@ -35,7 +34,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
    private static final String TAG         = "MediaMetadataRetrieverTest";
   
    // Test album art extraction.
    @LargeTest
    @MediumTest
    public static void testAlbumArt() throws Exception {
        Log.v(TAG, "testAlbumArt starts.");
        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
@@ -109,7 +108,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {

    // If the specified call order and valid media file is used, no exception
    // should be thrown.
    @LargeTest
    @MediumTest
    public static void testBasicNormalMethodCallSequence() throws Exception {
        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
        retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
@@ -136,7 +135,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {

    // If setDataSource() has not been called, both captureFrame() and extractMetadata() must
    // return null.
    @LargeTest
    @MediumTest
    public static void testBasicAbnormalMethodCallSequence() {
        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
        retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
@@ -145,7 +144,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
    }

    // Test setDataSource()
    @LargeTest
    @MediumTest
    public static void testSetDataSource() {
        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
        retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
@@ -190,7 +189,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
    // Due to the lack of permission to access hardware decoder, any calls
    // attempting to capture a frame will fail. These are commented out for now
    // until we find a solution to this access permission problem.
    @LargeTest
    @MediumTest
    public static void testIntendedUsage() {
        // By default, capture frame and retrieve metadata
        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;

import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;
import java.io.IOException;

@@ -59,7 +59,7 @@ public class MediaRecorderPrepareStateUnitTest extends AndroidTestCase implement
        }
    }

    @LargeTest
    @MediumTest
    public void testPrepare() {
        mTestTemplate.runTestOnMethod(this);
    }
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;

import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;

/**
@@ -54,7 +54,7 @@ public class MediaRecorderResetStateUnitTest extends AndroidTestCase implements
        recorder.reset();
    }

    @LargeTest
    @MediumTest
    public void testReset() {
        mTestTemplate.runTestOnMethod(this);
    }
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;

import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;

/**
@@ -54,7 +54,7 @@ public class MediaRecorderSetAudioEncoderStateUnitTest extends AndroidTestCase i
        recorder.setAudioEncoder(MediaRecorderStateUnitTestTemplate.AUDIO_ENCODER);
    }

    @LargeTest
    @MediumTest
    public void testSetAudioEncoder() {
        mTestTemplate.runTestOnMethod(this);
    }
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;

import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;

/**
@@ -54,7 +54,7 @@ public class MediaRecorderSetAudioSourceStateUnitTest extends AndroidTestCase im
        recorder.setAudioSource(MediaRecorderStateUnitTestTemplate.AUDIO_SOURCE);
    }

    @LargeTest
    @MediumTest
    public void testSetAudioSource() {
        mTestTemplate.runTestOnMethod(this);
    }
Loading