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

Commit f360acf8 authored by James Dong's avatar James Dong
Browse files

Fixed MediaPlayer unit test issues 

o We used to have two different "idle" state with OpenCore.
  Now, with SF, we have a single and consistent "idle" state.

bug - 3198642

Change-Id: I2bbb5e8b6c2d8166841a6e99a1c2c4a47e00b574
parent 9803d7f8

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetCurrentPositionStateUnitTest.java

+2 −2
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ public class MediaPlayerGetCurrentPositionStateUnitTest extends AndroidTestCase 
        assertTrue(!stateErrors.errorInPausedState);

        assertTrue(!stateErrors.errorInStoppedState);

        assertTrue(!stateErrors.errorInPlaybackCompletedState);

        assertTrue(!stateErrors.errorInIdleStateAfterReset);

        

        // Invalid states.

        assertTrue(stateErrors.errorInErrorState);

        assertTrue(!stateErrors.errorInIdleState);  // onError() won't be called

        assertTrue(stateErrors.errorInIdleStateAfterReset);

        assertTrue(stateErrors.errorInIdleState);

    }

    

    public void invokeMethodUnderTest(MediaPlayer player) {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetDurationStateUnitTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ public class MediaPlayerGetDurationStateUnitTest extends AndroidTestCase impleme 
        assertTrue(!stateErrors.errorInPlaybackCompletedState);

        

        // Invalid states.

        assertTrue(!stateErrors.errorInIdleState);  // onError() won't be called

        assertTrue(stateErrors.errorInInitializedState);

        assertTrue(stateErrors.errorInErrorState);

        assertTrue(stateErrors.errorInIdleStateAfterReset);

        assertTrue(stateErrors.errorInIdleState);

    }

    

    public void invokeMethodUnderTest(MediaPlayer player) {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerPauseStateUnitTest.java

+4 −4
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ public class MediaPlayerPauseStateUnitTest extends AndroidTestCase implements Me 


    /**

     * 1. It is valid to call pause() in the following states:

     *    {Started, Paused}.

     *    {Started, Paused, PlaybackCompleted}.

     * 2. It is invalid to call pause() in the following states:

     *    {Idle, Initialized, Prepared, Stopped, PlaybackCompleted, Error}

     *    {Idle, Initialized, Prepared, Stopped, Error}

     *    

     * @param stateErrors the MediaPlayerStateErrors to check against.

     */
@@ -40,12 +40,12 @@ public class MediaPlayerPauseStateUnitTest extends AndroidTestCase implements Me 
        assertTrue(!stateErrors.errorInStartedState);

        assertTrue(!stateErrors.errorInStartedStateAfterPause);

        assertTrue(!stateErrors.errorInPausedState);

        assertTrue(!stateErrors.errorInPlaybackCompletedState);



        // Invalid states.

        assertTrue(stateErrors.errorInPreparedState);

        assertTrue(stateErrors.errorInPreparedStateAfterStop);

        assertTrue(stateErrors.errorInPlaybackCompletedState);

        assertTrue(!stateErrors.errorInIdleState);  // noError() won't be called

        assertTrue(stateErrors.errorInIdleState);

        assertTrue(stateErrors.errorInIdleStateAfterReset);

        assertTrue(stateErrors.errorInInitializedState);

        assertTrue(stateErrors.errorInStoppedState);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSeekToStateUnitTest.java

+2 −2
Original line number Diff line number Diff line
@@ -39,17 +39,17 @@ public class MediaPlayerSeekToStateUnitTest extends AndroidTestCase implements M 
        // Valid states.

        assertTrue(!stateErrors.errorInPreparedState);

        assertTrue(!stateErrors.errorInPreparedStateAfterStop);

        assertTrue(!stateErrors.errorInStartedState);

        assertTrue(!stateErrors.errorInStartedStateAfterPause);

        assertTrue(!stateErrors.errorInPausedState);

        assertTrue(!stateErrors.errorInPlaybackCompletedState);



        // Invalid states.

        assertTrue(!stateErrors.errorInIdleState);  // onError() won't be called

        assertTrue(stateErrors.errorInIdleState);

        assertTrue(stateErrors.errorInIdleStateAfterReset);

        assertTrue(stateErrors.errorInInitializedState);

        assertTrue(stateErrors.errorInStoppedState);

        assertTrue(stateErrors.errorInErrorState);

        assertTrue(!stateErrors.errorInStartedState);

    }



    public void invokeMethodUnderTest(MediaPlayer player) {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetAudioStreamTypeStateUnitTest.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class MediaPlayerSetAudioStreamTypeStateUnitTest extends AndroidTestCase 
    }



    @LargeTest

    public void testSetAudioSystemType() {

    public void testSetAudioStreamType() {

        mTestTemplate.runTestOnMethod(this);

    }