3 commits - CMakeLists.txt tests/kcalconversiontest.h tests/testutils.h

Christian Mollekopf mollekopf at kolabsys.com
Sat Jan 26 02:26:43 CET 2013


 CMakeLists.txt             |    2 ++
 tests/kcalconversiontest.h |    1 -
 tests/testutils.h          |   26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 726c177a1ce0200714f7cffceb05493901ec1d68
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat Jan 26 02:25:56 2013 +0100

    That's not actually required.

diff --git a/tests/kcalconversiontest.h b/tests/kcalconversiontest.h
index f2a18b8..c58042d 100644
--- a/tests/kcalconversiontest.h
+++ b/tests/kcalconversiontest.h
@@ -20,7 +20,6 @@
 
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
-#include <boost/concept_check.hpp>
 
 class KCalConversionTest : public QObject
 {


commit 033f29cdc7f73719e406601d57fe60a17bd8876c
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat Jan 26 02:25:36 2013 +0100

    We require boost.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8dcdef..6e3de41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,8 @@ endif()
 
 find_package(SWIG)
 
+find_package(Boost REQUIRED)
+
 #Show summary of found libraries
 macro_display_feature_log()
 


commit d6e5f454e96bec7d9f67368f49bf44b46ed36c36
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat Jan 26 02:03:02 2013 +0100

    Having blocking stuff in automated tests isn't such a good idea, disable by default.

diff --git a/tests/testutils.h b/tests/testutils.h
index d61ec22..e7a71e1 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -53,20 +53,20 @@ void showDiff(const QString &expected, const QString &converted)
         kWarning() << "contents are the same";
         return;
     }
-    QTemporaryFile expectedFile("expectedFile");
-    QTemporaryFile convertedFile("convertedFile");
-    if (expectedFile.open() && convertedFile.open()) {
-        expectedFile.write(expected.toLatin1());
-        convertedFile.write(converted.toLatin1());
-        expectedFile.close();
-        convertedFile.close();
-        QProcess::execute("kompare", QStringList() << "-c" << expectedFile.fileName() << convertedFile.fileName());
-    } else {
-        kWarning() << "files are not open";
-    }
+    // QTemporaryFile expectedFile("expectedFile");
+    // QTemporaryFile convertedFile("convertedFile");
+    // if (expectedFile.open() && convertedFile.open()) {
+    //     expectedFile.write(expected.toLatin1());
+    //     convertedFile.write(converted.toLatin1());
+    //     expectedFile.close();
+    //     convertedFile.close();
+    //     QProcess::execute("kompare", QStringList() << "-c" << expectedFile.fileName() << convertedFile.fileName());
+    // } else {
+    //     kWarning() << "files are not open";
+    // }
     
-//     qDebug() << "EXPECTED: " << expected;
-//     qDebug() << "CONVERTED: " << converted;
+    qDebug() << "EXPECTED: " << expected;
+    qDebug() << "CONVERTED: " << converted;
 }
 
 KMime::Message::Ptr readMimeFile( const QString &fileName, bool &ok)





More information about the commits mailing list