summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-10 18:20:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-10 18:20:40 +0000
commit400d6125b6f9391e97dca870cf6504d893d9fe21 (patch)
tree5653377d3068711daebb90f1a82b1f6a5ccf28c6
parentb6f8156574db820bc5a94a5e2ca7b66f7635871f (diff)
parent4a1c27bd5a0a55d338181c0d591d6cad4d745fed (diff)
downloadlibcore-400d6125b6f9391e97dca870cf6504d893d9fe21.zip
libcore-400d6125b6f9391e97dca870cf6504d893d9fe21.tar.gz
libcore-400d6125b6f9391e97dca870cf6504d893d9fe21.tar.bz2
Merge "Regression test for video/x-matroska."
-rw-r--r--luni/src/test/java/libcore/net/MimeUtilsTest.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/luni/src/test/java/libcore/net/MimeUtilsTest.java b/luni/src/test/java/libcore/net/MimeUtilsTest.java
index 36476e9..2cc58e9 100644
--- a/luni/src/test/java/libcore/net/MimeUtilsTest.java
+++ b/luni/src/test/java/libcore/net/MimeUtilsTest.java
@@ -27,6 +27,12 @@ public class MimeUtilsTest extends TestCase {
assertEquals("flac", MimeUtils.guessExtensionFromMimeType("application/x-flac"));
}
+ // https://code.google.com/p/android/issues/detail?id=78909
+ public void test_78909() {
+ assertEquals("mka", MimeUtils.guessExtensionFromMimeType("audio/x-matroska"));
+ assertEquals("mkv", MimeUtils.guessExtensionFromMimeType("video/x-matroska"));
+ }
+
public void test_16978217() {
assertEquals("image/x-ms-bmp", MimeUtils.guessMimeTypeFromExtension("bmp"));
assertEquals("image/x-icon", MimeUtils.guessMimeTypeFromExtension("ico"));