From kde-commits  Sun Sep 26 13:25:17 2010
From: Tobias Koenig <tokoe () kde ! org>
Date: Sun, 26 Sep 2010 13:25:17 +0000
To: kde-commits
Subject: branches/KDE/4.5/kdepimlibs
Message-Id: <20100926132517.C3B1FAC88C () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128550716619018

SVN commit 1179906 by tokoe:

Merged revisions 1179520,1179533 via svnmerge from 
svn+ssh://tokoe@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1179520 | vkrause | 2010-09-25 20:44:37 +0200 (Sat, 25 Sep 2010) | 2 lines
  
  add a few more test cases for quote()
........
  r1179533 | vkrause | 2010-09-25 21:17:05 +0200 (Sat, 25 Sep 2010) | 2 lines
  
  add unit tests for join()
........


 _M            . (directory)  
 M  +23 -0     akonadi/tests/imapparsertest.cpp  
 M  +2 -0      akonadi/tests/imapparsertest.h  


--- branches/KDE/4.5/kdepimlibs/akonadi/tests/imapparsertest.cpp #1179905:1179906
@@ -280,6 +280,12 @@
   binaryEncoded += '\000';
   binaryEncoded += '"';
   QTest::newRow( "binary" ) << binaryNonEncoded << binaryEncoded;
+
+  QTest::newRow( "LF" ) << QByteArray( "\n" ) << QByteArray( "\"\\n\"" );
+  QTest::newRow( "CR" ) << QByteArray( "\r" ) << QByteArray( "\"\\r\"" );
+  QTest::newRow( "double quote" ) << QByteArray( "\"" ) << QByteArray( "\"\\\"\"" );
+  QTest::newRow( "mixed 1" ) << QByteArray( "a\nb\\c" ) << QByteArray( "\"a\\nb\\\\c\"" );
+  QTest::newRow( "mixed 2" ) << QByteArray( "\"a\rb\"" ) << QByteArray( "\"\\\"a\\rb\\\"\"" );
 }
 
 void ImapParserTest::testQuote()
@@ -548,4 +554,21 @@
   delete parser;
 }
 
+void ImapParserTest::testJoin_data()
+{
+  QTest::addColumn<QList<QByteArray> >( "list" );
+  QTest::addColumn<QByteArray>( "joined" );
+  QTest::newRow( "empty" ) << QList<QByteArray>() << QByteArray();
+  QTest::newRow( "one" ) << (QList<QByteArray>() << "abab") << QByteArray( "abab" );
+  QTest::newRow( "two" ) << (QList<QByteArray>() << "abab" << "cdcd") << QByteArray( "abab cdcd" );
+  QTest::newRow( "three" ) << (QList<QByteArray>() << "abab" << "cdcd" << "efef") << QByteArray( "abab cdcd efef" );
+}
+
+void ImapParserTest::testJoin()
+{
+  QFETCH( QList<QByteArray>, list );
+  QFETCH( QByteArray, joined );
+  QCOMPARE( ImapParser::join( list, " " ), joined );
+}
+
 #include "imapparsertest.moc"
--- branches/KDE/4.5/kdepimlibs/akonadi/tests/imapparsertest.h #1179905:1179906
@@ -42,6 +42,8 @@
     void testParseDateTime();
     void testBulkParser_data();
     void testBulkParser();
+    void testJoin_data();
+    void testJoin();
 };