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

Commit 3cf987e8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Benchmark: Consistency in test names" am: b1bac93a am: 956e2618 am: 9d4867f6 

Change-Id: I41e095b0a02b91f0d260d553a23ec70500bdbbc9
parents 665c3c4b 9d4867f6

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/EncoderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class EncoderTest { 
    }



    @Test(timeout = PER_TEST_TIMEOUT_MS)

    public void sampleEncoderTest() throws Exception {

    public void testEncoder() throws Exception {

        int status;

        int frameSize;

        //Parameters for video

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/ExtractorTest.java

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class ExtractorTest { 
    }



    @Test

    public void sampleExtractTest() throws IOException {

    public void testExtractor() throws IOException {

        File inputFile = new File(mInputFilePath + mInputFileName);

        assertTrue("Cannot find " + mInputFileName + " in directory " + mInputFilePath,

                inputFile.exists());
@@ -107,7 +107,7 @@ public class ExtractorTest { 
    }



    @Test

    public void sampleExtractNativeTest() throws IOException {

    public void testNativeExtractor() throws IOException {

        Native nativeExtractor = new Native();

        File inputFile = new File(mInputFilePath + mInputFileName);

        assertTrue("Cannot find " + mInputFileName + " in directory " + mInputFilePath,

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/MuxerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class MuxerTest { 
    }



    @Test

    public void sampleMuxerTest() throws IOException {

    public void testMuxer() throws IOException {

        File inputFile = new File(mInputFilePath + mInputFileName);

        assertTrue("Cannot find " + mInputFileName + " in directory " + mInputFilePath,

                inputFile.exists());
@@ -159,7 +159,7 @@ public class MuxerTest { 
    }



    @Test

    public void sampleMuxerNativeTest() {

    public void testNativeMuxer() {

        Native nativeMuxer = new Native();

        File inputFile = new File(mInputFilePath + mInputFileName);

        assertTrue("Cannot find " + mInputFileName + " in directory " + mInputFilePath,