[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Amarok] cd2626c: Make TestAmarok pass
From: Nikolaj Hald Nielsen <nhn () kde ! org>
Date: 2010-04-01 16:06:03
Message-ID: 201004011606.o31G6394021961 () kore ! kollide ! net
[Download RAW message or body]
commit cd2626c8daeaa486e8824c459df8ce15a9182702
Author: Nikolaj Hald Nielsen <nhn@kde.org>
Date: Thu Apr 1 18:16:53 2010 +0200
Make TestAmarok pass
diff --git a/src/core/support/Amarok.cpp b/src/core/support/Amarok.cpp
index b73ea39..f7de215 100644
--- a/src/core/support/Amarok.cpp
+++ b/src/core/support/Amarok.cpp
@@ -270,19 +270,19 @@ namespace Amarok
else
s.replace( '/', '_' ); // on windows we have to replace / instead
- for( int i = 0; i < s.length(); i++ )
- {
- QChar c = s[ i ];
- if( c < QChar(0x20) || c == QChar(0x7F) // 0x7F = 127 = DEL control \
character
- || c=='*' || c=='?' || c=='<' || c=='>'
- || c=='|' || c=='"' || c==':' )
- c = '_';
- else if( c == '[' )
- c = '(';
- else if ( c == ']' )
- c = ')';
- s[ i ] = c;
- }
+ for( int i = 0; i < s.length(); i++ )
+ {
+ QChar c = s[ i ];
+ if( c < QChar(0x20) || c == QChar(0x7F) // 0x7F = 127 = DEL control \
character + || c=='*' || c=='?' || c=='<' || c=='>'
+ || c=='|' || c=='"' || c==':' )
+ c = '_';
+ else if( c == '[' )
+ c = '(';
+ else if ( c == ']' )
+ c = ')';
+ s[ i ] = c;
+ }
/* beware of reserved device names */
uint len = s.length();
diff --git a/tests/TestAmarok.cpp b/tests/TestAmarok.cpp
index 3ca5abc..34cf11e 100644
--- a/tests/TestAmarok.cpp
+++ b/tests/TestAmarok.cpp
@@ -43,13 +43,13 @@ void TestAmarok::testAsciiPath()
QCOMPARE( Amarok::asciiPath( "" ), QString( "" ) );
QCOMPARE( Amarok::asciiPath( "/home/sven" ), QString( "/home/sven" ) );
- QCOMPARE( Amarok::asciiPath( "/äöü" ), QString( "/___" ) );
- QCOMPARE( Amarok::asciiPath( "/äöütest" ), QString( "/___test" ) );
- QCOMPARE( Amarok::asciiPath( "/äöü/test" ), QString( "/___/test" ) );
- QCOMPARE( Amarok::asciiPath( "/123/" ), QString( "/123/" ) );
- QCOMPARE( Amarok::asciiPath( "/.hidden" ), QString( "/.hidden" ) );
- QCOMPARE( Amarok::asciiPath( "/here be dragons" ), QString( "/here be dragons" ) \
);
- QCOMPARE( Amarok::asciiPath( "/!important/some%20stuff/what's this?" ), QString( \
"/!important/some%20stuff/what's this?" ) ); + QCOMPARE( Amarok::asciiPath( \
QString::fromUtf8( "/äöü" ) ), QString( "/___" ) ); + QCOMPARE( \
Amarok::asciiPath( QString::fromUtf8( "/äöütest" ) ), QString( "/___test" ) ); + \
QCOMPARE( Amarok::asciiPath( QString::fromUtf8( "/äöü/test" ) ), QString( \
"/___/test" ) ); + QCOMPARE( Amarok::asciiPath( QString::fromUtf8( "/123/" ) ), \
QString( "/123/" ) ); + QCOMPARE( Amarok::asciiPath( QString::fromUtf8( "/.hidden" \
) ), QString( "/.hidden" ) ); + QCOMPARE( Amarok::asciiPath( QString::fromUtf8( \
"/here be dragons" ) ), QString( "/here be dragons" ) ); + QCOMPARE( \
Amarok::asciiPath( QString::fromUtf8( "/!important/some%20stuff/what's this?" ) ), \
QString( "/!important/some%20stuff/what's this?" ) );
/* 0x7F = 127 = DEL control character, explicitly ok on *nix file systems */
QCOMPARE( Amarok::asciiPath( QString( "/abc" ) + QChar( 0x7F ) + ".1" ), \
QString( QString( "/abc" ) + QChar( 0x7F ) + ".1" ) ); @@ -70,28 +70,28 @@ void \
TestAmarok::testCleanPath()
QCOMPARE( Amarok::cleanPath( QString( "/\\.,-+" ) ), QString( "/\\.,-+" ) );
/* German */
- QCOMPARE( Amarok::cleanPath( QString( "äöüß" ) ), QString( "aeoeuess" ) );
- QCOMPARE( Amarok::cleanPath( QString( "ÄÖÜß" ) ), QString( "AeOeUess" ) ); \
// capital ß only exists in theory in the German language, but had been defined some \
time ago, iirc + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "äöüß" ) ), \
QString( "aeoeuess" ) ); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( \
"ÄÖÜß" ) ), QString( "AeOeUess" ) ); // capital ß only exists in theory in the \
German language, but had been defined some time ago, iirc
/* French */
- QCOMPARE( Amarok::cleanPath( QString( "á éèêô" ) ), QString( "aaeeeo" ) );
- QCOMPARE( Amarok::cleanPath( QString( "ÁÀÉÈÊÔ" ) ), QString( "AAEEEO" ) );
- QCOMPARE( Amarok::cleanPath( QString( "æ" ) ), QString( "ae" ) );
- QCOMPARE( Amarok::cleanPath( QString( "Æ" ) ), QString( "AE" ) );
+ QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "á éèêô" ) ), QString( \
"aaeeeo" ) ); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "ÁÀÉÈÊÔ" ) \
), QString( "AAEEEO" ) ); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "æ" ) \
), QString( "ae" ) ); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "Æ" ) ), \
QString( "AE" ) );
/* Czech and other east European languages */
- QCOMPARE( Amarok::cleanPath( QString( "çńǹýỳź" ) ), QString( "cnnyyz" ) \
);
- QCOMPARE( Amarok::cleanPath( QString( "ÇŃǸÝỲŹ" ) ), QString( "CNNYYZ" ) \
);
- QCOMPARE( Amarok::cleanPath( QString( "ěĺľôŕřůž" ) ), QString( \
"ellorruz" ) );
- QCOMPARE( Amarok::cleanPath( QString( "ÁČĎÉĚÍŇÓŘ ŤÚŮÝŽ" ) ), \
QString( "ACDEEINORSTUUYZ" ) ); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( \
"çńǹýỳź" ) ), QString( "cnnyyz" ) ); + QCOMPARE( Amarok::cleanPath( \
QString::fromUtf8( "ÇŃǸÝỲŹ" ) ), QString( "CNNYYZ" ) ); + QCOMPARE( \
Amarok::cleanPath( QString::fromUtf8( "ěĺľôŕřůž" ) ), QString( "ellorruz" ) \
); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "ÁČĎÉĚÍŇÓŘ \
ŤÚŮÝŽ" ) ), QString( "ACDEEINORSTUUYZ" ) );
/* Skandinavian languages */
- QCOMPARE( Amarok::cleanPath( QString( "åø" ) ), QString( "aoe" ) );
- QCOMPARE( Amarok::cleanPath( QString( "ÅØ" ) ), QString( "AOE" ) );
+ QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "åø" ) ), QString( "aoe" ) );
+ QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "ÅØ" ) ), QString( "AOE" ) );
/* Spanish */
- QCOMPARE( Amarok::cleanPath( QString( "ñóÿ" ) ), QString( "noy" ) );
- QCOMPARE( Amarok::cleanPath( QString( "ÑÓŸ" ) ), QString( "NOY" ) );
+ QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "ñóÿ" ) ), QString( "noy" ) \
); + QCOMPARE( Amarok::cleanPath( QString::fromUtf8( "ÑÓŸ" ) ), QString( "NOY" \
) );
/* add missing ones here */
}
@@ -147,8 +147,8 @@ void TestAmarok::testExtension()
QCOMPARE( Amarok::extension( "test.longextension" ), QString( "longextension" ) \
);
QCOMPARE( Amarok::extension( "test.long.extension" ), QString( "extension" ) );
QCOMPARE( Amarok::extension( "test.m" ), QString( "m" ) );
- QCOMPARE( Amarok::extension( "test.äöü" ), QString( "äöü" ) );
- QCOMPARE( Amarok::extension( "test.ÄÖÜ" ), QString( "äöü" ) );
+ QCOMPARE( Amarok::extension( QString::fromUtf8( "test.äöü" ) ), \
QString::fromUtf8( "äöü" ) ); + QCOMPARE( Amarok::extension( QString::fromUtf8( \
"test.ÄÖÜ" ) ), QString::fromUtf8( "äöü" ) ); QCOMPARE( Amarok::extension( \
"..test.mp3" ), QString( "mp3" ) ); QCOMPARE( Amarok::extension( "..te st.mp3" ), \
QString( "mp3" ) ); QCOMPARE( Amarok::extension( "..te st.m p3" ), QString( "m p3" ) \
); @@ -194,8 +194,8 @@ void TestAmarok::testManipulateThe()
Amarok::manipulateThe( teststring = "The Äöü", true );
QCOMPARE( teststring, QString( "Äöü, The" ) );
- Amarok::manipulateThe( teststring = "Äöü, The", false );
- QCOMPARE( teststring, QString( "The Äöü" ) );
+ Amarok::manipulateThe( teststring = QString::fromUtf8( "Äöü, The" ), false );
+ QCOMPARE( teststring, QString::fromUtf8( "The Äöü" ) );
}
void TestAmarok::testRecursiveUrlExpand()
@@ -219,9 +219,11 @@ void TestAmarok::testRecursiveUrlExpand()
QCOMPARE( resultList.size(), 2 ); // there are two files that are not playlists
QCOMPARE( resultList.at( 0 ).pathOrUrl(), url.pathOrUrl() + QString( \
"CMakeLists.txt" ) );
+
url = dataPath( "data/" );
resultList = Amarok::recursiveUrlExpand( url );
QCOMPARE( resultList.size(), 23 );
+ QVERIFY( resultList.contains( url.pathOrUrl() + QDir::toNativeSeparators( \
"cue/invalid.cue" ) ) );
QVERIFY( resultList.contains( url.pathOrUrl() + QDir::toNativeSeparators( \
"cue/test_silence.ogg" ) ) );
QVERIFY( resultList.contains( url.pathOrUrl() + QDir::toNativeSeparators( \
"cue/testsheet01-iso8859-1.cue" ) ) );
QVERIFY( resultList.contains( url.pathOrUrl() + QDir::toNativeSeparators( \
"cue/testsheet01-utf8.cue" ) ) ); @@ -294,7 +296,7 @@ void TestAmarok::testVfatPath()
QCOMPARE( Amarok::vfatPath( "! # $ % & ' ( ) - @ ^ _ ` { } ~" ), QString( "! # $ \
% & ' ( ) - @ ^ _ ` { } ~" ) );
/* only allowed in long file names */
- QCOMPARE( Amarok::vfatPath( "+,.;=[]" ), QString( "+,.;=[]" ) );
+ QCOMPARE( Amarok::vfatPath( "+,.;=[]" ), QString( "+,.;=()" ) );
/* illegal characters, without / and \ (see later tests) */
QCOMPARE( Amarok::vfatPath( "\"_*_:_<_>_?_|" ), QString( "_____________" ) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic