[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2007-07-04 23:36:29
Message-ID: 1183592189.596207.16208.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 683565 by dfaure:

Fix KMimeType::extractKnownExtension bug (from kde3) found by aacid: it included \
trailing spaces due to the padding done internally in ksycoca.


 M  +1 -1      services/kmimetypefactory.cpp  
 M  +12 -2     tests/kmimetypetest.cpp  
 M  +1 -0      tests/kmimetypetest.h  


--- trunk/KDE/kdelibs/kdecore/services/kmimetypefactory.cpp #683564:683565
@@ -196,7 +196,7 @@
                 // don't return newMimeType - there may be an "other" pattern that
                 // matches best this file, like *.tar.bz
                 if (match)
-                    *match = "*."+pattern;
+                    *match = "*." + pattern.trimmed();
                 break; // but get out of the fast patterns
             }
             else
--- trunk/KDE/kdelibs/kdecore/tests/kmimetypetest.cpp #683564:683565
@@ -90,7 +90,7 @@
     KMimeType::Ptr s0 = KMimeType::mimeType("application/x-zerosize");
     QVERIFY( s0 );
     QCOMPARE( s0->name(), QString::fromLatin1("application/x-zerosize") );
-    qDebug("Comment is %s", qPrintable(s0->comment()) );
+    //qDebug("Comment is %s", qPrintable(s0->comment()) );
 
     KMimeType::Ptr s0Again = KMimeType::mimeType("application/x-zerosize");
     QCOMPARE(s0Again->name(), s0->name());
@@ -99,7 +99,7 @@
     KMimeType::Ptr s1 = KMimeType::mimeType("text/plain");
     QVERIFY( s1 );
     QCOMPARE( s1->name(), QString::fromLatin1("text/plain") );
-    qDebug("Comment is %s", qPrintable(s1->comment()) );
+    //qDebug("Comment is %s", qPrintable(s1->comment()) );
 
     KMimeType::Ptr krita = KMimeType::mimeType("application/x-krita");
     QVERIFY( krita );
@@ -511,6 +511,16 @@
     QCOMPARE( mime_pkcs7->patterns().join(","), QString() );
 }
 
+void KMimeTypeTest::testExtractKnownExtension()
+{
+    const QString pdf = KMimeType::extractKnownExtension("foo.pdf");
+    QCOMPARE(pdf, QString("pdf"));
+    const QString kpt = KMimeType::extractKnownExtension("kpresenter.foo.kpt");
+    QCOMPARE(kpt, QString("kpt"));
+    const QString tarbz2 = KMimeType::extractKnownExtension("foo.tar.bz2");
+    QCOMPARE(tarbz2, QString("tar.bz2"));
+}
+
 void KMimeTypeTest::testParseMagicFile_data()
 {
     //kDebug() << k_funcinfo << endl;
--- trunk/KDE/kdelibs/kdecore/tests/kmimetypetest.h #683564:683565
@@ -42,6 +42,7 @@
     void testHasServiceType1();
     void testHasServiceType2();
     void testPatterns();
+    void testExtractKnownExtension();
 
     void testParseMagicFile();
     void testParseMagicFile_data();


[prev in list] [next in list] [prev in thread] [next in thread]