From kde-commits  Thu Oct 31 22:14:40 2013
From: Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date: Thu, 31 Oct 2013 22:14:40 +0000
To: kde-commits
Subject: [kdepim-runtime] resources/kolabproxy/tests: Fixed tests.
Message-Id: <E1Vc0Vk-0000KW-In () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138325768907611

Git commit 7908b90deebf282c3c389dbf81dc8b6f12045440 by Christian Mollekopf.
Committed on 31/10/2013 at 22:14.
Pushed by cmollekopf into branch 'master'.

Fixed tests.

folderTypeFromString is now part of libkolab and is therefore tested there.
It is therefore also necessary to link against it.

M  +1    -1    resources/kolabproxy/tests/CMakeLists.txt
M  +0    -12   resources/kolabproxy/tests/proxyintegrationtest.cpp

http://commits.kde.org/kdepim-runtime/7908b90deebf282c3c389dbf81dc8b6f12045=
440

diff --git a/resources/kolabproxy/tests/CMakeLists.txt b/resources/kolabpro=
xy/tests/CMakeLists.txt
index fbd2379..b04d0ea 100644
--- a/resources/kolabproxy/tests/CMakeLists.txt
+++ b/resources/kolabproxy/tests/CMakeLists.txt
@@ -27,7 +27,7 @@ macro(add_akonadi_isolated_test _source)
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   kde4_add_executable(${_name} TEST ${_test})
-  target_link_libraries(${_name} akonadi-kde akonadi-kmime ${QT_QTTEST_LIB=
RARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${AKONA=
DI_COMMON_LIBRARIES} kolabresourcetest)
+  target_link_libraries(${_name} ${Libkolab_LIBRARIES} akonadi-kde akonadi=
-kmime ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4=
_KDECORE_LIBS} ${AKONADI_COMMON_LIBRARIES} kolabresourcetest)
 =

   # based on kde4_add_unit_test
   if (WIN32)
diff --git a/resources/kolabproxy/tests/proxyintegrationtest.cpp b/resource=
s/kolabproxy/tests/proxyintegrationtest.cpp
index 6cb3263..eb57fa7 100644
--- a/resources/kolabproxy/tests/proxyintegrationtest.cpp
+++ b/resources/kolabproxy/tests/proxyintegrationtest.cpp
@@ -110,18 +110,6 @@ private slots:
         QCOMPARE(expectedCollections.size(), 0);
     }
 =

-    void ensureRecognizeNonMailFolder() {
-        QCOMPARE(Kolab::folderTypeFromString(KOLAB_FOLDER_TYPE_EVENT), Kol=
ab::EventType);
-        QCOMPARE(Kolab::folderTypeFromString(KOLAB_FOLDER_TYPE_EVENT KOLAB=
_FOLDER_TYPE_DEFAULT_SUFFIX), Kolab::EventType);
-        QCOMPARE(Kolab::folderTypeFromString(KOLAB_FOLDER_TYPE_TASK), Kola=
b::TaskType);
-        QCOMPARE(Kolab::folderTypeFromString(KOLAB_FOLDER_TYPE_JOURNAL), K=
olab::JournalType);
-        QCOMPARE(Kolab::folderTypeFromString(KOLAB_FOLDER_TYPE_NOTE), Kola=
b::NoteType);
-        QCOMPARE(Kolab::folderTypeFromString("freebusy"), Kolab::FreebusyT=
ype);
-        QCOMPARE(Kolab::folderTypeFromString("configuration"), Kolab::Conf=
igurationType);
-        QCOMPARE(Kolab::folderTypeFromString("file"), Kolab::FileType);
-    }
-
-
     /**
      * All kolab folders, if handled by kolab proxy or not, should receive=
 an entity hidden attribute
      */