Skip to content

Commit b2d1723

Browse files
Xia WangAndroid (Google) Code Review
Xia Wang
authored and
Android (Google) Code Review
committed
Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
2 parents 272101b + db60285 commit b2d1723

18 files changed

+46
-50
lines changed

‎media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,26 @@
1717
package com.android.mediaframeworktest;
1818

1919
import com.android.mediaframeworktest.functional.CameraTest;
20-
import com.android.mediaframeworktest.functional.MediaAudioTrackTest;
2120
import com.android.mediaframeworktest.functional.MediaMetadataTest;
2221
import com.android.mediaframeworktest.functional.MediaMimeTest;
23-
import com.android.mediaframeworktest.functional.MediaPlayerApiTest;
24-
import com.android.mediaframeworktest.functional.MediaRecorderTest;
25-
import com.android.mediaframeworktest.functional.SimTonesTest;
2622
import com.android.mediaframeworktest.functional.MediaPlayerInvokeTest;
27-
import com.android.mediaframeworktest.functional.MediaAudioManagerTest;
28-
import com.android.mediaframeworktest.functional.MediaAudioEffectTest;
29-
import com.android.mediaframeworktest.functional.MediaBassBoostTest;
30-
import com.android.mediaframeworktest.functional.MediaEnvReverbTest;
31-
import com.android.mediaframeworktest.functional.MediaEqualizerTest;
32-
import com.android.mediaframeworktest.functional.MediaPresetReverbTest;
33-
import com.android.mediaframeworktest.functional.MediaVirtualizerTest;
34-
import com.android.mediaframeworktest.functional.MediaVisualizerTest;
35-
/*import for VideoEditor Test cases*/
36-
import com.android.mediaframeworktest.functional.MediaItemThumbnailTest;
37-
import com.android.mediaframeworktest.functional.MediaPropertiesTest;
38-
import com.android.mediaframeworktest.functional.VideoEditorAPITest;
39-
import com.android.mediaframeworktest.functional.VideoEditorExportTest;
40-
import com.android.mediaframeworktest.functional.VideoEditorPreviewTest;
23+
import com.android.mediaframeworktest.functional.mediaplayback.MediaPlayerApiTest;
24+
import com.android.mediaframeworktest.functional.mediarecorder.MediaRecorderTest;
25+
import com.android.mediaframeworktest.functional.audio.SimTonesTest;
26+
import com.android.mediaframeworktest.functional.audio.MediaAudioTrackTest;
27+
import com.android.mediaframeworktest.functional.audio.MediaAudioManagerTest;
28+
import com.android.mediaframeworktest.functional.audio.MediaAudioEffectTest;
29+
import com.android.mediaframeworktest.functional.audio.MediaBassBoostTest;
30+
import com.android.mediaframeworktest.functional.audio.MediaEnvReverbTest;
31+
import com.android.mediaframeworktest.functional.audio.MediaEqualizerTest;
32+
import com.android.mediaframeworktest.functional.audio.MediaPresetReverbTest;
33+
import com.android.mediaframeworktest.functional.audio.MediaVirtualizerTest;
34+
import com.android.mediaframeworktest.functional.audio.MediaVisualizerTest;
35+
import com.android.mediaframeworktest.functional.videoeditor.MediaItemThumbnailTest;
36+
import com.android.mediaframeworktest.functional.videoeditor.MediaPropertiesTest;
37+
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorAPITest;
38+
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorExportTest;
39+
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorPreviewTest;
4140
import junit.framework.TestSuite;
4241

4342
import android.test.InstrumentationTestRunner;

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioEffectTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
@@ -1529,4 +1529,3 @@ protected byte[] shortToByteArray(short value) {
15291529
}
15301530

15311531
}
1532-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioManagerTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import android.content.Context;
@@ -67,4 +67,4 @@ public void testSetRingtoneMode() throws Exception {
6767
assertTrue("SetRingtoneMode : " + ringtoneMode[i], result);
6868
}
6969
}
70-
}
70+
}

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
@@ -1250,4 +1250,3 @@ public void testGetMinBufferSizeTooHighSR() throws Exception {
12501250
}
12511251

12521252
}
1253-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaBassBoostTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
21+
import com.android.mediaframeworktest.functional.EnergyProbe;
2122
import android.content.Context;
2223
import android.content.res.AssetFileDescriptor;
2324
import android.media.audiofx.AudioEffect;
@@ -286,4 +287,3 @@ private void releaseBassBoost() {
286287
}
287288

288289
}
289-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
21+
import com.android.mediaframeworktest.functional.EnergyProbe;
2122
import android.content.Context;
2223
import android.content.res.AssetFileDescriptor;
2324
import android.media.audiofx.AudioEffect;
@@ -520,4 +521,3 @@ private void releaseReverb() {
520521
}
521522

522523
}
523-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEqualizerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
21+
import com.android.mediaframeworktest.functional.EnergyProbe;
2122
import android.content.Context;
2223
import android.content.res.AssetFileDescriptor;
2324
import android.media.audiofx.AudioEffect;
@@ -349,4 +350,3 @@ private void releaseEqualizer() {
349350
}
350351

351352
}
352-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
21+
import com.android.mediaframeworktest.functional.EnergyProbe;
2122
import android.content.Context;
2223
import android.content.res.AssetFileDescriptor;
2324
import android.media.audiofx.AudioEffect;
@@ -365,4 +366,3 @@ private void releaseReverb() {
365366
}
366367

367368
}
368-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVirtualizerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
21+
import com.android.mediaframeworktest.functional.EnergyProbe;
2122
import android.content.Context;
2223
import android.content.res.AssetFileDescriptor;
2324
import android.media.audiofx.AudioEffect;
@@ -291,4 +292,3 @@ private void releaseVirtualizer() {
291292
}
292293

293294
}
294-

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java renamed to media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.android.mediaframeworktest.functional;
17+
package com.android.mediaframeworktest.functional.audio;
1818

1919
import com.android.mediaframeworktest.MediaFrameworkTest;
2020
import com.android.mediaframeworktest.MediaNames;
@@ -502,4 +502,3 @@ private void terminateListenerLooper() {
502502
}
503503

504504
}
505-

0 commit comments

Comments
 (0)