Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed MediaPlayer unit test issues"

Browse Source
This commit is contained in:
James Dong
2010-11-19 17:35:26 -08:00
committed by Android (Google) Code Review
parent b4673f757f f360acf875
commit 86e735375e
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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) {

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

@@ -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);

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

@@ -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) {

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

@@ -58,7 +58,7 @@ public class MediaPlayerSetAudioStreamTypeStateUnitTest extends AndroidTestCase
}
@LargeTest
public void testSetAudioSystemType() {
public void testSetAudioStreamType() {
mTestTemplate.runTestOnMethod(this);
}

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStartStateUnitTest.java
View File

@@ -45,7 +45,7 @@ public class MediaPlayerStartStateUnitTest extends AndroidTestCase implements Me
assertTrue(!stateErrors.errorInPlaybackCompletedState);
// Invalid states.
assertTrue(!stateErrors.errorInIdleState); // onError() won't be called
assertTrue(stateErrors.errorInIdleState);
assertTrue(stateErrors.errorInErrorState);
assertTrue(stateErrors.errorInIdleStateAfterReset);
assertTrue(stateErrors.errorInInitializedState);

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStopStateUnitTest.java
View File

@@ -46,7 +46,7 @@ public class MediaPlayerStopStateUnitTest extends AndroidTestCase implements Med
assertTrue(!stateErrors.errorInPausedState);
// Invalid states.
assertTrue(!stateErrors.errorInIdleState); // noError() won't be called
assertTrue(stateErrors.errorInIdleState);
assertTrue(stateErrors.errorInIdleStateAfterReset);
assertTrue(stateErrors.errorInInitializedState);
assertTrue(stateErrors.errorInErrorState);