am 4207358d: am 3dd9bf1d: Merge "Revert "Create new ID3v2 metadata test""
* commit '4207358dba49c6f14de2a90cf133b3f08b204460':
Revert "Create new ID3v2 metadata test"
diff --git a/tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4 b/tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4
deleted file mode 100644
index 0902533..0000000
--- a/tests/tests/media/res/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index 286098a..da54171 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -80,41 +80,5 @@
} catch (IllegalArgumentException ex) {
// Expected, test passed.
}
-
- public void testID3v2Metadata() {
- MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-
- try {
- Resources resources = getContext().getResources();
- AssetFileDescriptor afd = resources.openRawResourceFd(
- R.raw.video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2);
-
- retriever.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
-
- afd.close();
- } catch (Exception e) {
- fail("Unable to open file");
- }
-
- assertEquals("Title was other than expected",
- "Title", retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE));
-
- assertEquals("Artist was other than expected",
- "UTF16LE エンディアン ",
- retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST));
-
- assertEquals("Album was other than expected",
- "Test album",
- retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUM));
-
- assertEquals("Track number was other than expected",
- "10",
- retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER));
-
- assertEquals("Year was other than expected",
- "2013", retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_YEAR));
-
- assertNull("Writer was unexpectedly present",
- retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_WRITER));
}
}