drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom

Browse Source
This commit is contained in:
Xia Wang
2011-09-28 12:38:15 -07:00
committed by Android (Google) Code Review
parent 272101b308 db6028508c
commit b2d17234b7
18 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
View File

@ -17,27 +17,26 @@
package com.android.mediaframeworktest;
import com.android.mediaframeworktest.functional.CameraTest;
import com.android.mediaframeworktest.functional.MediaAudioTrackTest;
import com.android.mediaframeworktest.functional.MediaMetadataTest;
import com.android.mediaframeworktest.functional.MediaMimeTest;
import com.android.mediaframeworktest.functional.MediaPlayerApiTest;
import com.android.mediaframeworktest.functional.MediaRecorderTest;
import com.android.mediaframeworktest.functional.SimTonesTest;
import com.android.mediaframeworktest.functional.MediaPlayerInvokeTest;
import com.android.mediaframeworktest.functional.MediaAudioManagerTest;
import com.android.mediaframeworktest.functional.MediaAudioEffectTest;
import com.android.mediaframeworktest.functional.MediaBassBoostTest;
import com.android.mediaframeworktest.functional.MediaEnvReverbTest;
import com.android.mediaframeworktest.functional.MediaEqualizerTest;
import com.android.mediaframeworktest.functional.MediaPresetReverbTest;
import com.android.mediaframeworktest.functional.MediaVirtualizerTest;
import com.android.mediaframeworktest.functional.MediaVisualizerTest;
/*import for VideoEditor Test cases*/
import com.android.mediaframeworktest.functional.MediaItemThumbnailTest;
import com.android.mediaframeworktest.functional.MediaPropertiesTest;
import com.android.mediaframeworktest.functional.VideoEditorAPITest;
import com.android.mediaframeworktest.functional.VideoEditorExportTest;
import com.android.mediaframeworktest.functional.VideoEditorPreviewTest;
import com.android.mediaframeworktest.functional.mediaplayback.MediaPlayerApiTest;
import com.android.mediaframeworktest.functional.mediarecorder.MediaRecorderTest;
import com.android.mediaframeworktest.functional.audio.SimTonesTest;
import com.android.mediaframeworktest.functional.audio.MediaAudioTrackTest;
import com.android.mediaframeworktest.functional.audio.MediaAudioManagerTest;
import com.android.mediaframeworktest.functional.audio.MediaAudioEffectTest;
import com.android.mediaframeworktest.functional.audio.MediaBassBoostTest;
import com.android.mediaframeworktest.functional.audio.MediaEnvReverbTest;
import com.android.mediaframeworktest.functional.audio.MediaEqualizerTest;
import com.android.mediaframeworktest.functional.audio.MediaPresetReverbTest;
import com.android.mediaframeworktest.functional.audio.MediaVirtualizerTest;
import com.android.mediaframeworktest.functional.audio.MediaVisualizerTest;
import com.android.mediaframeworktest.functional.videoeditor.MediaItemThumbnailTest;
import com.android.mediaframeworktest.functional.videoeditor.MediaPropertiesTest;
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorAPITest;
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorExportTest;
import com.android.mediaframeworktest.functional.videoeditor.VideoEditorPreviewTest;
import junit.framework.TestSuite;
import android.test.InstrumentationTestRunner;

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioEffectTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
@ -1529,4 +1529,3 @@ public class MediaAudioEffectTest extends ActivityInstrumentationTestCase2<Media
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioManagerTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java
View File

@ -14,7 +14,7 @@
* the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import android.content.Context;
@ -67,4 +67,4 @@ public class MediaAudioManagerTest extends ActivityInstrumentationTestCase2<Medi
assertTrue("SetRingtoneMode : " + ringtoneMode[i], result);
}
}
}
}

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
@ -1250,4 +1250,3 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaBassBoostTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.functional.EnergyProbe;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
@ -286,4 +287,3 @@ public class MediaBassBoostTest extends ActivityInstrumentationTestCase2<MediaFr
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.functional.EnergyProbe;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
@ -520,4 +521,3 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEqualizerTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.functional.EnergyProbe;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
@ -349,4 +350,3 @@ public class MediaEqualizerTest extends ActivityInstrumentationTestCase2<MediaFr
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.functional.EnergyProbe;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
@ -365,4 +366,3 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVirtualizerTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.functional.EnergyProbe;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
@ -291,4 +292,3 @@ public class MediaVirtualizerTest extends ActivityInstrumentationTestCase2<Media
}
}

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
@ -502,4 +502,3 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF
}
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/SimTonesTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/SimTonesTest.java
View File

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.audio;
// import android.content.Resources;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.functional.TonesAutoTest;
import android.content.Context;
import android.test.ActivityInstrumentationTestCase;
@ -70,4 +71,3 @@ public class SimTonesTest extends ActivityInstrumentationTestCase<MediaFramework
assertTrue("Stress Tones", result);
}
}

12
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediaplayback/MediaPlayerApiTest.java
View File

@ -14,11 +14,12 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.mediaplayback;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.MediaProfileReader;
import com.android.mediaframeworktest.functional.CodecTest;
import android.content.Context;
import android.test.ActivityInstrumentationTestCase;
@ -31,16 +32,15 @@ import java.io.File;
/**
* Junit / Instrumentation test case for the media player api
*/
public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFrameworkTest> {
*/
public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFrameworkTest> {
private boolean duratoinWithinTolerence = false;
private String TAG = "MediaPlayerApiTest";
private boolean isWMAEnable = false;
private boolean isWMVEnable = false;
Context mContext;
public MediaPlayerApiTest() {
super("com.android.mediaframeworktest", MediaFrameworkTest.class);
isWMAEnable = MediaProfileReader.getWMAEnable();

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.mediarecorder;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java
View File

@ -15,7 +15,7 @@
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.videoeditor;
import java.io.File;
import java.io.IOException;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.videoeditor;
import java.io.File;
import java.io.IOException;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.videoeditor;
import java.io.File;
import java.util.List;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.videoeditor;
import java.io.File;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java → media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.mediaframeworktest.functional;
package com.android.mediaframeworktest.functional.videoeditor;
import java.io.File;
import java.io.IOException;