diff options
Diffstat (limited to 'media/tests')
16 files changed, 215 insertions, 176 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java index c9087d1..7967ce7 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java @@ -19,8 +19,13 @@ package com.android.mediaframeworktest.functional.audio; import com.android.mediaframeworktest.MediaFrameworkTest; import android.content.Context; import android.media.AudioManager; +import android.media.MediaPlayer; +import android.media.AudioManager.OnAudioFocusChangeListener; +import android.os.Looper; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.LargeTest; +import android.util.Log; /** * Junit / Instrumentation test case for the media AudioManager api @@ -28,8 +33,13 @@ import android.test.suitebuilder.annotation.MediumTest; public class MediaAudioManagerTest extends ActivityInstrumentationTestCase2<MediaFrameworkTest> { - private String TAG = "MediaAudioManagerTest"; + private final static String TAG = "MediaAudioManagerTest"; + // the AudioManager used throughout the test private AudioManager mAudioManager; + // keep track of looper for AudioManager so we can terminate it + private Looper mAudioManagerLooper; + private final Object mLooperLock = new Object(); + private final static int WAIT_FOR_LOOPER_TO_INITIALIZE_MS = 60000; // 60s private int[] ringtoneMode = {AudioManager.RINGER_MODE_NORMAL, AudioManager.RINGER_MODE_SILENT, AudioManager.RINGER_MODE_VIBRATE}; @@ -37,17 +47,48 @@ public class MediaAudioManagerTest extends ActivityInstrumentationTestCase2<Medi super("com.android.mediaframeworktest", MediaFrameworkTest.class); } + private void initializeAudioManagerWithLooper() { + new Thread() { + @Override + public void run() { + Looper.prepare(); + mAudioManagerLooper = Looper.myLooper(); + mAudioManager = (AudioManager)getActivity().getSystemService(Context.AUDIO_SERVICE); + synchronized (mLooperLock) { + mLooperLock.notify(); + } + Looper.loop(); + } + }.start(); + } + @Override protected void setUp() throws Exception { super.setUp(); - mAudioManager = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + synchronized(mLooperLock) { + initializeAudioManagerWithLooper(); + try { + mLooperLock.wait(WAIT_FOR_LOOPER_TO_INITIALIZE_MS); + } catch (Exception e) { + assertTrue("initializeAudioManagerWithLooper() failed to complete in time", false); + } + } } @Override protected void tearDown() throws Exception { super.tearDown(); + synchronized(mLooperLock) { + if (mAudioManagerLooper != null) { + mAudioManagerLooper.quit(); + } + } } + //----------------------------------------------------------------- + // Ringer Mode + //---------------------------------- + public boolean validateSetRingTone(int i) { int getRingtone = mAudioManager.getRingerMode(); if (i != getRingtone) @@ -67,4 +108,136 @@ public class MediaAudioManagerTest extends ActivityInstrumentationTestCase2<Medi assertTrue("SetRingtoneMode : " + ringtoneMode[i], result); } } + + //----------------------------------------------------------------- + // AudioFocus + //---------------------------------- + + private static AudioFocusListener mAudioFocusListener; + private final static int INVALID_FOCUS = -80; // initialized to magic invalid focus change type + private final static int WAIT_FOR_AUDIOFOCUS_LOSS_MS = 10; + + private static class AudioFocusListener implements OnAudioFocusChangeListener { + public int mLastFocusChange = INVALID_FOCUS; + public int mFocusChangeCounter = 0; + public AudioFocusListener() { + } + public void onAudioFocusChange(int focusChange) { + mLastFocusChange = focusChange; + mFocusChangeCounter++; + } + } + + /** + * Fails the test if expectedFocusLossMode != mAudioFocusListener.mLastFocusChange + */ + private void verifyAudioFocusLoss(int focusGainMode, int expectedFocusLossMode) + throws Exception { + // request AudioFocus so we can test that mAudioFocusListener loses it when another + // request comes in + int result = mAudioManager.requestAudioFocus(mAudioFocusListener, + AudioManager.STREAM_MUSIC, + AudioManager.AUDIOFOCUS_GAIN); + assertTrue("requestAudioFocus returned " + result, + result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED); + // cause mAudioFocusListener to lose AudioFocus + result = mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, + focusGainMode); + assertTrue("requestAudioFocus returned " + result, + result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED); + // the audio focus request is async, so wait a bit to verify it had the expected effect + java.lang.Thread.sleep(WAIT_FOR_AUDIOFOCUS_LOSS_MS); + // test successful if the expected focus loss was recorded + assertEquals("listener lost focus", + mAudioFocusListener.mLastFocusChange, expectedFocusLossMode); + } + + private void setupAudioFocusListener() { + mAudioFocusListener = new AudioFocusListener(); + mAudioManager.registerAudioFocusListener(mAudioFocusListener); + } + + private void cleanupAudioFocusListener() { + // clean up + mAudioManager.abandonAudioFocus(mAudioFocusListener); + mAudioManager.unregisterAudioFocusListener(mAudioFocusListener); + } + + //---------------------------------- + + //Test case 1: test audio focus listener loses audio focus: + // AUDIOFOCUS_GAIN causes AUDIOFOCUS_LOSS + @MediumTest + public void testAudioFocusLoss() throws Exception { + setupAudioFocusListener(); + + verifyAudioFocusLoss(AudioManager.AUDIOFOCUS_GAIN, AudioManager.AUDIOFOCUS_LOSS); + + cleanupAudioFocusListener(); + } + + //Test case 2: test audio focus listener loses audio focus: + // AUDIOFOCUS_GAIN_TRANSIENT causes AUDIOFOCUS_LOSS_TRANSIENT + @MediumTest + public void testAudioFocusLossTransient() throws Exception { + setupAudioFocusListener(); + + verifyAudioFocusLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT, + AudioManager.AUDIOFOCUS_LOSS_TRANSIENT); + + cleanupAudioFocusListener(); + } + + //Test case 3: test audio focus listener loses audio focus: + // AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK causes AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK + @MediumTest + public void testAudioFocusLossTransientDuck() throws Exception { + setupAudioFocusListener(); + + verifyAudioFocusLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, + AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK); + + cleanupAudioFocusListener(); + } + + //Test case 4: test audio focus registering and use over 3000 iterations + @LargeTest + public void testAudioFocusStressListenerRequestAbandon() throws Exception { + final int ITERATIONS = 3000; + // here we only test the life cycle of a focus listener, and make sure we don't crash + // when doing it many times without waiting + for (int i = 0 ; i < ITERATIONS ; i++) { + setupAudioFocusListener(); + int result = mAudioManager.requestAudioFocus(mAudioFocusListener, + AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN); + assertTrue("audio focus request was not granted", + result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED); + cleanupAudioFocusListener(); + } + assertTrue("testAudioFocusListenerLifeCycle : tested" + ITERATIONS +" iterations", true); + } + + //Test case 5: test audio focus use without listener + @LargeTest + public void testAudioFocusStressNoListenerRequestAbandon() throws Exception { + final int ITERATIONS = 1000; + // make sure we have a listener in the stack + setupAudioFocusListener(); + mAudioManager.requestAudioFocus(mAudioFocusListener, AudioManager.STREAM_MUSIC, + AudioManager.AUDIOFOCUS_GAIN); + // keep making the current owner lose and gain audio focus repeatedly + for (int i = 0 ; i < ITERATIONS ; i++) { + mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, + AudioManager.AUDIOFOCUS_GAIN_TRANSIENT); + mAudioManager.abandonAudioFocus(null); + // the audio focus request is async, so wait a bit to verify it had the expected effect + java.lang.Thread.sleep(WAIT_FOR_AUDIOFOCUS_LOSS_MS); + } + // verify there were 2 audio focus changes per iteration (one loss + one gain) + assertTrue("testAudioFocusListenerLifeCycle : observed " + + mAudioFocusListener.mFocusChangeCounter + " AudioFocus changes", + mAudioFocusListener.mFocusChangeCounter == ITERATIONS * 2); + mAudioManager.abandonAudioFocus(mAudioFocusListener); + mAudioManager.unregisterAudioFocusListener(mAudioFocusListener); + } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java index 3c8d05a..e788c17 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java @@ -353,6 +353,8 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr AudioEffect vc = null; MediaPlayer mp = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -411,6 +413,7 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr probe.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } @@ -425,6 +428,8 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr MediaPlayer mp = null; AudioEffect rvb = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -495,6 +500,7 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr probe.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java index 757bbc5..bc9c48d 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java @@ -198,6 +198,8 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi AudioEffect vc = null; MediaPlayer mp = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -254,6 +256,7 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi probe.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } @@ -268,6 +271,8 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi MediaPlayer mp = null; AudioEffect rvb = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -336,6 +341,7 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi probe.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java index e0cf51d..b0bf654 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java @@ -200,6 +200,8 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF AudioEffect vc = null; MediaPlayer mp = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -264,6 +266,7 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF vc.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } @@ -276,6 +279,8 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF AudioEffect vc = null; MediaPlayer mp = null; AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); + int ringerMode = am.getRingerMode(); + am.setRingerMode(AudioManager.RINGER_MODE_NORMAL); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), @@ -393,6 +398,7 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF vc.release(); } am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0); + am.setRingerMode(ringerMode); } assertTrue(msg, result); } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java index 80a3bcd..7dfab7d 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java @@ -82,7 +82,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H.263 QCIF. */ - // TODO : TC_TN_001 @LargeTest public void testThumbnailForH263QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -104,7 +103,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on MPEG4 VGA . */ - // TODO : TC_TN_002 @LargeTest public void testThumbnailForMPEG4VGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -124,7 +122,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on MPEG4 NTSC. */ - // TODO : TC_TN_003 @LargeTest public void testThumbnailForMPEG4NTSC() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -144,7 +141,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on MPEG4 WVGA. */ - // TODO : TC_TN_004 @LargeTest public void testThumbnailForMPEG4WVGA() throws Exception { @@ -165,7 +161,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on MPEG4 QCIF. */ - // TODO : TC_TN_005 @LargeTest public void testThumbnailForMPEG4QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -186,7 +181,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 QCIF. */ - // TODO : TC_TN_006 @LargeTest public void testThumbnailForH264QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -207,7 +201,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 VGA. */ - // TODO : TC_TN_007 @LargeTest public void testThumbnailForH264VGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -228,7 +221,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 WVGA. */ - // TODO : TC_TN_008 @LargeTest public void testThumbnailForH264WVGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -248,7 +240,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 854x480. */ - // TODO : TC_TN_009 @LargeTest public void testThumbnailForH264854_480() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -269,7 +260,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 960x720. */ - // TODO : TC_TN_010 @LargeTest public void testThumbnailForH264HD960() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -290,7 +280,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on H264 1080x720 . */ - // TODO : TC_TN_011 @LargeTest public void testThumbnailForH264HD1080() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -310,7 +299,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail / frame extraction precision at 0,100 and 200 ms */ - // TODO : TC_TN_012 @LargeTest public void testThumbnailForH264VGADifferentDuration() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -345,7 +333,6 @@ public class MediaItemThumbnailTest extends *Check the thumbnail / frame extraction precision at * FileDuration,FileDuration/2 + 100 andFileDuration/2 + 200 ms */ - // TODO : TC_TN_013 @LargeTest public void testThumbnailForMP4VGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -379,7 +366,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail / frame extraction on JPEG file */ - // TODO : TC_TN_014 @LargeTest public void testThumbnailForImage() throws Exception { final String imageItemFilename = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -402,7 +388,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H263 QCIF */ - // TODO : TC_TN_015 @LargeTest public void testThumbnailListH263QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -432,7 +417,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for MPEG4 QCIF */ - // TODO : TC_TN_016 @LargeTest public void testThumbnailListMPEG4QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -463,7 +447,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 VGA */ - // TODO : TC_TN_017 @LargeTest public void testThumbnailListH264VGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -492,7 +475,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 WVGA */ - // TODO : TC_TN_018 @LargeTest public void testThumbnailListH264WVGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -521,7 +503,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 VGA ,Time exceeding file duration */ - // TODO : TC_TN_019 @LargeTest public void testThumbnailH264VGAExceedingFileDuration() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -547,7 +528,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for VGA Image */ - // TODO : TC_TN_020 @LargeTest public void testThumbnailListVGAImage() throws Exception { final String imageItemFilename = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -576,7 +556,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for Invalid file path */ - // TODO : TC_TN_021 @LargeTest public void testThumbnailForInvalidFilePath() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "/sdcard/abc.jpg"; @@ -596,7 +575,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction with setBoundaries */ - // TODO : TC_TN_022 @LargeTest public void testThumbnailForMPEG4WVGAWithSetBoundaries() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -620,7 +598,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 WVGA with setExtractboundaries */ - // TODO : TC_TN_023 @LargeTest public void testThumbnailListForH264WVGAWithSetBoundaries() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -652,7 +629,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 WVGA with count > frame available */ - // TODO : TC_TN_024 @LargeTest public void testThumbnailListForH264WVGAWithCount() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -684,7 +660,6 @@ public class MediaItemThumbnailTest extends /** *To test ThumbnailList for H264 WVGA with startTime > End Time */ - // TODO : TC_TN_025 @LargeTest public void testThumbnailListH264WVGAWithStartGreaterEnd() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -710,9 +685,8 @@ public class MediaItemThumbnailTest extends } /** - *To test ThumbnailList TC_TN_026 for H264 WVGA with startTime = End Time + *To test ThumbnailList for H264 WVGA with startTime = End Time */ - // TODO : TC_TN_026 @LargeTest public void testThumbnailListH264WVGAWithStartEqualEnd() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -738,10 +712,9 @@ public class MediaItemThumbnailTest extends } /** - *To test ThumbnailList TC_TN_027 for file where video duration is less + *To test ThumbnailList for file where video duration is less * than file duration. */ - // TODO : TC_TN_027 @LargeTest public void testThumbnailForVideoDurationLessFileDuration() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -760,9 +733,8 @@ public class MediaItemThumbnailTest extends } /** - *To test ThumbnailList TC_TN_028 for file which has video part corrupted + *To test ThumbnailList for file which has video part corrupted */ - // TODO : TC_TN_028 @LargeTest public void testThumbnailWithCorruptedVideoPart() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -787,7 +759,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail / frame list extraction for Height as Negative Value */ - // TODO : TC_TN_029 @LargeTest public void testThumbnailWithNegativeHeight() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -815,7 +786,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail for Height as Zero */ - // TODO : TC_TN_030 @LargeTest public void testThumbnailWithHeightAsZero() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -839,7 +809,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail for Height = 10 */ - // TODO : TC_TN_031 @LargeTest public void testThumbnailWithHeight() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -859,7 +828,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail / frame list extraction for Width as Negative Value */ - // TODO : TC_TN_032 @LargeTest public void testThumbnailWithNegativeWidth() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -887,7 +855,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail / frame list extraction for Width zero */ - // TODO : TC_TN_033 @LargeTest public void testThumbnailWithWidthAsZero() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -911,7 +878,6 @@ public class MediaItemThumbnailTest extends /** * Check the thumbnail for Width = 10 */ - // TODO : TC_TN_034 @LargeTest public void testThumbnailWithWidth() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -931,7 +897,6 @@ public class MediaItemThumbnailTest extends /** * To test thumbnail / frame extraction on MPEG4 (time beyond file duration). */ - // TODO : TC_TN_035 @LargeTest public void testThumbnailMPEG4withMorethanFileDuration() throws Exception { final String videoItemFilename = INPUT_FILE_PATH diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java index e2f6863..34cf9f0 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java @@ -130,7 +130,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file MPEG4 854 x 480 */ - // TODO : Remove TC_MP_001 @LargeTest public void testPropertiesMPEG4854_480() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -163,7 +162,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file MPEG4 WVGA */ - // TODO : Remove TC_MP_002 @LargeTest public void testPropertiesMPEGWVGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -195,7 +193,6 @@ public class MediaPropertiesTest extends /** *To test media properties for MPEG4 720x480 (NTSC) + AAC file. */ - // TODO : Remove TC_MP_003 @LargeTest public void testPropertiesMPEGNTSC() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -227,7 +224,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file MPEG4 VGA */ - // TODO : Remove TC_MP_004 @LargeTest public void testPropertiesMPEGVGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -259,7 +255,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file MPEG4 QCIF */ - // TODO : Remove TC_MP_005 @LargeTest public void testPropertiesMPEGQCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -291,7 +286,6 @@ public class MediaPropertiesTest extends /** *To To test media properties for H263 176x144 (QCIF) + AAC (mono) file. */ - // TODO : Remove TC_MP_006 @LargeTest public void testPropertiesH263QCIF() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -322,7 +316,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file H264 VGA */ - // TODO : Remove TC_MP_007 @LargeTest public void testPropertiesH264VGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -353,7 +346,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file H264 NTSC */ - // TODO : Remove TC_MP_008 @LargeTest public void testPropertiesH264NTSC() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -385,7 +377,6 @@ public class MediaPropertiesTest extends /** *To test media properties for H264 800x480 (WVGA) + AAC file. */ - // TODO : Remove TC_MP_009 @LargeTest public void testPropertiesH264WVGA() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -417,7 +408,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file H264 HD1280 */ - // TODO : Remove TC_MP_010 @LargeTest public void testPropertiesH264HD1280() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -449,7 +439,6 @@ public class MediaPropertiesTest extends /** *To test media properties for H264 1080x720 + AAC file */ - // TODO : Remove TC_MP_011 @LargeTest public void testPropertiesH264HD1080WithAudio() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -481,7 +470,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file WMV - Unsupported type */ - // TODO : Remove TC_MP_012 @LargeTest public void testPropertiesWMVFile() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -506,7 +494,6 @@ public class MediaPropertiesTest extends /** *To test media properties for H.264 Main/Advanced profile. */ - // TODO : Remove TC_MP_013 @LargeTest public void testPropertiesH264MainLineProfile() throws Exception { final String videoItemFilename = INPUT_FILE_PATH @@ -539,7 +526,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for non existing file. */ - // TODO : Remove TC_MP_014 @LargeTest public void testPropertiesForNonExsitingFile() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + "abc.3gp"; @@ -559,7 +545,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file H264 HD1080 */ - // TODO : Remove TC_MP_015 @LargeTest public void testPropertiesH264HD1080WithoutAudio() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -591,7 +576,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for Image file of JPEG Type */ - // TODO : Remove TC_MP_016 @LargeTest public void testPropertiesVGAImage() throws Exception { final String imageItemFilename = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -611,7 +595,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for Image file of PNG Type */ - // TODO : Remove TC_MP_017 @LargeTest public void testPropertiesPNG() throws Exception { final String imageItemFilename = INPUT_FILE_PATH + "IMG_640x480.png"; @@ -630,7 +613,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file GIF - Unsupported type */ - // TODO : Remove TC_MP_018 @LargeTest public void testPropertiesGIFFile() throws Exception { @@ -651,7 +633,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file Text file named as 3GP */ - // TODO : Remove TC_MP_019 @LargeTest public void testPropertiesofDirtyFile() throws Exception { @@ -672,7 +653,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file name as NULL */ - // TODO : Remove TC_MP_020 @LargeTest public void testPropertieNULLFile() throws Exception { final String videoItemFilename = null; @@ -691,7 +671,6 @@ public class MediaPropertiesTest extends /** *To test Media Properties for file which is of type MPEG2 */ - // TODO : Remove TC_MP_021 @LargeTest public void testPropertiesMPEG2File() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -709,9 +688,8 @@ public class MediaPropertiesTest extends } /** - *To test Media Properties TC_MP_023 for file without Video only Audio + *To test Media Properties for file without Video only Audio */ - // TODO : Remove TC_MP_023 @LargeTest public void testProperties3GPWithoutVideoMediaItem() throws Exception { final String audioFilename = INPUT_FILE_PATH + @@ -731,7 +709,6 @@ public class MediaPropertiesTest extends /** *To test media properties for Audio Track file. (No Video, AAC Audio) */ - // TODO : Remove TC_MP_024 @LargeTest public void testProperties3GPWithoutVideoAudioTrack() throws Exception { @@ -753,7 +730,6 @@ public class MediaPropertiesTest extends /** *To test media properties for Audio Track file. MP3 file */ - // TODO : Remove TC_MP_025 @LargeTest public void testPropertiesMP3AudioTrack() throws Exception { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java index b32d865..6e520c3 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java @@ -88,7 +88,6 @@ public class VideoEditorAPITest extends /** * To Test Creation of Media Video Item. */ - // TODO : remove TC_API_001 @LargeTest public void testMediaVideoItem() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -130,7 +129,6 @@ public class VideoEditorAPITest extends * To test creation of Media Video Item with Set Extract Boundaries With Get * the Begin and End Time. */ - // TODO : remove TC_API_002 @LargeTest public void testMediaVideoItemExtractBoundaries() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -199,7 +197,6 @@ public class VideoEditorAPITest extends /** * To test creation of Media Video Item with Set and Get rendering Mode */ - // TODO : remove TC_API_003 @LargeTest public void testMediaVideoItemRenderingModes() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -238,12 +235,10 @@ public class VideoEditorAPITest extends mediaVideoItem1.getRenderingMode()); } - /** Test Case TC_API_004 is removed */ /** * To Test the Media Video API : Set Audio Volume, Get Audio Volume and Mute */ - // TODO : remove TC_API_005 @LargeTest public void testMediaVideoItemAudioFeatures() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -301,7 +296,6 @@ public class VideoEditorAPITest extends * extractAudioWaveFormData */ - // TODO : remove TC_API_006 @LargeTest public void testMediaVideoItemGetWaveformData() throws Exception { @@ -343,7 +337,6 @@ public class VideoEditorAPITest extends * To Test the Media Video API : Get Effect, GetAllEffects, remove Effect */ - // TODO : remove TC_API_007 @LargeTest public void testMediaVideoItemEffect() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -384,7 +377,6 @@ public class VideoEditorAPITest extends * To Test the Media Video API : Get Before and after transition */ - // TODO : remove TC_API_008 @LargeTest public void testMediaVideoItemTransitions() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -431,7 +423,6 @@ public class VideoEditorAPITest extends * */ - // TODO : remove TC_API_009 @LargeTest public void testMediaVideoItemOverlays() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -474,7 +465,6 @@ public class VideoEditorAPITest extends /** * To Test Creation of Media Image Item. */ - // TODO : remove TC_API_010 @LargeTest public void testMediaImageItem() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -511,7 +501,6 @@ public class VideoEditorAPITest extends /** * To Test the Media Image API : Get and Set rendering Mode */ - // TODO : remove TC_API_011 @LargeTest public void testMediaImageItemRenderingModes() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -554,7 +543,6 @@ public class VideoEditorAPITest extends /** * To Test the Media Image API : GetHeight and GetWidth */ - // TODO : remove TC_API_012 @LargeTest public void testMediaImageItemHeightWidth() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -576,7 +564,6 @@ public class VideoEditorAPITest extends /** * To Test the Media Image API : Scaled Height and Scaled GetWidth */ - // TODO : remove TC_API_013 @LargeTest public void testMediaImageItemScaledHeightWidth() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -597,7 +584,6 @@ public class VideoEditorAPITest extends * To Test the Media Image API : Get Effect, GetAllEffects, remove Effect */ - // TODO : remove TC_API_014 @LargeTest public void testMediaImageItemEffect() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -637,7 +623,6 @@ public class VideoEditorAPITest extends * To Test the Media Image API : Get Before and after transition */ - // TODO : remove TC_API_015 @LargeTest public void testMediaImageItemTransitions() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -685,7 +670,6 @@ public class VideoEditorAPITest extends * Overlay */ - // TODO : remove TC_API_016 @LargeTest public void testMediaImageItemOverlays() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -729,7 +713,6 @@ public class VideoEditorAPITest extends * To test creation of Audio Track */ - // TODO : remove TC_API_017 @LargeTest public void testAudioTrack() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -756,7 +739,6 @@ public class VideoEditorAPITest extends /** * To test creation of Audio Track with set extract boundaries */ - // TODO : remove TC_API_018 @LargeTest public void testAudioTrackExtractBoundaries() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -824,7 +806,6 @@ public class VideoEditorAPITest extends /** * To test creation of Audio Track with set Start Time and Get Time */ - // TODO : remove TC_API_019 @LargeTest public void testAudioTrackSetGetTime() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -840,7 +821,6 @@ public class VideoEditorAPITest extends /** * To Test the Audio Track API: Enable Ducking */ - // TODO : remove TC_API_020 @LargeTest public void testAudioTrackEnableDucking() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -910,7 +890,6 @@ public class VideoEditorAPITest extends /** * To Test the Audio Track API: Looping */ - // TODO : remove TC_API_021 @LargeTest public void testAudioTrackLooping() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -928,7 +907,6 @@ public class VideoEditorAPITest extends /** * To Test the Audio Track API:Extract waveform data */ - // TODO : remove TC_API_022 @LargeTest public void testAudioTrackWaveFormData() throws Exception { @@ -984,7 +962,6 @@ public class VideoEditorAPITest extends /** * To Test the Audio Track API: Mute */ - // TODO : remove TC_API_023 @LargeTest public void testAudioTrackMute() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -1001,7 +978,6 @@ public class VideoEditorAPITest extends /** * To Test the Audio Track API: Get Volume and Set Volume */ - // TODO : remove TC_API_024 @LargeTest public void testAudioTrackGetSetVolume() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -1042,7 +1018,6 @@ public class VideoEditorAPITest extends /** * To test Effect Color. */ - // TODO : remove TC_API_025 @LargeTest public void testAllEffects() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -1206,7 +1181,6 @@ public class VideoEditorAPITest extends /** * To test Effect Color : Set duration and Get Duration */ - // TODO : remove TC_API_026 @LargeTest public void testEffectSetgetDuration() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -1246,7 +1220,6 @@ public class VideoEditorAPITest extends /** * To test Effect Color : UNDEFINED color param value */ - // TODO : remove TC_API_027 @LargeTest public void testEffectUndefinedColorParam() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -1269,7 +1242,6 @@ public class VideoEditorAPITest extends /** * To test Effect Color : with Invalid StartTime and Duration */ - // TODO : remove TC_API_028 @LargeTest public void testEffectInvalidStartTimeAndDuration() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -1315,7 +1287,6 @@ public class VideoEditorAPITest extends /** * To test Effect : with NULL Media Item */ - // TODO : remove TC_API_034 @LargeTest public void testEffectNullMediaItem() throws Exception { boolean flagForException = false; @@ -1331,7 +1302,6 @@ public class VideoEditorAPITest extends /** * To test Effect : KenBurn Effect */ - // TODO : remove TC_API_035 @LargeTest public void testEffectKenBurn() throws Exception { // Test ken burn effect using a JPEG file. @@ -1375,7 +1345,6 @@ public class VideoEditorAPITest extends * To test KenBurnEffect : Set StartRect and EndRect */ - // TODO : remove TC_API_036 @LargeTest public void testEffectKenBurnSet() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -1443,7 +1412,6 @@ public class VideoEditorAPITest extends * SPEED_UP/SPEED_DOWN/LINEAR/MIDDLE_SLOW/MIDDLE_FAST */ - // TODO : remove TC_API_037 @LargeTest public void testTransitionFadeBlack() throws Exception { @@ -1591,7 +1559,6 @@ public class VideoEditorAPITest extends * SPEED_UP/SPEED_DOWN/LINEAR/MIDDLE_SLOW/MIDDLE_FAST */ - // TODO : remove TC_API_038 @LargeTest public void testTransitionCrossFade() throws Exception { @@ -1742,7 +1709,6 @@ public class VideoEditorAPITest extends * ,DIRECTION_BOTTOM_OUT_TOP_IN */ - // TODO : remove TC_API_039 @LargeTest public void testTransitionSliding() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + @@ -1932,7 +1898,6 @@ public class VideoEditorAPITest extends * SPEED_UP/SPEED_DOWN/LINEAR/MIDDLE_SLOW/MIDDLE_FAST */ - // TODO : remove TC_API_040 @LargeTest public void testTransitionAlpha() throws Exception { @@ -2111,7 +2076,6 @@ public class VideoEditorAPITest extends * To test Frame Overlay for Media Video Item */ - // TODO : remove TC_API_041 @LargeTest public void testFrameOverlayVideoItem() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + @@ -2147,7 +2111,6 @@ public class VideoEditorAPITest extends * Duration */ - // TODO : remove TC_API_042 @LargeTest public void testFrameOverlaySetAndGet() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + @@ -2193,7 +2156,6 @@ public class VideoEditorAPITest extends * Duration */ - // TODO : remove TC_API_043 @LargeTest public void testFrameOverlayInvalidTime() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + @@ -2242,7 +2204,6 @@ public class VideoEditorAPITest extends /** * To test Frame Overlay for Media Image Item */ - // TODO : remove TC_API_045 @LargeTest public void testFrameOverlayImageItem() throws Exception { final String imageItemFilename1 = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -2278,7 +2239,6 @@ public class VideoEditorAPITest extends * Duration */ - // TODO : remove TC_API_046 @LargeTest public void testFrameOverlaySetAndGetImage() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -2321,7 +2281,6 @@ public class VideoEditorAPITest extends * Duration */ - // TODO : remove TC_API_047 @LargeTest public void testFrameOverlayInvalidTimeImage() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -2370,7 +2329,6 @@ public class VideoEditorAPITest extends * To Test Frame Overlay Media Image Item :JPG File */ - // TODO : remove TC_API_048 @LargeTest public void testFrameOverlayJPGImage() throws Exception { @@ -2392,7 +2350,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_049 @LargeTest public void testVideoEditorAPI() throws Exception { @@ -2555,7 +2512,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_050 @LargeTest public void testVideoLessThanAudio() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH @@ -2583,7 +2539,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_051 @LargeTest public void testVideoContentHD() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH @@ -2609,7 +2564,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_052 @LargeTest public void testRemoveAudioTrack() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -2638,7 +2592,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_053 @LargeTest public void testAudioDuckingDisable() throws Exception { final String audioFileName = INPUT_FILE_PATH + @@ -2653,8 +2606,6 @@ public class VideoEditorAPITest extends } - // TODO : remove TC_API_054 - /** This test case is added with Test case ID TC_API_010 */ /** * To test: Need a basic test case for the get value for TransitionAlpha @@ -2662,7 +2613,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_055 @LargeTest public void testTransitionAlphaBasic() throws Exception { @@ -2700,7 +2650,6 @@ public class VideoEditorAPITest extends * * @throws Exception */ - // TODO : remove TC_API_056 @LargeTest public void testNullAPIs() throws Exception { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java index 57a1c75..69ecf0d 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java @@ -91,7 +91,6 @@ public class VideoEditorExportTest extends /** * To Test export : Merge and Trim different types of Video and Image files */ - // TODO :remove TC_EXP_001 @LargeTest public void testExportMergeTrim() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH @@ -173,7 +172,6 @@ public class VideoEditorExportTest extends /** *To Test export : With Effect and Overlays on Different Media Items */ - // TODO :remove TC_EXP_002 @LargeTest public void testExportEffectOverlay() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH @@ -301,7 +299,6 @@ public class VideoEditorExportTest extends /** * To test export : with Image with KenBurnEffect */ - // TODO : remove TC_EXP_003 @LargeTest public void testExportEffectKenBurn() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; @@ -359,7 +356,6 @@ public class VideoEditorExportTest extends /** * To Test Export : With Video and Image and An Audio BackGround Track */ - // TODO : remove TC_EXP_004 @LargeTest public void testExportAudio() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -420,7 +416,6 @@ public class VideoEditorExportTest extends /** *To Test export : With Transition on Different Media Items */ - // TODO :remove TC_EXP_005 @LargeTest public void testExportTransition() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH @@ -540,7 +535,6 @@ public class VideoEditorExportTest extends * * @throws Exception */ - // TODO :remove TC_EXP_006 @LargeTest public void testExportWithoutMediaItems() throws Exception { boolean flagForException = false; @@ -566,7 +560,6 @@ public class VideoEditorExportTest extends * * @throws Exception */ - // TODO :remove TC_EXP_007 @LargeTest public void testExportWithoutMediaItemsAddRemove() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH + @@ -621,7 +614,6 @@ public class VideoEditorExportTest extends * * @throws Exception */ - // TODO :remove TC_EXP_008 @LargeTest public void testExportMMS() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java index 4181903..7965b0a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java @@ -216,7 +216,6 @@ public class VideoEditorPreviewTest extends /** *To test Preview : FULL Preview of current work (beginning till end) */ - // TODO : remove TC_PRV_001 @LargeTest public void testPreviewTheStoryBoard() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH @@ -275,7 +274,6 @@ public class VideoEditorPreviewTest extends /** * To test Preview : Preview of start + 10 sec till end of story board */ - // TODO : remove TC_PRV_002 @LargeTest public void testPreviewTheStoryBoardFromDuration() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH @@ -336,7 +334,6 @@ public class VideoEditorPreviewTest extends /** * To test Preview : Preview of current Effects applied */ - // TODO : remove TC_PRV_003 @LargeTest public void testPreviewOfEffects() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -394,7 +391,6 @@ public class VideoEditorPreviewTest extends *To test Preview : Preview of current Transitions applied (with multiple * generatePreview) */ - // TODO : remove TC_PRV_004 @LargeTest public void testPreviewWithTransition() throws Exception { @@ -547,7 +543,6 @@ public class VideoEditorPreviewTest extends /** * To test Preview : Preview of current Overlay applied */ - // TODO : remove TC_PRV_005 @LargeTest public void testPreviewWithOverlay() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -601,7 +596,6 @@ public class VideoEditorPreviewTest extends * To test Preview : Preview of current Trim applied (with default aspect * ratio) */ - // TODO : remove TC_PRV_006 @LargeTest public void testPreviewWithTrim() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -625,7 +619,6 @@ public class VideoEditorPreviewTest extends * applied */ - // TODO : remove TC_PRV_007 @LargeTest public void testPreviewWithOverlayEffectKenBurn() throws Exception { @@ -684,7 +677,6 @@ public class VideoEditorPreviewTest extends /** *To test Preview : Export during preview */ - // TODO : remove TC_PRV_008 @LargeTest public void testPreviewDuringExport() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -765,7 +757,6 @@ public class VideoEditorPreviewTest extends * To test Preview : Preview of current Effects applied (with from time > * total duration) */ - // TODO : remove TC_PRV_009 @LargeTest public void testPreviewWithDurationGreaterThanMediaDuration() throws Exception { @@ -826,7 +817,6 @@ public class VideoEditorPreviewTest extends * To test Preview : Preview of current Effects applied (with Render Preview * Frame) */ - // TODO : remove TC_PRV_010 @LargeTest public void testPreviewWithRenderPreviewFrame() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -873,7 +863,6 @@ public class VideoEditorPreviewTest extends * To test Preview : Preview of current work from selected jump location * till end with Audio Track */ - // TODO : remove TC_PRV_011 @LargeTest public void testPreviewWithEndAudioTrack() throws Exception { final String imageItemFilename1 = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -917,7 +906,6 @@ public class VideoEditorPreviewTest extends /** * To test render Preview Frame */ - // TODO : remove TC_PRV_012 @LargeTest public void testRenderPreviewFrame() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH @@ -1031,7 +1019,6 @@ public class VideoEditorPreviewTest extends /** * To Test Preview : Without any Media Items in the story Board */ - // TODO : remove TC_PRV_013 @LargeTest public void testStartPreviewWithoutMediaItems() throws Exception { boolean flagForException = false; @@ -1064,7 +1051,6 @@ public class VideoEditorPreviewTest extends * To Test Preview : Add Media and Remove Media Item (Without any Media * Items in the story Board) */ - // TODO : remove TC_PRV_014 @LargeTest public void testStartPreviewAddRemoveMediaItems() throws Exception { final String videoItemFilename1 = INPUT_FILE_PATH @@ -1134,7 +1120,6 @@ public class VideoEditorPreviewTest extends * To test Preview : Preview of current Effects applied (with Render Preview * Frame) */ - // TODO : remove TC_PRV_015 @LargeTest public void testPreviewWithRenderPreviewFrameWithoutGenerate() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java index 3d0be4f..d15a535 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java @@ -196,7 +196,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_001 @LargeTest public void testPerformanceAddRemoveVideoItem() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -241,7 +240,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_002 @LargeTest public void testPerformanceAddRemoveImageItem() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_1600x1200.jpg"; @@ -280,7 +278,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_003 @LargeTest public void testPerformanceAddRemoveTransition() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -360,7 +357,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_004 @LargeTest public void testPerformanceExport() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -541,7 +537,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_005 @LargeTest public void testPerformanceThumbnailVideoItem() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -574,7 +569,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_006 @LargeTest public void testPerformanceOverlayVideoItem() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -629,7 +623,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_007 @LargeTest public void testPerformanceVideoItemProperties() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -688,7 +681,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_008 @LargeTest public void testPerformanceGeneratePreviewWithTransitions() throws Exception { @@ -740,7 +732,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_009 @LargeTest public void testPerformanceWithKenBurn() throws Exception { final String videoItemFileName = INPUT_FILE_PATH + @@ -795,7 +786,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_010 @LargeTest public void testPerformanceEffectOverlappingTransition() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -864,7 +854,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_011 @LargeTest public void testPerformanceTransitionWithEffectOverlapping() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -931,7 +920,6 @@ public class VideoEditorPerformance extends /** *To test ThumbnailList for H264 */ - // TODO : TC_PRF_12 @LargeTest public void testThumbnailH264NonIFrame() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -962,7 +950,6 @@ public class VideoEditorPerformance extends /** *To test ThumbnailList for H264 */ - // TODO : TC_PRF_13 @LargeTest public void testThumbnailH264AnIFrame() throws Exception { final String videoItemFilename = INPUT_FILE_PATH + @@ -996,7 +983,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_014 @LargeTest public void testPerformanceWithAudioTrack() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -1051,7 +1037,6 @@ public class VideoEditorPerformance extends * * @throws Exception */ - // TODO : remove PRF_015 @LargeTest public void testPerformanceAddRemoveImageItem640x480() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java index 4d30784..7784c7b 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java @@ -167,7 +167,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_001 @LargeTest public void testStressAddRemoveVideoItem() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -241,7 +240,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_002 @LargeTest public void testStressAddRemoveImageItem() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -310,7 +308,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_003 @LargeTest public void testStressAddRemoveTransition() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -428,7 +425,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_004 @LargeTest public void testStressAddRemoveOverlay() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -493,7 +489,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_005 @LargeTest public void testStressAddRemoveEffects() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -590,7 +585,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_006 @LargeTest public void testStressThumbnailVideoItem() throws Exception { final String videoItemFileName = INPUT_FILE_PATH @@ -651,7 +645,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_007 @LargeTest public void testStressMediaProperties() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -747,7 +740,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_008 @LargeTest public void testStressInsertMovieItems() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -759,7 +751,7 @@ public class VideoEditorStressTest "MPEG4_SP_640x480_15fps_1200kbps_AACLC_48khz_64kbps_m_1_17.3gp"; final String[] loggingInfo = new String[1]; int i = 0; - writeTestCaseHeader("testStressInsertMoveItems"); + writeTestCaseHeader("testStressInsertMovieItems"); final MediaVideoItem mediaItem1 = new MediaVideoItem(mVideoEditor, "m1", VideoItemFileName1, renderingMode); @@ -801,7 +793,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_009 @LargeTest public void testStressLoadAndSave() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -916,7 +907,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_010 @LargeTest public void testStressMultipleExport() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -1007,7 +997,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_011 @LargeTest public void testStressOverlayTransKenBurn() throws Exception { final int renderingMode = MediaItem.RENDERING_MODE_BLACK_BORDER; @@ -1094,7 +1083,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_012 @LargeTest public void testStressAudioTrackVideo() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -1147,7 +1135,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_013 @LargeTest public void testStressStoryBoard() throws Exception { final String videoItemFileName1 = INPUT_FILE_PATH + @@ -1237,7 +1224,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_014 @LargeTest public void testStressAudioTrackOnly() throws Exception { @@ -1267,7 +1253,6 @@ public class VideoEditorStressTest * * @throws Exception */ - // TODO : remove TC_STR_016 -- New Test Case @LargeTest public void testStressThumbnailImageItem() throws Exception { final String imageItemFileName = INPUT_FILE_PATH + "IMG_640x480.jpg"; diff --git a/media/tests/README.txt b/media/tests/README.txt new file mode 100644 index 0000000..e3e1639 --- /dev/null +++ b/media/tests/README.txt @@ -0,0 +1,10 @@ +MediaFrameworkTest/ + Uses instrumentation and so can be run with runtest. + It assumes /sdcard/media_api/ has been populated. + +contents/media_api/ + Push to /sdcard/media_api/ for use with MediaFrameworkTest: + adb shell mkdir /sdcard/media_api + adb push contents/media_api/ /sdcard/media_api/ + +All other subdirectories are manual tests or sample apps. diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 81c6167..025a131 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -26,6 +26,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libskia \ libstagefright \ + libstagefright_foundation \ libbinder \ libutils \ libjpeg diff --git a/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp b/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp index dfdf676..a25e854 100644 --- a/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp +++ b/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include <SkBitmap.h> #include "SkOmxPixelRef.h" @@ -32,7 +32,7 @@ SkOmxPixelRef::SkOmxPixelRef(SkColorTable* ctable, MediaBuffer* buffer, SkOmxPixelRef::~SkOmxPixelRef() { mBuffer->release(); - CHECK_EQ(mDecoder->stop(), OK); + CHECK_EQ(mDecoder->stop(), (status_t)OK); SkSafeUnref(mCTable); } diff --git a/media/tests/omxjpegdecoder/StreamSource.cpp b/media/tests/omxjpegdecoder/StreamSource.cpp index 5f44203..f764121a 100644 --- a/media/tests/omxjpegdecoder/StreamSource.cpp +++ b/media/tests/omxjpegdecoder/StreamSource.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include "StreamSource.h" diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index 42df66c..6424744 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -25,7 +25,7 @@ #include <binder/IServiceManager.h> #include <binder/ProcessState.h> #include <media/IMediaPlayerService.h> -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> @@ -89,7 +89,7 @@ static int64_t getNowUs() { OmxJpegImageDecoder::OmxJpegImageDecoder() { status_t err = mClient.connect(); - CHECK_EQ(err, OK); + CHECK_EQ(err, (status_t)OK); } OmxJpegImageDecoder::~OmxJpegImageDecoder() { @@ -152,7 +152,7 @@ bool OmxJpegImageDecoder::decodeSource(sp<MediaSource> decoder, int64_t duration = getNowUs() - startTime; if (err != OK) { - CHECK_EQ(buffer, NULL); + CHECK(buffer == NULL); } printf("Duration in decoder->read(): %.1f (msecs). \n", duration / 1E3 ); |