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

Commit b2d17234 authored by Xia Wang's avatar Xia Wang Committed by Android (Google) Code Review
Browse files

Merge "Reorganize media framework functional tests. Group tests into... 

Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
parents 272101b3 db602850

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

+17 −18
Original line number Diff line number Diff line
@@ -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;

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

+1 −2
Original line number Diff line number Diff line
@@ -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 
    }



}

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+1 −2
Original line number Diff line number Diff line
@@ -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 
    }    

   

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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 
   }



}