[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime/frameworks] /: Rename to autotest. Reactivate code
From: Montel Laurent <montel () kde ! org>
Date: 2014-07-31 18:40:55
Message-ID: E1XCvHb-0002wx-8g () scm ! kde ! org
[Download RAW message or body]
Git commit a93e3e931f182d225e3c1f840e01d13a245958ce by Montel Laurent.
Committed on 31/07/2014 at 18:40.
Pushed by mlaurent into branch 'frameworks'.
Rename to autotest. Reactivate code
M +2 -2 agents/migration/CMakeLists.txt
R +0 -0 agents/migration/autotests/CMakeLists.txt [from: \
agents/migration/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
agents/migration/autotests/dummymigrator.cpp [from: \
agents/migration/tests/dummymigrator.cpp - 100% similarity] R +0 -0 \
agents/migration/autotests/dummymigrator.h [from: \
agents/migration/tests/dummymigrator.h - 100% similarity] R +0 -0 \
agents/migration/autotests/schedulertest.cpp [from: \
agents/migration/tests/schedulertest.cpp - 100% similarity] M +22 -0 \
resources/CMakeLists.txt M +1 -2 resources/ical/CMakeLists.txt
R +0 -0 resources/ical/autotests/CMakeLists.txt [from: \
resources/ical/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resources/ical/autotests/event.ical [from: resources/ical/tests/event.ical - 100% \
similarity] R +0 -0 resources/ical/autotests/ical-empty.xml [from: \
resources/ical/tests/ical-empty.xml - 100% similarity] R +0 -0 \
resources/ical/autotests/ical-step1.xml [from: resources/ical/tests/ical-step1.xml - \
100% similarity] R +0 -0 resources/ical/autotests/icaltest.es [from: \
resources/ical/tests/icaltest.es - 100% similarity] R +0 -0 \
resources/ical/autotests/task.ical [from: resources/ical/tests/task.ical - 100% \
similarity] M +1 -2 resources/maildir/CMakeLists.txt
R +7 -5 resources/maildir/autotests/CMakeLists.txt [from: \
resources/maildir/tests/CMakeLists.txt - 084% similarity] R +0 -0 \
resources/maildir/autotests/maildir-empty.xml [from: \
resources/maildir/tests/maildir-empty.xml - 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir-step1.xml [from: \
resources/maildir/tests/maildir-step1.xml - 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir-step2.xml [from: \
resources/maildir/tests/maildir-step2.xml - 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir.js [from: resources/maildir/tests/maildir.js - \
100% similarity] R +0 -0 resources/maildir/autotests/maildir.xml [from: \
resources/maildir/tests/maildir.xml - 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S \
[from: resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/new/.keep \
[from: resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/new/.keep \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep \
[from: resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S \
[from: resources/maildir/tests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S \
[from: resources/maildir/tests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/child1/new/.keep [from: \
resources/maildir/tests/maildir/.root.directory/child1/new/.keep - 100% similarity] R \
+0 -0 resources/maildir/autotests/maildir/.root.directory/child1/tmp/.keep \
[from: resources/maildir/tests/maildir/.root.directory/child1/tmp/.keep - 100% \
similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/child2/.keep [from: \
resources/maildir/tests/maildir/.root.directory/child2/.keep - 100% similarity] R +0 \
-0 resources/maildir/autotests/maildir/.root.directory/child2/cur/.keep [from: \
resources/maildir/tests/maildir/.root.directory/child2/cur/.keep - 100% similarity] R \
+0 -0 resources/maildir/autotests/maildir/.root.directory/child2/new/.keep \
[from: resources/maildir/tests/maildir/.root.directory/child2/new/.keep - 100% \
similarity] R +0 -0 \
resources/maildir/autotests/maildir/.root.directory/child2/tmp/.keep [from: \
resources/maildir/tests/maildir/.root.directory/child2/tmp/.keep - 100% similarity] R \
+0 -0 resources/maildir/autotests/maildir/root/cur/1237726845.6570.BejQg!2,S \
[from: resources/maildir/tests/maildir/root/cur/1237726845.6570.BejQg!2,S - 100% \
similarity] R +0 -0 resources/maildir/autotests/maildir/root/new/.keep [from: \
resources/maildir/tests/maildir/root/new/.keep - 100% similarity] R +0 -0 \
resources/maildir/autotests/maildir/root/tmp/.keep [from: \
resources/maildir/tests/maildir/root/tmp/.keep - 100% similarity] R +1 -1 \
resources/maildir/autotests/synctest.cpp [from: resources/maildir/tests/synctest.cpp \
- 098% similarity] R +1 -1 resources/maildir/autotests/synctest.h [from: \
resources/maildir/tests/synctest.h - 097% similarity] R +0 -0 \
resources/maildir/autotests/testmail.mbox [from: \
resources/maildir/tests/testmail.mbox - 100% similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/config.xml [from: \
resources/maildir/tests/unittestenv/config.xml - 100% similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
[from: resources/maildir/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc - \
100% similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc \
[from: resources/maildir/tests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc \
- 100% similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/kdehome/share/config/kdebugrc [from: \
resources/maildir/tests/unittestenv/kdehome/share/config/kdebugrc - 100% similarity] \
R +0 -0 resources/maildir/autotests/unittestenv/kdehome/share/config/kdedrc \
[from: resources/maildir/tests/unittestenv/kdehome/share/config/kdedrc - 100% \
similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/kdehome/share/config/kwalletrc [from: \
resources/maildir/tests/unittestenv/kdehome/share/config/kwalletrc - 100% similarity] \
R +0 -0 resources/maildir/autotests/unittestenv/kdehome/share/config/qttestrc \
[from: resources/maildir/tests/unittestenv/kdehome/share/config/qttestrc - 100% \
similarity] R +0 -0 \
resources/maildir/autotests/unittestenv/kdehome/testdata.xml [from: \
resources/maildir/tests/unittestenv/kdehome/testdata.xml - 100% similarity] R +0 \
-0 resources/maildir/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc \
[from: resources/maildir/tests/unittestenv/xdgconfig/akonadi/akonadiserverrc - 100% \
similarity] R +0 -0 resources/maildir/autotests/unittestenv/xdglocal/.keep \
[from: resources/maildir/tests/unittestenv/xdglocal/.keep - 100% similarity] M +1 \
-1 resources/maildir/libmaildir/CMakeLists.txt R +0 -0 \
resources/maildir/libmaildir/autotests/CMakeLists.txt [from: \
resources/maildir/libmaildir/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resources/maildir/libmaildir/autotests/testmaildir.cpp [from: \
resources/maildir/libmaildir/tests/testmaildir.cpp - 100% similarity] R +0 -0 \
resources/maildir/libmaildir/autotests/testmaildir.h [from: \
resources/maildir/libmaildir/tests/testmaildir.h - 100% similarity] M +1 -1 \
resources/mixedmaildir/CMakeLists.txt R +0 -0 \
resources/mixedmaildir/autotests/CMakeLists.txt [from: \
resources/mixedmaildir/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/collectioncreatetest.cpp [from: \
resources/mixedmaildir/tests/collectioncreatetest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/collectiondeletetest.cpp [from: \
resources/mixedmaildir/tests/collectiondeletetest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/collectionfetchtest.cpp [from: \
resources/mixedmaildir/tests/collectionfetchtest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/collectionmodifytest.cpp [from: \
resources/mixedmaildir/tests/collectionmodifytest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/collectionmovetest.cpp [from: \
resources/mixedmaildir/tests/collectionmovetest.cpp - 100% similarity] R +- -- \
resources/mixedmaildir/autotests/data/.dimap.index [from: \
resources/mixedmaildir/tests/data/.dimap.index - 100% similarity] R +- -- \
resources/mixedmaildir/autotests/data/.maildir-tagged.index [from: \
resources/mixedmaildir/tests/data/.maildir-tagged.index - 100% similarity] R +- \
-- resources/mixedmaildir/autotests/data/.maildir.index [from: \
resources/mixedmaildir/tests/data/.maildir.index - 100% similarity] R +- -- \
resources/mixedmaildir/autotests/data/.mbox-tagged.index [from: \
resources/mixedmaildir/tests/data/.mbox-tagged.index - 100% similarity] R +- -- \
resources/mixedmaildir/autotests/data/.mbox-unpurged.index [from: \
resources/mixedmaildir/tests/data/.mbox-unpurged.index - 100% similarity] R +- -- \
resources/mixedmaildir/autotests/data/.mbox.index [from: \
resources/mixedmaildir/tests/data/.mbox.index - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/README [from: \
resources/mixedmaildir/tests/data/README - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.LUBVK [from: \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.LUBVK - 100% similarity] \
R +0 -0 resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.RTmAd_2,S \
[from: resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.RTmAd_2,S - 100% \
similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.g8PCJ [from: \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.g8PCJ - 100% similarity] \
R +0 -0 resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.qs6V9_2,S \
[from: resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.qs6V9_2,S - 100% \
similarity] R +0 -0 resources/mixedmaildir/autotests/data/dimap/new/.keep \
[from: resources/mixedmaildir/tests/data/dimap/new/.keep - 100% similarity] R +0 \
-0 resources/mixedmaildir/autotests/data/dimap/tmp/.keep [from: \
resources/mixedmaildir/tests/data/dimap/tmp/.keep - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S \
[from: resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S \
- 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S \
[from: resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S \
- 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S \
[from: resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S \
- 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S \
[from: resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S \
- 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir-tagged/new/.keep [from: \
resources/mixedmaildir/tests/data/maildir-tagged/new/.keep - 100% similarity] R +0 \
-0 resources/mixedmaildir/autotests/data/maildir-tagged/tmp/.keep [from: \
resources/mixedmaildir/tests/data/maildir-tagged/tmp/.keep - 100% similarity] R +0 \
-0 resources/mixedmaildir/autotests/data/maildir/cur/1279979617.4595.bwXSm [from: \
resources/mixedmaildir/tests/data/maildir/cur/1279979617.4595.bwXSm - 100% \
similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.CStza_2,S [from: \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.CStza_2,S - 100% \
similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.DUl0I_2,S [from: \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.DUl0I_2,S - 100% \
similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.pY5ny [from: \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.pY5ny - 100% \
similarity] R +0 -0 resources/mixedmaildir/autotests/data/maildir/new/.keep \
[from: resources/mixedmaildir/tests/data/maildir/new/.keep - 100% similarity] R +0 \
-0 resources/mixedmaildir/autotests/data/maildir/tmp/.keep [from: \
resources/mixedmaildir/tests/data/maildir/tmp/.keep - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/mbox [from: \
resources/mixedmaildir/tests/data/mbox - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/mbox-tagged [from: \
resources/mixedmaildir/tests/data/mbox-tagged - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/data/mbox-unpurged [from: \
resources/mixedmaildir/tests/data/mbox-unpurged - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/itemcreatetest.cpp [from: \
resources/mixedmaildir/tests/itemcreatetest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/itemdeletetest.cpp [from: \
resources/mixedmaildir/tests/itemdeletetest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/itemfetchtest.cpp [from: \
resources/mixedmaildir/tests/itemfetchtest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/itemmodifytest.cpp [from: \
resources/mixedmaildir/tests/itemmodifytest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/itemmovetest.cpp [from: \
resources/mixedmaildir/tests/itemmovetest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/storecompacttest.cpp [from: \
resources/mixedmaildir/tests/storecompacttest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/templatemethodstest.cpp [from: \
resources/mixedmaildir/tests/templatemethodstest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/testdata.qrc [from: \
resources/mixedmaildir/tests/testdata.qrc - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/testdatatest.cpp [from: \
resources/mixedmaildir/tests/testdatatest.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/testdatautil.cpp [from: \
resources/mixedmaildir/tests/testdatautil.cpp - 100% similarity] R +0 -0 \
resources/mixedmaildir/autotests/testdatautil.h [from: \
resources/mixedmaildir/tests/testdatautil.h - 100% similarity] M +1 -1 \
resources/shared/CMakeLists.txt R +0 -0 \
resources/shared/autotests/CMakeLists.txt [from: \
resources/shared/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resources/shared/autotests/collectionannotationattributetest.cpp [from: \
resources/shared/tests/collectionannotationattributetest.cpp - 100% similarity] R +0 \
-0 resources/shared/autotests/imapaclattributetest.cpp [from: \
resources/shared/tests/imapaclattributetest.cpp - 100% similarity] M +1 -1 \
resources/shared/filestore/CMakeLists.txt R +0 -0 \
resources/shared/filestore/autotests/CMakeLists.txt [from: \
resources/shared/filestore/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resources/shared/filestore/autotests/abstractlocalstoretest.cpp [from: \
resources/shared/filestore/tests/abstractlocalstoretest.cpp - 100% similarity] M +1 \
-2 resources/vcard/CMakeLists.txt R +0 -0 \
resources/vcard/autotests/CMakeLists.txt [from: resources/vcard/tests/CMakeLists.txt \
- 100% similarity] R +0 -0 resources/vcard/autotests/vcardtest-readonly.js \
[from: resources/vcard/tests/vcardtest-readonly.js - 100% similarity] R +0 -0 \
resources/vcard/autotests/vcardtest-readonly.xml [from: \
resources/vcard/tests/vcardtest-readonly.xml - 100% similarity] R +0 -0 \
resources/vcard/autotests/vcardtest.js [from: resources/vcard/tests/vcardtest.js - \
100% similarity] R +0 -0 resources/vcard/autotests/vcardtest.vcf [from: \
resources/vcard/tests/vcardtest.vcf - 100% similarity] R +0 -0 \
M +1 -1 resourcetester/CMakeLists.txt
R +0 -0 resourcetester/autotests/CMakeLists.txt [from: \
resourcetester/tests/CMakeLists.txt - 100% similarity] R +0 -0 \
resourcetester/autotests/construct.es [from: resourcetester/tests/construct.es - 100% \
similarity] R +0 -0 resourcetester/autotests/unittestenv/config-mysql-db.xml \
[from: resourcetester/tests/unittestenv/config-mysql-db.xml - 100% similarity] R +0 \
-0 resourcetester/autotests/unittestenv/config.xml [from: \
resourcetester/tests/unittestenv/config.xml - 100% similarity] R +- -- \
resourcetester/autotests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl [from: \
resourcetester/tests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl - 100% \
similarity] R +0 -0 \
resourcetester/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc [from: \
resourcetester/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc - 100% \
similarity] R +0 -0 \
resourcetester/autotests/unittestenv/kdehome/share/config/kdebugrc [from: \
resourcetester/tests/unittestenv/kdehome/share/config/kdebugrc - 100% similarity] R \
+0 -0 resourcetester/autotests/unittestenv/kdehome/share/config/kdedrc [from: \
resourcetester/tests/unittestenv/kdehome/share/config/kdedrc - 100% similarity] R +0 \
-0 resourcetester/autotests/unittestenv/kdehome/share/config/kwalletrc [from: \
resourcetester/tests/unittestenv/kdehome/share/config/kwalletrc - 100% similarity] R \
+0 -0 resourcetester/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc \
[from: resourcetester/tests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc - \
100% similarity]
http://commits.kde.org/kdepim-runtime/a93e3e931f182d225e3c1f840e01d13a245958ce
diff --git a/agents/migration/CMakeLists.txt b/agents/migration/CMakeLists.txt
index ab76a11..247a33d 100644
--- a/agents/migration/CMakeLists.txt
+++ b/agents/migration/CMakeLists.txt
@@ -13,7 +13,7 @@ set(migrationagent_SRCS
migrationstatuswidget.cpp
migrationexecutor.cpp
migrationscheduler.cpp
- tests/dummymigrator.cpp
+ autotests/dummymigrator.cpp
)
add_executable(akonadi_migration_agent ${migrationagent_SRCS})
@@ -34,4 +34,4 @@ target_link_libraries(akonadi_migration_agent
install(TARGETS akonadi_migration_agent ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES migrationagent.desktop DESTINATION \
"${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
-add_subdirectory(tests)
+add_subdirectory(autotests)
diff --git a/agents/migration/tests/CMakeLists.txt \
b/agents/migration/autotests/CMakeLists.txt similarity index 100%
rename from agents/migration/tests/CMakeLists.txt
rename to agents/migration/autotests/CMakeLists.txt
diff --git a/agents/migration/tests/dummymigrator.cpp \
b/agents/migration/autotests/dummymigrator.cpp similarity index 100%
rename from agents/migration/tests/dummymigrator.cpp
rename to agents/migration/autotests/dummymigrator.cpp
diff --git a/agents/migration/tests/dummymigrator.h \
b/agents/migration/autotests/dummymigrator.h similarity index 100%
rename from agents/migration/tests/dummymigrator.h
rename to agents/migration/autotests/dummymigrator.h
diff --git a/agents/migration/tests/schedulertest.cpp \
b/agents/migration/autotests/schedulertest.cpp similarity index 100%
rename from agents/migration/tests/schedulertest.cpp
rename to agents/migration/autotests/schedulertest.cpp
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 86606ab..2149903 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -76,6 +76,28 @@ include_directories(
)
+# resource tests
+macro( akonadi_add_resourcetest _testname _script )
+ if ( ${EXECUTABLE_OUTPUT_PATH} )
+ set( _exepath ${EXECUTABLE_OUTPUT_PATH} )
+ else ()
+ set( _exepath ${kdepim-runtime_BINARY_DIR}/resourcetester )
+ endif ()
+ if (WIN32)
+ set(_resourcetester ${_exepath}/resourcetester.bat)
+ else ()
+ set(_resourcetester ${_exepath}/resourcetester)
+ endif ()
+ if (UNIX)
+ set(_resourcetester ${_resourcetester}.shell)
+ endif ()
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_script} \
${CMAKE_CURRENT_BINARY_DIR}/${_script} COPYONLY) + if (KDEPIM_RUN_ISOLATED_TESTS)
+ add_test( akonadi-mysql-db-${_testname} akonaditest -c \
${kdepim-runtime_SOURCE_DIR}/resourcetester/tests/unittestenv/config-mysql-db.xml \
${_resourcetester} -c ${CMAKE_CURRENT_BINARY_DIR}/${_script} ) + endif ()
+endmacro( akonadi_add_resourcetest )
+
+
#add_definitions( -DQT_NO_CAST_FROM_ASCII )
#add_definitions( -DQT_NO_CAST_TO_ASCII )
diff --git a/resources/ical/CMakeLists.txt b/resources/ical/CMakeLists.txt
index 8185f02..81ad51a 100644
--- a/resources/ical/CMakeLists.txt
+++ b/resources/ical/CMakeLists.txt
@@ -9,8 +9,7 @@ include_directories(
add_subdirectory( wizard )
add_subdirectory( notes )
-#REACTIVATE IT
-#add_subdirectory( tests )
+add_subdirectory( autotests )
########### next target ###############
add_definitions( -DSETTINGS_NAMESPACE=Akonadi_ICal_Resource )
diff --git a/resources/ical/tests/CMakeLists.txt \
b/resources/ical/autotests/CMakeLists.txt similarity index 100%
rename from resources/ical/tests/CMakeLists.txt
rename to resources/ical/autotests/CMakeLists.txt
diff --git a/resources/ical/tests/event.ical b/resources/ical/autotests/event.ical
similarity index 100%
rename from resources/ical/tests/event.ical
rename to resources/ical/autotests/event.ical
diff --git a/resources/ical/tests/ical-empty.xml \
b/resources/ical/autotests/ical-empty.xml similarity index 100%
rename from resources/ical/tests/ical-empty.xml
rename to resources/ical/autotests/ical-empty.xml
diff --git a/resources/ical/tests/ical-step1.xml \
b/resources/ical/autotests/ical-step1.xml similarity index 100%
rename from resources/ical/tests/ical-step1.xml
rename to resources/ical/autotests/ical-step1.xml
diff --git a/resources/ical/tests/icaltest.es b/resources/ical/autotests/icaltest.es
similarity index 100%
rename from resources/ical/tests/icaltest.es
rename to resources/ical/autotests/icaltest.es
diff --git a/resources/ical/tests/task.ical b/resources/ical/autotests/task.ical
similarity index 100%
rename from resources/ical/tests/task.ical
rename to resources/ical/autotests/task.ical
diff --git a/resources/maildir/CMakeLists.txt b/resources/maildir/CMakeLists.txt
index a472b01..854ea48 100644
--- a/resources/maildir/CMakeLists.txt
+++ b/resources/maildir/CMakeLists.txt
@@ -5,8 +5,7 @@ include_directories(
)
-#reactivate it
-#add_subdirectory( tests )
+add_subdirectory( autotests )
add_subdirectory( wizard )
# maildir access library
diff --git a/resources/maildir/tests/CMakeLists.txt \
b/resources/maildir/autotests/CMakeLists.txt similarity index 84%
rename from resources/maildir/tests/CMakeLists.txt
rename to resources/maildir/autotests/CMakeLists.txt
index 8f25db5..daa2f0c 100644
--- a/resources/maildir/tests/CMakeLists.txt
+++ b/resources/maildir/autotests/CMakeLists.txt
@@ -1,3 +1,7 @@
+include(ECMMarkAsTest)
+
+find_package(Qt5Test CONFIG REQUIRED)
+
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
# Stolen from kdepimlibs/akonadi/tests
@@ -5,17 +9,15 @@ macro(add_akonadi_isolated_test _source)
get_filename_component(_targetName ${_source} NAME_WE)
set(_srcList ${_source} )
- add_executable(${_targetName} TEST ${_srcList})
+ add_executable(${_targetName} ${_srcList})
+ add_test( ${_targetName} ${_targetName} )
+ ecm_mark_as_test(${_targetName})
target_link_libraries(${_targetName}
Qt5::Test
-
KF5::AkonadiCore
KF5::AkonadiMime
-
KF5::MailTransport
KF5::Mime
-
-
)
# based on kde4_add_unit_test
diff --git a/resources/maildir/tests/maildir-empty.xml \
b/resources/maildir/autotests/maildir-empty.xml similarity index 100%
rename from resources/maildir/tests/maildir-empty.xml
rename to resources/maildir/autotests/maildir-empty.xml
diff --git a/resources/maildir/tests/maildir-step1.xml \
b/resources/maildir/autotests/maildir-step1.xml similarity index 100%
rename from resources/maildir/tests/maildir-step1.xml
rename to resources/maildir/autotests/maildir-step1.xml
diff --git a/resources/maildir/tests/maildir-step2.xml \
b/resources/maildir/autotests/maildir-step2.xml similarity index 100%
rename from resources/maildir/tests/maildir-step2.xml
rename to resources/maildir/autotests/maildir-step2.xml
diff --git a/resources/maildir/tests/maildir.js \
b/resources/maildir/autotests/maildir.js similarity index 100%
rename from resources/maildir/tests/maildir.js
rename to resources/maildir/autotests/maildir.js
diff --git a/resources/maildir/tests/maildir.xml \
b/resources/maildir/autotests/maildir.xml similarity index 100%
rename from resources/maildir/tests/maildir.xml
rename to resources/maildir/autotests/maildir.xml
diff --git a/resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S \
b/resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S
similarity index 100%
rename from resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S
rename to resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/cur/1237726881.6570.rfoxg!2,S
diff --git a/resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/new/.keep \
b/resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/new/.keep
similarity index 100%
rename from resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/new/.keep
rename to resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/new/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep \
b/resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep
similarity index 100%
rename from resources/maildir/tests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep
rename to resources/maildir/autotests/maildir/.root.directory/.child1.directory/grandchild/tmp/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S \
b/resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S
similarity index 100%
rename from resources/maildir/tests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S
rename to resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726858.6570.dtdn4!2,S
diff --git a/resources/maildir/tests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S \
b/resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S
similarity index 100%
rename from resources/maildir/tests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S
rename to resources/maildir/autotests/maildir/.root.directory/child1/cur/1237726875.6570.R4KOW!2,S
diff --git a/resources/maildir/tests/maildir/.root.directory/child1/new/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child1/new/.keep similarity \
index 100% rename from \
resources/maildir/tests/maildir/.root.directory/child1/new/.keep rename to \
resources/maildir/autotests/maildir/.root.directory/child1/new/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child1/tmp/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child1/tmp/.keep similarity \
index 100% rename from \
resources/maildir/tests/maildir/.root.directory/child1/tmp/.keep rename to \
resources/maildir/autotests/maildir/.root.directory/child1/tmp/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child2/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child2/.keep similarity index \
100% rename from resources/maildir/tests/maildir/.root.directory/child2/.keep
rename to resources/maildir/autotests/maildir/.root.directory/child2/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child2/cur/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child2/cur/.keep similarity \
index 100% rename from \
resources/maildir/tests/maildir/.root.directory/child2/cur/.keep rename to \
resources/maildir/autotests/maildir/.root.directory/child2/cur/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child2/new/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child2/new/.keep similarity \
index 100% rename from \
resources/maildir/tests/maildir/.root.directory/child2/new/.keep rename to \
resources/maildir/autotests/maildir/.root.directory/child2/new/.keep
diff --git a/resources/maildir/tests/maildir/.root.directory/child2/tmp/.keep \
b/resources/maildir/autotests/maildir/.root.directory/child2/tmp/.keep similarity \
index 100% rename from \
resources/maildir/tests/maildir/.root.directory/child2/tmp/.keep rename to \
resources/maildir/autotests/maildir/.root.directory/child2/tmp/.keep
diff --git a/resources/maildir/tests/maildir/root/cur/1237726845.6570.BejQg!2,S \
b/resources/maildir/autotests/maildir/root/cur/1237726845.6570.BejQg!2,S similarity \
index 100% rename from \
resources/maildir/tests/maildir/root/cur/1237726845.6570.BejQg!2,S rename to \
resources/maildir/autotests/maildir/root/cur/1237726845.6570.BejQg!2,S
diff --git a/resources/maildir/tests/maildir/root/new/.keep \
b/resources/maildir/autotests/maildir/root/new/.keep similarity index 100%
rename from resources/maildir/tests/maildir/root/new/.keep
rename to resources/maildir/autotests/maildir/root/new/.keep
diff --git a/resources/maildir/tests/maildir/root/tmp/.keep \
b/resources/maildir/autotests/maildir/root/tmp/.keep similarity index 100%
rename from resources/maildir/tests/maildir/root/tmp/.keep
rename to resources/maildir/autotests/maildir/root/tmp/.keep
diff --git a/resources/maildir/tests/synctest.cpp \
b/resources/maildir/autotests/synctest.cpp similarity index 98%
rename from resources/maildir/tests/synctest.cpp
rename to resources/maildir/autotests/synctest.cpp
index 504d8a7..ad448ec 100644
--- a/resources/maildir/tests/synctest.cpp
+++ b/resources/maildir/autotests/synctest.cpp
@@ -58,5 +58,5 @@ void SyncTest::testSync()
}
}
-QTEST_AKONADIMAIN( SyncTest, NoGUI )
+QTEST_AKONADIMAIN( SyncTest )
diff --git a/resources/maildir/tests/synctest.h \
b/resources/maildir/autotests/synctest.h similarity index 97%
rename from resources/maildir/tests/synctest.h
rename to resources/maildir/autotests/synctest.h
index 4019ff5..9d73b29 100644
--- a/resources/maildir/tests/synctest.h
+++ b/resources/maildir/autotests/synctest.h
@@ -22,7 +22,7 @@
#include <QtCore/QObject>
-#include <Akonadi/Collection>
+#include <AkonadiCore/Collection>
/**
This syncs the resource again and again, watching out for "lost"
diff --git a/resources/maildir/tests/testmail.mbox \
b/resources/maildir/autotests/testmail.mbox similarity index 100%
rename from resources/maildir/tests/testmail.mbox
rename to resources/maildir/autotests/testmail.mbox
diff --git a/resources/maildir/tests/unittestenv/config.xml \
b/resources/maildir/autotests/unittestenv/config.xml similarity index 100%
rename from resources/maildir/tests/unittestenv/config.xml
rename to resources/maildir/autotests/unittestenv/config.xml
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
similarity index 100% rename from \
resources/maildir/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc rename to \
resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc
similarity index 100%
rename from resources/maildir/tests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc
rename to resources/maildir/autotests/unittestenv/kdehome/share/config/akonadi_maildir_resource_0rc
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/kdebugrc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/kdebugrc similarity \
index 100% rename from \
resources/maildir/tests/unittestenv/kdehome/share/config/kdebugrc rename to \
resources/maildir/autotests/unittestenv/kdehome/share/config/kdebugrc
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/kdedrc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/kdedrc similarity \
index 100% rename from \
resources/maildir/tests/unittestenv/kdehome/share/config/kdedrc rename to \
resources/maildir/autotests/unittestenv/kdehome/share/config/kdedrc
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/kwalletrc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/kwalletrc similarity \
index 100% rename from \
resources/maildir/tests/unittestenv/kdehome/share/config/kwalletrc rename to \
resources/maildir/autotests/unittestenv/kdehome/share/config/kwalletrc
diff --git a/resources/maildir/tests/unittestenv/kdehome/share/config/qttestrc \
b/resources/maildir/autotests/unittestenv/kdehome/share/config/qttestrc similarity \
index 100% rename from \
resources/maildir/tests/unittestenv/kdehome/share/config/qttestrc rename to \
resources/maildir/autotests/unittestenv/kdehome/share/config/qttestrc
diff --git a/resources/maildir/tests/unittestenv/kdehome/testdata.xml \
b/resources/maildir/autotests/unittestenv/kdehome/testdata.xml similarity index 100%
rename from resources/maildir/tests/unittestenv/kdehome/testdata.xml
rename to resources/maildir/autotests/unittestenv/kdehome/testdata.xml
diff --git a/resources/maildir/tests/unittestenv/xdgconfig/akonadi/akonadiserverrc \
b/resources/maildir/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc \
similarity index 100% rename from \
resources/maildir/tests/unittestenv/xdgconfig/akonadi/akonadiserverrc rename to \
resources/maildir/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc
diff --git a/resources/maildir/tests/unittestenv/xdglocal/.keep \
b/resources/maildir/autotests/unittestenv/xdglocal/.keep similarity index 100%
rename from resources/maildir/tests/unittestenv/xdglocal/.keep
rename to resources/maildir/autotests/unittestenv/xdglocal/.keep
diff --git a/resources/maildir/libmaildir/CMakeLists.txt \
b/resources/maildir/libmaildir/CMakeLists.txt index e980fd7..d7d874e 100644
--- a/resources/maildir/libmaildir/CMakeLists.txt
+++ b/resources/maildir/libmaildir/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory( tests )
+add_subdirectory( autotests )
set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
diff --git a/resources/maildir/libmaildir/tests/CMakeLists.txt \
b/resources/maildir/libmaildir/autotests/CMakeLists.txt similarity index 100%
rename from resources/maildir/libmaildir/tests/CMakeLists.txt
rename to resources/maildir/libmaildir/autotests/CMakeLists.txt
diff --git a/resources/maildir/libmaildir/tests/testmaildir.cpp \
b/resources/maildir/libmaildir/autotests/testmaildir.cpp similarity index 100%
rename from resources/maildir/libmaildir/tests/testmaildir.cpp
rename to resources/maildir/libmaildir/autotests/testmaildir.cpp
diff --git a/resources/maildir/libmaildir/tests/testmaildir.h \
b/resources/maildir/libmaildir/autotests/testmaildir.h similarity index 100%
rename from resources/maildir/libmaildir/tests/testmaildir.h
rename to resources/maildir/libmaildir/autotests/testmaildir.h
diff --git a/resources/mixedmaildir/CMakeLists.txt \
b/resources/mixedmaildir/CMakeLists.txt index 8c3f1c3..8b4fb6b 100644
--- a/resources/mixedmaildir/CMakeLists.txt
+++ b/resources/mixedmaildir/CMakeLists.txt
@@ -65,5 +65,5 @@ install(FILES \
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.MixedMaildir.Settings.
# unit tests
if (KDE4_BUILD_TESTS)
- add_subdirectory( tests )
+ add_subdirectory( autotests )
endif ()
diff --git a/resources/mixedmaildir/tests/CMakeLists.txt \
b/resources/mixedmaildir/autotests/CMakeLists.txt similarity index 100%
rename from resources/mixedmaildir/tests/CMakeLists.txt
rename to resources/mixedmaildir/autotests/CMakeLists.txt
diff --git a/resources/mixedmaildir/tests/collectioncreatetest.cpp \
b/resources/mixedmaildir/autotests/collectioncreatetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/collectioncreatetest.cpp
rename to resources/mixedmaildir/autotests/collectioncreatetest.cpp
diff --git a/resources/mixedmaildir/tests/collectiondeletetest.cpp \
b/resources/mixedmaildir/autotests/collectiondeletetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/collectiondeletetest.cpp
rename to resources/mixedmaildir/autotests/collectiondeletetest.cpp
diff --git a/resources/mixedmaildir/tests/collectionfetchtest.cpp \
b/resources/mixedmaildir/autotests/collectionfetchtest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/collectionfetchtest.cpp
rename to resources/mixedmaildir/autotests/collectionfetchtest.cpp
diff --git a/resources/mixedmaildir/tests/collectionmodifytest.cpp \
b/resources/mixedmaildir/autotests/collectionmodifytest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/collectionmodifytest.cpp
rename to resources/mixedmaildir/autotests/collectionmodifytest.cpp
diff --git a/resources/mixedmaildir/tests/collectionmovetest.cpp \
b/resources/mixedmaildir/autotests/collectionmovetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/collectionmovetest.cpp
rename to resources/mixedmaildir/autotests/collectionmovetest.cpp
diff --git a/resources/mixedmaildir/tests/data/.dimap.index \
b/resources/mixedmaildir/autotests/data/.dimap.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.dimap.index
rename to resources/mixedmaildir/autotests/data/.dimap.index
diff --git a/resources/mixedmaildir/tests/data/.maildir-tagged.index \
b/resources/mixedmaildir/autotests/data/.maildir-tagged.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.maildir-tagged.index
rename to resources/mixedmaildir/autotests/data/.maildir-tagged.index
diff --git a/resources/mixedmaildir/tests/data/.maildir.index \
b/resources/mixedmaildir/autotests/data/.maildir.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.maildir.index
rename to resources/mixedmaildir/autotests/data/.maildir.index
diff --git a/resources/mixedmaildir/tests/data/.mbox-tagged.index \
b/resources/mixedmaildir/autotests/data/.mbox-tagged.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.mbox-tagged.index
rename to resources/mixedmaildir/autotests/data/.mbox-tagged.index
diff --git a/resources/mixedmaildir/tests/data/.mbox-unpurged.index \
b/resources/mixedmaildir/autotests/data/.mbox-unpurged.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.mbox-unpurged.index
rename to resources/mixedmaildir/autotests/data/.mbox-unpurged.index
diff --git a/resources/mixedmaildir/tests/data/.mbox.index \
b/resources/mixedmaildir/autotests/data/.mbox.index similarity index 100%
rename from resources/mixedmaildir/tests/data/.mbox.index
rename to resources/mixedmaildir/autotests/data/.mbox.index
diff --git a/resources/mixedmaildir/tests/data/README \
b/resources/mixedmaildir/autotests/data/README similarity index 100%
rename from resources/mixedmaildir/tests/data/README
rename to resources/mixedmaildir/autotests/data/README
diff --git a/resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.LUBVK \
b/resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.LUBVK similarity \
index 100% rename from \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.LUBVK rename to \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.LUBVK
diff --git a/resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.RTmAd_2,S \
b/resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.RTmAd_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.RTmAd_2,S rename to \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.RTmAd_2,S
diff --git a/resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.g8PCJ \
b/resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.g8PCJ similarity \
index 100% rename from \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.g8PCJ rename to \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.g8PCJ
diff --git a/resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.qs6V9_2,S \
b/resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.qs6V9_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/dimap/cur/1279980064.4595.qs6V9_2,S rename to \
resources/mixedmaildir/autotests/data/dimap/cur/1279980064.4595.qs6V9_2,S
diff --git a/resources/mixedmaildir/tests/data/dimap/new/.keep \
b/resources/mixedmaildir/autotests/data/dimap/new/.keep similarity index 100%
rename from resources/mixedmaildir/tests/data/dimap/new/.keep
rename to resources/mixedmaildir/autotests/data/dimap/new/.keep
diff --git a/resources/mixedmaildir/tests/data/dimap/tmp/.keep \
b/resources/mixedmaildir/autotests/data/dimap/tmp/.keep similarity index 100%
rename from resources/mixedmaildir/tests/data/dimap/tmp/.keep
rename to resources/mixedmaildir/autotests/data/dimap/tmp/.keep
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S \
b/resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S \
rename to resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.6qZsA_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S \
b/resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S \
rename to resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.Xdz3R_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S \
b/resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S \
rename to resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.f0l49_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S \
b/resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S \
rename to resources/mixedmaildir/autotests/data/maildir-tagged/cur/1279982188.18722.kwx1b_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/new/.keep \
b/resources/mixedmaildir/autotests/data/maildir-tagged/new/.keep similarity index \
100% rename from resources/mixedmaildir/tests/data/maildir-tagged/new/.keep
rename to resources/mixedmaildir/autotests/data/maildir-tagged/new/.keep
diff --git a/resources/mixedmaildir/tests/data/maildir-tagged/tmp/.keep \
b/resources/mixedmaildir/autotests/data/maildir-tagged/tmp/.keep similarity index \
100% rename from resources/mixedmaildir/tests/data/maildir-tagged/tmp/.keep
rename to resources/mixedmaildir/autotests/data/maildir-tagged/tmp/.keep
diff --git a/resources/mixedmaildir/tests/data/maildir/cur/1279979617.4595.bwXSm \
b/resources/mixedmaildir/autotests/data/maildir/cur/1279979617.4595.bwXSm similarity \
index 100% rename from \
resources/mixedmaildir/tests/data/maildir/cur/1279979617.4595.bwXSm rename to \
resources/mixedmaildir/autotests/data/maildir/cur/1279979617.4595.bwXSm
diff --git a/resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.CStza_2,S \
b/resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.CStza_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.CStza_2,S rename to \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.CStza_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.DUl0I_2,S \
b/resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.DUl0I_2,S \
similarity index 100% rename from \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.DUl0I_2,S rename to \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.DUl0I_2,S
diff --git a/resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.pY5ny \
b/resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.pY5ny similarity \
index 100% rename from \
resources/mixedmaildir/tests/data/maildir/cur/1279979618.4595.pY5ny rename to \
resources/mixedmaildir/autotests/data/maildir/cur/1279979618.4595.pY5ny
diff --git a/resources/mixedmaildir/tests/data/maildir/new/.keep \
b/resources/mixedmaildir/autotests/data/maildir/new/.keep similarity index 100%
rename from resources/mixedmaildir/tests/data/maildir/new/.keep
rename to resources/mixedmaildir/autotests/data/maildir/new/.keep
diff --git a/resources/mixedmaildir/tests/data/maildir/tmp/.keep \
b/resources/mixedmaildir/autotests/data/maildir/tmp/.keep similarity index 100%
rename from resources/mixedmaildir/tests/data/maildir/tmp/.keep
rename to resources/mixedmaildir/autotests/data/maildir/tmp/.keep
diff --git a/resources/mixedmaildir/tests/data/mbox \
b/resources/mixedmaildir/autotests/data/mbox similarity index 100%
rename from resources/mixedmaildir/tests/data/mbox
rename to resources/mixedmaildir/autotests/data/mbox
diff --git a/resources/mixedmaildir/tests/data/mbox-tagged \
b/resources/mixedmaildir/autotests/data/mbox-tagged similarity index 100%
rename from resources/mixedmaildir/tests/data/mbox-tagged
rename to resources/mixedmaildir/autotests/data/mbox-tagged
diff --git a/resources/mixedmaildir/tests/data/mbox-unpurged \
b/resources/mixedmaildir/autotests/data/mbox-unpurged similarity index 100%
rename from resources/mixedmaildir/tests/data/mbox-unpurged
rename to resources/mixedmaildir/autotests/data/mbox-unpurged
diff --git a/resources/mixedmaildir/tests/itemcreatetest.cpp \
b/resources/mixedmaildir/autotests/itemcreatetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/itemcreatetest.cpp
rename to resources/mixedmaildir/autotests/itemcreatetest.cpp
diff --git a/resources/mixedmaildir/tests/itemdeletetest.cpp \
b/resources/mixedmaildir/autotests/itemdeletetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/itemdeletetest.cpp
rename to resources/mixedmaildir/autotests/itemdeletetest.cpp
diff --git a/resources/mixedmaildir/tests/itemfetchtest.cpp \
b/resources/mixedmaildir/autotests/itemfetchtest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/itemfetchtest.cpp
rename to resources/mixedmaildir/autotests/itemfetchtest.cpp
diff --git a/resources/mixedmaildir/tests/itemmodifytest.cpp \
b/resources/mixedmaildir/autotests/itemmodifytest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/itemmodifytest.cpp
rename to resources/mixedmaildir/autotests/itemmodifytest.cpp
diff --git a/resources/mixedmaildir/tests/itemmovetest.cpp \
b/resources/mixedmaildir/autotests/itemmovetest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/itemmovetest.cpp
rename to resources/mixedmaildir/autotests/itemmovetest.cpp
diff --git a/resources/mixedmaildir/tests/storecompacttest.cpp \
b/resources/mixedmaildir/autotests/storecompacttest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/storecompacttest.cpp
rename to resources/mixedmaildir/autotests/storecompacttest.cpp
diff --git a/resources/mixedmaildir/tests/templatemethodstest.cpp \
b/resources/mixedmaildir/autotests/templatemethodstest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/templatemethodstest.cpp
rename to resources/mixedmaildir/autotests/templatemethodstest.cpp
diff --git a/resources/mixedmaildir/tests/testdata.qrc \
b/resources/mixedmaildir/autotests/testdata.qrc similarity index 100%
rename from resources/mixedmaildir/tests/testdata.qrc
rename to resources/mixedmaildir/autotests/testdata.qrc
diff --git a/resources/mixedmaildir/tests/testdatatest.cpp \
b/resources/mixedmaildir/autotests/testdatatest.cpp similarity index 100%
rename from resources/mixedmaildir/tests/testdatatest.cpp
rename to resources/mixedmaildir/autotests/testdatatest.cpp
diff --git a/resources/mixedmaildir/tests/testdatautil.cpp \
b/resources/mixedmaildir/autotests/testdatautil.cpp similarity index 100%
rename from resources/mixedmaildir/tests/testdatautil.cpp
rename to resources/mixedmaildir/autotests/testdatautil.cpp
diff --git a/resources/mixedmaildir/tests/testdatautil.h \
b/resources/mixedmaildir/autotests/testdatautil.h similarity index 100%
rename from resources/mixedmaildir/tests/testdatautil.h
rename to resources/mixedmaildir/autotests/testdatautil.h
diff --git a/resources/shared/CMakeLists.txt b/resources/shared/CMakeLists.txt
index 075f5e2..1904b72 100644
--- a/resources/shared/CMakeLists.txt
+++ b/resources/shared/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory(filestore)
-add_subdirectory(tests)
+add_subdirectory(autotests)
diff --git a/resources/shared/tests/CMakeLists.txt \
b/resources/shared/autotests/CMakeLists.txt similarity index 100%
rename from resources/shared/tests/CMakeLists.txt
rename to resources/shared/autotests/CMakeLists.txt
diff --git a/resources/shared/tests/collectionannotationattributetest.cpp \
b/resources/shared/autotests/collectionannotationattributetest.cpp similarity index \
100% rename from resources/shared/tests/collectionannotationattributetest.cpp
rename to resources/shared/autotests/collectionannotationattributetest.cpp
diff --git a/resources/shared/tests/imapaclattributetest.cpp \
b/resources/shared/autotests/imapaclattributetest.cpp similarity index 100%
rename from resources/shared/tests/imapaclattributetest.cpp
rename to resources/shared/autotests/imapaclattributetest.cpp
diff --git a/resources/shared/filestore/CMakeLists.txt \
b/resources/shared/filestore/CMakeLists.txt index 7ed3cb3..dd1aea9 100644
--- a/resources/shared/filestore/CMakeLists.txt
+++ b/resources/shared/filestore/CMakeLists.txt
@@ -33,6 +33,6 @@ set_target_properties(akonadi-filestore PROPERTIES VERSION \
${KDEPIMRUNTIME_LIB_V install(TARGETS akonadi-filestore \
${INSTALL_TARGETS_DEFAULT_ARGS})
if (KDE4_BUILD_TESTS)
- add_subdirectory( tests )
+ add_subdirectory( autotests )
endif ()
diff --git a/resources/shared/filestore/tests/CMakeLists.txt \
b/resources/shared/filestore/autotests/CMakeLists.txt similarity index 100%
rename from resources/shared/filestore/tests/CMakeLists.txt
rename to resources/shared/filestore/autotests/CMakeLists.txt
diff --git a/resources/shared/filestore/tests/abstractlocalstoretest.cpp \
b/resources/shared/filestore/autotests/abstractlocalstoretest.cpp similarity index \
100% rename from resources/shared/filestore/tests/abstractlocalstoretest.cpp
rename to resources/shared/filestore/autotests/abstractlocalstoretest.cpp
diff --git a/resources/vcard/CMakeLists.txt b/resources/vcard/CMakeLists.txt
index b45c722..85de38e 100644
--- a/resources/vcard/CMakeLists.txt
+++ b/resources/vcard/CMakeLists.txt
@@ -1,6 +1,5 @@
-#Reactivate it
-#add_subdirectory( tests )
+add_subdirectory( autotests )
########### next target ###############
diff --git a/resources/vcard/tests/CMakeLists.txt \
b/resources/vcard/autotests/CMakeLists.txt similarity index 100%
rename from resources/vcard/tests/CMakeLists.txt
rename to resources/vcard/autotests/CMakeLists.txt
diff --git a/resources/vcard/tests/vcardtest-readonly.js \
b/resources/vcard/autotests/vcardtest-readonly.js similarity index 100%
rename from resources/vcard/tests/vcardtest-readonly.js
rename to resources/vcard/autotests/vcardtest-readonly.js
diff --git a/resources/vcard/tests/vcardtest-readonly.xml \
b/resources/vcard/autotests/vcardtest-readonly.xml similarity index 100%
rename from resources/vcard/tests/vcardtest-readonly.xml
rename to resources/vcard/autotests/vcardtest-readonly.xml
diff --git a/resources/vcard/tests/vcardtest.js \
b/resources/vcard/autotests/vcardtest.js similarity index 100%
rename from resources/vcard/tests/vcardtest.js
rename to resources/vcard/autotests/vcardtest.js
diff --git a/resources/vcard/tests/vcardtest.vcf \
b/resources/vcard/autotests/vcardtest.vcf similarity index 100%
rename from resources/vcard/tests/vcardtest.vcf
rename to resources/vcard/autotests/vcardtest.vcf
diff --git a/resources/vcard/tests/vcardtest.xml \
b/resources/vcard/autotests/vcardtest.xml similarity index 100%
rename from resources/vcard/tests/vcardtest.xml
rename to resources/vcard/autotests/vcardtest.xml
diff --git a/resourcetester/CMakeLists.txt b/resourcetester/CMakeLists.txt
index f858113..ec81d76 100644
--- a/resourcetester/CMakeLists.txt
+++ b/resourcetester/CMakeLists.txt
@@ -2,7 +2,7 @@
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-#add_subdirectory( tests )
+add_subdirectory( autotests )
set( resourcetester_SRCS
global.cpp
diff --git a/resourcetester/tests/CMakeLists.txt \
b/resourcetester/autotests/CMakeLists.txt similarity index 100%
rename from resourcetester/tests/CMakeLists.txt
rename to resourcetester/autotests/CMakeLists.txt
diff --git a/resourcetester/tests/construct.es \
b/resourcetester/autotests/construct.es similarity index 100%
rename from resourcetester/tests/construct.es
rename to resourcetester/autotests/construct.es
diff --git a/resourcetester/tests/unittestenv/config-mysql-db.xml \
b/resourcetester/autotests/unittestenv/config-mysql-db.xml similarity index 100%
rename from resourcetester/tests/unittestenv/config-mysql-db.xml
rename to resourcetester/autotests/unittestenv/config-mysql-db.xml
diff --git a/resourcetester/tests/unittestenv/config.xml \
b/resourcetester/autotests/unittestenv/config.xml similarity index 100%
rename from resourcetester/tests/unittestenv/config.xml
rename to resourcetester/autotests/unittestenv/config.xml
diff --git a/resourcetester/tests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl \
b/resourcetester/autotests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl \
similarity index 100% rename from \
resourcetester/tests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl rename to \
resourcetester/autotests/unittestenv/kdehome/share/apps/kwallet/kdewallet.kwl
diff --git a/resourcetester/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
b/resourcetester/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
similarity index 100% rename from \
resourcetester/tests/unittestenv/kdehome/share/config/akonadi-firstrunrc rename to \
resourcetester/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
diff --git a/resourcetester/tests/unittestenv/kdehome/share/config/kdebugrc \
b/resourcetester/autotests/unittestenv/kdehome/share/config/kdebugrc similarity index \
100% rename from resourcetester/tests/unittestenv/kdehome/share/config/kdebugrc
rename to resourcetester/autotests/unittestenv/kdehome/share/config/kdebugrc
diff --git a/resourcetester/tests/unittestenv/kdehome/share/config/kdedrc \
b/resourcetester/autotests/unittestenv/kdehome/share/config/kdedrc similarity index \
100% rename from resourcetester/tests/unittestenv/kdehome/share/config/kdedrc
rename to resourcetester/autotests/unittestenv/kdehome/share/config/kdedrc
diff --git a/resourcetester/tests/unittestenv/kdehome/share/config/kwalletrc \
b/resourcetester/autotests/unittestenv/kdehome/share/config/kwalletrc similarity \
index 100% rename from \
resourcetester/tests/unittestenv/kdehome/share/config/kwalletrc rename to \
resourcetester/autotests/unittestenv/kdehome/share/config/kwalletrc
diff --git a/resourcetester/tests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc \
b/resourcetester/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc \
similarity index 100% rename from \
resourcetester/tests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc rename to \
resourcetester/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic