2 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 740a9ea388..a33bb58bab 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -355,6 +355,31 @@ void tst_QMimeDatabase::aliases()
     QVERIFY(!mustWriteMimeType);
 }
 
+void tst_QMimeDatabase::listAliases_data()
+{
+    QTest::addColumn<QString>("inputMime");
+    QTest::addColumn<QString>("expectedAliases");
+
+    QTest::newRow("csv") << "text/csv" << "text/x-csv,text/x-comma-separated-values";
+    QTest::newRow("xml") << "application/xml" << "text/xml";
+    QTest::newRow("xml2") << "text/xml" /* gets resolved to application/xml */ << "text/xml";
+    QTest::newRow("no_mime") << "message/news" << "";
+}
+
+void tst_QMimeDatabase::listAliases()
+{
+    QFETCH(QString, inputMime);
+    QFETCH(QString, expectedAliases);
+    QMimeDatabase db;
+    QStringList expectedAliasesList = expectedAliases.split(',', QString::SkipEmptyParts);
+    expectedAliasesList.sort();
+    QMimeType mime = db.mimeTypeForName(inputMime);
+    QVERIFY(mime.isValid());
+    QStringList aliasList = mime.aliases();
+    aliasList.sort();
+    QCOMPARE(aliasList, expectedAliasesList);
+}
+
 void tst_QMimeDatabase::icons()
 {
     QMimeDatabase db;
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
index 6db09e2078..7f620b0cf0 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
@@ -62,6 +62,8 @@ private slots:
     void mimeTypesForFileName();
     void inheritance();
     void aliases();
+    void listAliases_data();
+    void listAliases();
     void icons();
     void mimeTypeForFileWithContent();
     void mimeTypeForUrl();