From kde-commits Thu Jul 31 21:10:00 2014 From: Montel Laurent Date: Thu, 31 Jul 2014 21:10:00 +0000 To: kde-commits Subject: [kdepim/frameworks] /: rename as autotests Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=140684101017879 Git commit 805c351e921d5be4b55c6b4037d0c9f286f73df1 by Montel Laurent. Committed on 31/07/2014 at 21:09. Pushed by mlaurent into branch 'frameworks'. rename as autotests M +3 -3 kaddressbook/CMakeLists.txt R +0 -0 kaddressbook/autotests/CMakeLists.txt [from: kaddressbook/te= sts/CMakeLists.txt - 100% similarity] R +0 -0 kaddressbook/autotests/contactfieldstest.cpp [from: kaddress= book/tests/contactfieldstest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/CMakeLists.txt [from: kaddressb= ook/merge/tests/CMakeLists.txt - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactduplicatecontactdia= logtest.cpp [from: kaddressbook/merge/tests/mergecontactduplicatecontactdia= logtest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactduplicatecontactdia= logtest.h [from: kaddressbook/merge/tests/mergecontactduplicatecontactdialo= gtest.h - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactinfowidgettest.cpp = [from: kaddressbook/merge/tests/mergecontactinfowidgettest.cpp - 100% simil= arity] R +0 -0 kaddressbook/merge/autotests/mergecontactinfowidgettest.h [f= rom: kaddressbook/merge/tests/mergecontactinfowidgettest.h - 100% similarit= y] R +0 -0 kaddressbook/merge/autotests/mergecontactselectinformationdi= alogtest.cpp [from: kaddressbook/merge/tests/mergecontactselectinformationd= ialogtest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactselectinformationdi= alogtest.h [from: kaddressbook/merge/tests/mergecontactselectinformationdia= logtest.h - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactshowresultdialogtes= t.cpp [from: kaddressbook/merge/tests/mergecontactshowresultdialogtest.cpp = - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactshowresultdialogtes= t.h [from: kaddressbook/merge/tests/mergecontactshowresultdialogtest.h - 10= 0% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontacttest.cpp [from: kad= dressbook/merge/tests/mergecontacttest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontacttest.h [from: kaddr= essbook/merge/tests/mergecontacttest.h - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactwidgettest.cpp [fro= m: kaddressbook/merge/tests/mergecontactwidgettest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/mergecontactwidgettest.h [from:= kaddressbook/merge/tests/mergecontactwidgettest.h - 100% similarity] R +0 -0 kaddressbook/merge/autotests/searchpotentialduplicatecontact= jobtest.cpp [from: kaddressbook/merge/tests/searchpotentialduplicatecontact= jobtest.cpp - 100% similarity] R +0 -0 kaddressbook/merge/autotests/searchpotentialduplicatecontact= jobtest.h [from: kaddressbook/merge/tests/searchpotentialduplicatecontactjo= btest.h - 100% similarity] R +0 -0 kaddressbook/merge/autotests/unittestenv/config-sqlite-db.xm= l [from: kaddressbook/merge/tests/unittestenv/config-sqlite-db.xml - 100% s= imilarity] R +0 -0 kaddressbook/merge/autotests/unittestenv/kdehome/share/confi= g/akonadi-firstrunrc [from: kaddressbook/merge/tests/unittestenv/kdehome/sh= are/config/akonadi-firstrunrc - 100% similarity] R +0 -0 kaddressbook/merge/autotests/unittestenv/kdehome/share/confi= g/kdebugrc [from: kaddressbook/merge/tests/unittestenv/kdehome/share/config= /kdebugrc - 100% similarity] R +0 -0 kaddressbook/merge/autotests/unittestenv/kdehome/share/confi= g/kdedrc [from: kaddressbook/merge/tests/unittestenv/kdehome/share/config/k= dedrc - 100% similarity] R +0 -0 kaddressbook/merge/autotests/unittestenv/xdgconfig-sqlite.db= /akonadi/akonadiserverrc [from: kaddressbook/merge/tests/unittestenv/xdgcon= fig-sqlite.db/akonadi/akonadiserverrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/CMakeLists.txt [from: kaddre= ssbook/sendmail/tests/CMakeLists.txt - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/mailsenderjobtest.cpp [from:= kaddressbook/sendmail/tests/mailsenderjobtest.cpp - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/mailsenderjobtest.h [from: k= addressbook/sendmail/tests/mailsenderjobtest.h - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config-mysql-db.= xml [from: kaddressbook/sendmail/tests/unittestenv/config-mysql-db.xml - 10= 0% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config-mysql-fs.= xml [from: kaddressbook/sendmail/tests/unittestenv/config-mysql-fs.xml - 10= 0% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config-postgresq= l-db.xml [from: kaddressbook/sendmail/tests/unittestenv/config-postgresql-d= b.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config-postgresq= l-fs.xml [from: kaddressbook/sendmail/tests/unittestenv/config-postgresql-f= s.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config-sqlite-db= .xml [from: kaddressbook/sendmail/tests/unittestenv/config-sqlite-db.xml - = 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/config.xml [from= : kaddressbook/sendmail/tests/unittestenv/config.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/akonadi-firstrunrc [from: kaddressbook/sendmail/tests/unittestenv/kdeh= ome/share/config/akonadi-firstrunrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/akonadi_knut_resource_0rc [from: kaddressbook/sendmail/tests/unitteste= nv/kdehome/share/config/akonadi_knut_resource_0rc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/akonadi_knut_resource_1rc [from: kaddressbook/sendmail/tests/unitteste= nv/kdehome/share/config/akonadi_knut_resource_1rc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/akonadi_knut_resource_2rc [from: kaddressbook/sendmail/tests/unitteste= nv/kdehome/share/config/akonadi_knut_resource_2rc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/kdebugrc [from: kaddressbook/sendmail/tests/unittestenv/kdehome/share/= config/kdebugrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/share/co= nfig/kdedrc [from: kaddressbook/sendmail/tests/unittestenv/kdehome/share/co= nfig/kdedrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata= -res1.xml [from: kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-r= es1.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata= -res2.xml [from: kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-r= es2.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata= -res3.xml [from: kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-r= es3.xml - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata= .xml [from: kaddressbook/sendmail/tests/unittestenv/kdehome/testdata.xml - = 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/xdgconfig-mysql.= db/akonadi/akonadiserverrc [from: kaddressbook/sendmail/tests/unittestenv/x= dgconfig-mysql.db/akonadi/akonadiserverrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/xdgconfig-mysql.= fs/akonadi/akonadiserverrc [from: kaddressbook/sendmail/tests/unittestenv/x= dgconfig-mysql.fs/akonadi/akonadiserverrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/xdgconfig-postgr= esql.db/akonadi/akonadiserverrc [from: kaddressbook/sendmail/tests/unittest= env/xdgconfig-postgresql.db/akonadi/akonadiserverrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/xdgconfig-postgr= esql.fs/akonadi/akonadiserverrc [from: kaddressbook/sendmail/tests/unittest= env/xdgconfig-postgresql.fs/akonadi/akonadiserverrc - 100% similarity] R +0 -0 kaddressbook/sendmail/autotests/unittestenv/xdgconfig-sqlite= .db/akonadi/akonadiserverrc [from: kaddressbook/sendmail/tests/unittestenv/= xdgconfig-sqlite.db/akonadi/akonadiserverrc - 100% similarity] M +2 -2 kleopatra/crypto/gui/signerresolvepage.cpp M +1 -1 mailcommon/CMakeLists.txt R +0 -18 mailcommon/filter/filterimporter/autotests/CMakeLists.txt [f= rom: mailcommon/filter/filterimporter/tests/CMakeLists.txt - 053% similarit= y] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportbalsa= test.cpp [from: mailcommon/filter/filterimporter/tests/filterimportbalsates= t.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportbalsa= test.h [from: mailcommon/filter/filterimporter/tests/filterimportbalsatest.= h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportclawm= ailtest.cpp [from: mailcommon/filter/filterimporter/tests/filterimportclawm= ailtest.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportclawm= ailtest.h [from: mailcommon/filter/filterimporter/tests/filterimportclawmai= ltest.h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportevolu= tiontest.cpp [from: mailcommon/filter/filterimporter/tests/filterimportevol= utiontest.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportevolu= tiontest.h [from: mailcommon/filter/filterimporter/tests/filterimportevolut= iontest.h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportprocm= ailtest.cpp [from: mailcommon/filter/filterimporter/tests/filterimportprocm= ailtest.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportprocm= ailtest.h [from: mailcommon/filter/filterimporter/tests/filterimportprocmai= ltest.h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportsylph= eedtest.cpp [from: mailcommon/filter/filterimporter/tests/filterimportsylph= eedtest.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportsylph= eedtest.h [from: mailcommon/filter/filterimporter/tests/filterimportsylphee= dtest.h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportthund= erbirdtest.cpp [from: mailcommon/filter/filterimporter/tests/filterimportth= underbirdtest.cpp - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filterimportthund= erbirdtest.h [from: mailcommon/filter/filterimporter/tests/filterimportthun= derbirdtest.h - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filtertestkernel.= cpp [from: mailcommon/filter/filterimporter/tests/filtertestkernel.cpp - 10= 0% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/filtertestkernel.= h [from: mailcommon/filter/filterimporter/tests/filtertestkernel.h - 100% s= imilarity] R +0 -0 mailcommon/filter/filterimporter/autotests/unittestenv/confi= g-sqlite-db.xml [from: mailcommon/filter/filterimporter/tests/unittestenv/c= onfig-sqlite-db.xml - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/unittestenv/kdeho= me/share/config/akonadi-firstrunrc [from: mailcommon/filter/filterimporter/= tests/unittestenv/kdehome/share/config/akonadi-firstrunrc - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/unittestenv/kdeho= me/share/config/kdebugrc [from: mailcommon/filter/filterimporter/tests/unit= testenv/kdehome/share/config/kdebugrc - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/unittestenv/kdeho= me/share/config/kdedrc [from: mailcommon/filter/filterimporter/tests/unitte= stenv/kdehome/share/config/kdedrc - 100% similarity] R +0 -0 mailcommon/filter/filterimporter/autotests/unittestenv/xdgco= nfig-sqlite.db/akonadi/akonadiserverrc [from: mailcommon/filter/filterimpor= ter/tests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc - 100% si= milarity] M +1 -0 messageviewer/CMakeLists.txt C +0 -9 messageviewer/scamdetection/autotests/CMakeLists.txt [from: = messageviewer/scamdetection/tests/CMakeLists.txt - 070% similarity] R +0 -0 messageviewer/scamdetection/autotests/test_scamdetection.cpp= [from: messageviewer/scamdetection/tests/test_scamdetection.cpp - 100% sim= ilarity] R +0 -0 messageviewer/scamdetection/autotests/test_scamdetection.h [= from: messageviewer/scamdetection/tests/test_scamdetection.h - 100% similar= ity] M +0 -3 messageviewer/scamdetection/tests/CMakeLists.txt http://commits.kde.org/kdepim/805c351e921d5be4b55c6b4037d0c9f286f73df1 diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index 83fad86..41d1566 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -24,7 +24,7 @@ endif() = add_subdirectory(icons) add_subdirectory(printing) -add_subdirectory(tests) +add_subdirectory(autotests) if(QGPGME_FOUND) add_definitions(-DQGPGME_FOUND) endif() @@ -126,8 +126,8 @@ target_link_libraries(kaddressbookprivate grantleetheme kleo ) -add_subdirectory(merge/tests) -add_subdirectory(sendmail/tests) +add_subdirectory(merge/autotests) +add_subdirectory(sendmail/autotests) = if(QGPGME_FOUND) target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES}) diff --git a/kaddressbook/tests/CMakeLists.txt b/kaddressbook/autotests/CMa= keLists.txt similarity index 100% rename from kaddressbook/tests/CMakeLists.txt rename to kaddressbook/autotests/CMakeLists.txt diff --git a/kaddressbook/tests/contactfieldstest.cpp b/kaddressbook/autote= sts/contactfieldstest.cpp similarity index 100% rename from kaddressbook/tests/contactfieldstest.cpp rename to kaddressbook/autotests/contactfieldstest.cpp diff --git a/kaddressbook/merge/tests/CMakeLists.txt b/kaddressbook/merge/a= utotests/CMakeLists.txt similarity index 100% rename from kaddressbook/merge/tests/CMakeLists.txt rename to kaddressbook/merge/autotests/CMakeLists.txt diff --git a/kaddressbook/merge/tests/mergecontactduplicatecontactdialogtes= t.cpp b/kaddressbook/merge/autotests/mergecontactduplicatecontactdialogtest= .cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontactduplicatecontactdialogtest= .cpp rename to kaddressbook/merge/autotests/mergecontactduplicatecontactdialogte= st.cpp diff --git a/kaddressbook/merge/tests/mergecontactduplicatecontactdialogtes= t.h b/kaddressbook/merge/autotests/mergecontactduplicatecontactdialogtest.h similarity index 100% rename from kaddressbook/merge/tests/mergecontactduplicatecontactdialogtest= .h rename to kaddressbook/merge/autotests/mergecontactduplicatecontactdialogte= st.h diff --git a/kaddressbook/merge/tests/mergecontactinfowidgettest.cpp b/kadd= ressbook/merge/autotests/mergecontactinfowidgettest.cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontactinfowidgettest.cpp rename to kaddressbook/merge/autotests/mergecontactinfowidgettest.cpp diff --git a/kaddressbook/merge/tests/mergecontactinfowidgettest.h b/kaddre= ssbook/merge/autotests/mergecontactinfowidgettest.h similarity index 100% rename from kaddressbook/merge/tests/mergecontactinfowidgettest.h rename to kaddressbook/merge/autotests/mergecontactinfowidgettest.h diff --git a/kaddressbook/merge/tests/mergecontactselectinformationdialogte= st.cpp b/kaddressbook/merge/autotests/mergecontactselectinformationdialogte= st.cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontactselectinformationdialogtes= t.cpp rename to kaddressbook/merge/autotests/mergecontactselectinformationdialogt= est.cpp diff --git a/kaddressbook/merge/tests/mergecontactselectinformationdialogte= st.h b/kaddressbook/merge/autotests/mergecontactselectinformationdialogtest= .h similarity index 100% rename from kaddressbook/merge/tests/mergecontactselectinformationdialogtes= t.h rename to kaddressbook/merge/autotests/mergecontactselectinformationdialogt= est.h diff --git a/kaddressbook/merge/tests/mergecontactshowresultdialogtest.cpp = b/kaddressbook/merge/autotests/mergecontactshowresultdialogtest.cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontactshowresultdialogtest.cpp rename to kaddressbook/merge/autotests/mergecontactshowresultdialogtest.cpp diff --git a/kaddressbook/merge/tests/mergecontactshowresultdialogtest.h b/= kaddressbook/merge/autotests/mergecontactshowresultdialogtest.h similarity index 100% rename from kaddressbook/merge/tests/mergecontactshowresultdialogtest.h rename to kaddressbook/merge/autotests/mergecontactshowresultdialogtest.h diff --git a/kaddressbook/merge/tests/mergecontacttest.cpp b/kaddressbook/m= erge/autotests/mergecontacttest.cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontacttest.cpp rename to kaddressbook/merge/autotests/mergecontacttest.cpp diff --git a/kaddressbook/merge/tests/mergecontacttest.h b/kaddressbook/mer= ge/autotests/mergecontacttest.h similarity index 100% rename from kaddressbook/merge/tests/mergecontacttest.h rename to kaddressbook/merge/autotests/mergecontacttest.h diff --git a/kaddressbook/merge/tests/mergecontactwidgettest.cpp b/kaddress= book/merge/autotests/mergecontactwidgettest.cpp similarity index 100% rename from kaddressbook/merge/tests/mergecontactwidgettest.cpp rename to kaddressbook/merge/autotests/mergecontactwidgettest.cpp diff --git a/kaddressbook/merge/tests/mergecontactwidgettest.h b/kaddressbo= ok/merge/autotests/mergecontactwidgettest.h similarity index 100% rename from kaddressbook/merge/tests/mergecontactwidgettest.h rename to kaddressbook/merge/autotests/mergecontactwidgettest.h diff --git a/kaddressbook/merge/tests/searchpotentialduplicatecontactjobtes= t.cpp b/kaddressbook/merge/autotests/searchpotentialduplicatecontactjobtest= .cpp similarity index 100% rename from kaddressbook/merge/tests/searchpotentialduplicatecontactjobtest= .cpp rename to kaddressbook/merge/autotests/searchpotentialduplicatecontactjobte= st.cpp diff --git a/kaddressbook/merge/tests/searchpotentialduplicatecontactjobtes= t.h b/kaddressbook/merge/autotests/searchpotentialduplicatecontactjobtest.h similarity index 100% rename from kaddressbook/merge/tests/searchpotentialduplicatecontactjobtest= .h rename to kaddressbook/merge/autotests/searchpotentialduplicatecontactjobte= st.h diff --git a/kaddressbook/merge/tests/unittestenv/config-sqlite-db.xml b/ka= ddressbook/merge/autotests/unittestenv/config-sqlite-db.xml similarity index 100% rename from kaddressbook/merge/tests/unittestenv/config-sqlite-db.xml rename to kaddressbook/merge/autotests/unittestenv/config-sqlite-db.xml diff --git a/kaddressbook/merge/tests/unittestenv/kdehome/share/config/akon= adi-firstrunrc b/kaddressbook/merge/autotests/unittestenv/kdehome/share/con= fig/akonadi-firstrunrc similarity index 100% rename from kaddressbook/merge/tests/unittestenv/kdehome/share/config/akona= di-firstrunrc rename to kaddressbook/merge/autotests/unittestenv/kdehome/share/config/ako= nadi-firstrunrc diff --git a/kaddressbook/merge/tests/unittestenv/kdehome/share/config/kdeb= ugrc b/kaddressbook/merge/autotests/unittestenv/kdehome/share/config/kdebug= rc similarity index 100% rename from kaddressbook/merge/tests/unittestenv/kdehome/share/config/kdebu= grc rename to kaddressbook/merge/autotests/unittestenv/kdehome/share/config/kde= bugrc diff --git a/kaddressbook/merge/tests/unittestenv/kdehome/share/config/kded= rc b/kaddressbook/merge/autotests/unittestenv/kdehome/share/config/kdedrc similarity index 100% rename from kaddressbook/merge/tests/unittestenv/kdehome/share/config/kdedrc rename to kaddressbook/merge/autotests/unittestenv/kdehome/share/config/kde= drc diff --git a/kaddressbook/merge/tests/unittestenv/xdgconfig-sqlite.db/akona= di/akonadiserverrc b/kaddressbook/merge/autotests/unittestenv/xdgconfig-sql= ite.db/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/merge/tests/unittestenv/xdgconfig-sqlite.db/akonad= i/akonadiserverrc rename to kaddressbook/merge/autotests/unittestenv/xdgconfig-sqlite.db/akon= adi/akonadiserverrc diff --git a/kaddressbook/sendmail/tests/CMakeLists.txt b/kaddressbook/send= mail/autotests/CMakeLists.txt similarity index 100% rename from kaddressbook/sendmail/tests/CMakeLists.txt rename to kaddressbook/sendmail/autotests/CMakeLists.txt diff --git a/kaddressbook/sendmail/tests/mailsenderjobtest.cpp b/kaddressbo= ok/sendmail/autotests/mailsenderjobtest.cpp similarity index 100% rename from kaddressbook/sendmail/tests/mailsenderjobtest.cpp rename to kaddressbook/sendmail/autotests/mailsenderjobtest.cpp diff --git a/kaddressbook/sendmail/tests/mailsenderjobtest.h b/kaddressbook= /sendmail/autotests/mailsenderjobtest.h similarity index 100% rename from kaddressbook/sendmail/tests/mailsenderjobtest.h rename to kaddressbook/sendmail/autotests/mailsenderjobtest.h diff --git a/kaddressbook/sendmail/tests/unittestenv/config-mysql-db.xml b/= kaddressbook/sendmail/autotests/unittestenv/config-mysql-db.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config-mysql-db.xml rename to kaddressbook/sendmail/autotests/unittestenv/config-mysql-db.xml diff --git a/kaddressbook/sendmail/tests/unittestenv/config-mysql-fs.xml b/= kaddressbook/sendmail/autotests/unittestenv/config-mysql-fs.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config-mysql-fs.xml rename to kaddressbook/sendmail/autotests/unittestenv/config-mysql-fs.xml diff --git a/kaddressbook/sendmail/tests/unittestenv/config-postgresql-db.x= ml b/kaddressbook/sendmail/autotests/unittestenv/config-postgresql-db.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config-postgresql-db.xml rename to kaddressbook/sendmail/autotests/unittestenv/config-postgresql-db.= xml diff --git a/kaddressbook/sendmail/tests/unittestenv/config-postgresql-fs.x= ml b/kaddressbook/sendmail/autotests/unittestenv/config-postgresql-fs.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config-postgresql-fs.xml rename to kaddressbook/sendmail/autotests/unittestenv/config-postgresql-fs.= xml diff --git a/kaddressbook/sendmail/tests/unittestenv/config-sqlite-db.xml b= /kaddressbook/sendmail/autotests/unittestenv/config-sqlite-db.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config-sqlite-db.xml rename to kaddressbook/sendmail/autotests/unittestenv/config-sqlite-db.xml diff --git a/kaddressbook/sendmail/tests/unittestenv/config.xml b/kaddressb= ook/sendmail/autotests/unittestenv/config.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/config.xml rename to kaddressbook/sendmail/autotests/unittestenv/config.xml diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/a= konadi-firstrunrc b/kaddressbook/sendmail/autotests/unittestenv/kdehome/sha= re/config/akonadi-firstrunrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/ak= onadi-firstrunrc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= akonadi-firstrunrc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/a= konadi_knut_resource_0rc b/kaddressbook/sendmail/autotests/unittestenv/kdeh= ome/share/config/akonadi_knut_resource_0rc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/ak= onadi_knut_resource_0rc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= akonadi_knut_resource_0rc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/a= konadi_knut_resource_1rc b/kaddressbook/sendmail/autotests/unittestenv/kdeh= ome/share/config/akonadi_knut_resource_1rc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/ak= onadi_knut_resource_1rc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= akonadi_knut_resource_1rc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/a= konadi_knut_resource_2rc b/kaddressbook/sendmail/autotests/unittestenv/kdeh= ome/share/config/akonadi_knut_resource_2rc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/ak= onadi_knut_resource_2rc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= akonadi_knut_resource_2rc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/k= debugrc b/kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= kdebugrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/kd= ebugrc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= kdebugrc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/k= dedrc b/kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/kd= edrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/share/config/kd= edrc rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/share/config/= kdedrc diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res1.= xml b/kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res1.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res1.x= ml rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res1= .xml diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res2.= xml b/kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res2.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res2.x= ml rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res2= .xml diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res3.= xml b/kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res3.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/testdata-res3.x= ml rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata-res3= .xml diff --git a/kaddressbook/sendmail/tests/unittestenv/kdehome/testdata.xml b= /kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata.xml similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/kdehome/testdata.xml rename to kaddressbook/sendmail/autotests/unittestenv/kdehome/testdata.xml diff --git a/kaddressbook/sendmail/tests/unittestenv/xdgconfig-mysql.db/ako= nadi/akonadiserverrc b/kaddressbook/sendmail/autotests/unittestenv/xdgconfi= g-mysql.db/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/xdgconfig-mysql.db/akon= adi/akonadiserverrc rename to kaddressbook/sendmail/autotests/unittestenv/xdgconfig-mysql.db/ak= onadi/akonadiserverrc diff --git a/kaddressbook/sendmail/tests/unittestenv/xdgconfig-mysql.fs/ako= nadi/akonadiserverrc b/kaddressbook/sendmail/autotests/unittestenv/xdgconfi= g-mysql.fs/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/xdgconfig-mysql.fs/akon= adi/akonadiserverrc rename to kaddressbook/sendmail/autotests/unittestenv/xdgconfig-mysql.fs/ak= onadi/akonadiserverrc diff --git a/kaddressbook/sendmail/tests/unittestenv/xdgconfig-postgresql.d= b/akonadi/akonadiserverrc b/kaddressbook/sendmail/autotests/unittestenv/xdg= config-postgresql.db/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/xdgconfig-postgresql.db= /akonadi/akonadiserverrc rename to kaddressbook/sendmail/autotests/unittestenv/xdgconfig-postgresql.= db/akonadi/akonadiserverrc diff --git a/kaddressbook/sendmail/tests/unittestenv/xdgconfig-postgresql.f= s/akonadi/akonadiserverrc b/kaddressbook/sendmail/autotests/unittestenv/xdg= config-postgresql.fs/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/xdgconfig-postgresql.fs= /akonadi/akonadiserverrc rename to kaddressbook/sendmail/autotests/unittestenv/xdgconfig-postgresql.= fs/akonadi/akonadiserverrc diff --git a/kaddressbook/sendmail/tests/unittestenv/xdgconfig-sqlite.db/ak= onadi/akonadiserverrc b/kaddressbook/sendmail/autotests/unittestenv/xdgconf= ig-sqlite.db/akonadi/akonadiserverrc similarity index 100% rename from kaddressbook/sendmail/tests/unittestenv/xdgconfig-sqlite.db/ako= nadi/akonadiserverrc rename to kaddressbook/sendmail/autotests/unittestenv/xdgconfig-sqlite.db/a= konadi/akonadiserverrc diff --git a/kleopatra/crypto/gui/signerresolvepage.cpp b/kleopatra/crypto/= gui/signerresolvepage.cpp index 5e32025..ae6a4cc 100644 --- a/kleopatra/crypto/gui/signerresolvepage.cpp +++ b/kleopatra/crypto/gui/signerresolvepage.cpp @@ -52,7 +52,7 @@ = #include = -#include +#include #include = #include @@ -276,7 +276,7 @@ SignerResolvePage::Private::Private( SignerResolvePage = * qq ) = { QVBoxLayout* layout =3D new QVBoxLayout( q ); - layout->setSpacing( KDialog::spacingHint() ); +//TODO PORT QT5 layout->setSpacing( QDialog::spacingHint() ); = signEncryptGroup =3D new QButtonGroup( q ); q->connect( signEncryptGroup, SIGNAL(buttonClicked(int)), q, SLOT(oper= ationButtonClicked(int)) ); diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt index 3148401..9fc5ac2 100644 --- a/mailcommon/CMakeLists.txt +++ b/mailcommon/CMakeLists.txt @@ -211,7 +211,7 @@ target_link_libraries(mailcommon messageviewer messagec= ore messagecomposer maili set_target_properties(mailcommon PROPERTIES VERSION ${KDEPIM_LIB_VERSION} = SOVERSION ${KDEPIM_LIB_SOVERSION}) install(TARGETS mailcommon ${INSTALL_TARGETS_DEFAULT_ARGS}) = -add_subdirectory(filter/filterimporter/tests) +add_subdirectory(filter/filterimporter/autotests) = #install(FILES viewer/viewer.h viewer/attachmentstrategy.h header/headerst= rategy.h messageviewer_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/messagev= iewer COMPONENT devel) = diff --git a/mailcommon/filter/filterimporter/tests/CMakeLists.txt b/mailco= mmon/filter/filterimporter/autotests/CMakeLists.txt similarity index 53% rename from mailcommon/filter/filterimporter/tests/CMakeLists.txt rename to mailcommon/filter/filterimporter/autotests/CMakeLists.txt index 4c0183d..a0feba5 100644 --- a/mailcommon/filter/filterimporter/tests/CMakeLists.txt +++ b/mailcommon/filter/filterimporter/autotests/CMakeLists.txt @@ -10,21 +10,3 @@ add_akonadi_isolated_test_advanced(filterimportevolution= test.cpp filtertestkerne add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertest= kernel.cpp "mailcommon;messagecomposer") add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertest= kernel.cpp "mailcommon;messagecomposer") = - -# Convenience macro to add messagecomposer unit tests. -#macro( add_filterimport_test _source ) -# set( _test ${_source} filtertestkernel.cpp) -# get_filename_component( _name ${_source} NAME_WE ) -# kde4_add_unit_test( ${_name} TESTNAME filterimport-${_name} ${_test} ) - -# target_link_libraries( ${_name} mailcommon messagecomposer Qt5::Test = Qt5::Xml KF5::AkonadiCore KF5::PimIdentities) -#endmacro() - -#add_filterimport_test( filterimportclawmailtest.cpp ) -#add_filterimport_test( filterimportthunderbirdtest.cpp ) -#add_filterimport_test( filterimportbalsatest.cpp ) -#add_filterimport_test( filterimportevolutiontest.cpp ) -#add_filterimport_test( filterimportprocmailtest.cpp ) -#add_filterimport_test( filterimportsylpheedtest.cpp ) - - diff --git a/mailcommon/filter/filterimporter/tests/filterimportbalsatest.c= pp b/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportbalsatest.cpp rename to mailcommon/filter/filterimporter/autotests/filterimportbalsatest.= cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportbalsatest.h= b/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportbalsatest.h rename to mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h diff --git a/mailcommon/filter/filterimporter/tests/filterimportclawmailtes= t.cpp b/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest= .cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportclawmailtest= .cpp rename to mailcommon/filter/filterimporter/autotests/filterimportclawmailte= st.cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportclawmailtes= t.h b/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportclawmailtest= .h rename to mailcommon/filter/filterimporter/autotests/filterimportclawmailte= st.h diff --git a/mailcommon/filter/filterimporter/tests/filterimportevolutionte= st.cpp b/mailcommon/filter/filterimporter/autotests/filterimportevolutionte= st.cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportevolutiontes= t.cpp rename to mailcommon/filter/filterimporter/autotests/filterimportevolutiont= est.cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportevolutionte= st.h b/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest= .h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportevolutiontes= t.h rename to mailcommon/filter/filterimporter/autotests/filterimportevolutiont= est.h diff --git a/mailcommon/filter/filterimporter/tests/filterimportprocmailtes= t.cpp b/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest= .cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportprocmailtest= .cpp rename to mailcommon/filter/filterimporter/autotests/filterimportprocmailte= st.cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportprocmailtes= t.h b/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportprocmailtest= .h rename to mailcommon/filter/filterimporter/autotests/filterimportprocmailte= st.h diff --git a/mailcommon/filter/filterimporter/tests/filterimportsylpheedtes= t.cpp b/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest= .cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportsylpheedtest= .cpp rename to mailcommon/filter/filterimporter/autotests/filterimportsylpheedte= st.cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportsylpheedtes= t.h b/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportsylpheedtest= .h rename to mailcommon/filter/filterimporter/autotests/filterimportsylpheedte= st.h diff --git a/mailcommon/filter/filterimporter/tests/filterimportthunderbird= test.cpp b/mailcommon/filter/filterimporter/autotests/filterimportthunderbi= rdtest.cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportthunderbirdt= est.cpp rename to mailcommon/filter/filterimporter/autotests/filterimportthunderbir= dtest.cpp diff --git a/mailcommon/filter/filterimporter/tests/filterimportthunderbird= test.h b/mailcommon/filter/filterimporter/autotests/filterimportthunderbird= test.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filterimportthunderbirdt= est.h rename to mailcommon/filter/filterimporter/autotests/filterimportthunderbir= dtest.h diff --git a/mailcommon/filter/filterimporter/tests/filtertestkernel.cpp b/= mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp similarity index 100% rename from mailcommon/filter/filterimporter/tests/filtertestkernel.cpp rename to mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp diff --git a/mailcommon/filter/filterimporter/tests/filtertestkernel.h b/ma= ilcommon/filter/filterimporter/autotests/filtertestkernel.h similarity index 100% rename from mailcommon/filter/filterimporter/tests/filtertestkernel.h rename to mailcommon/filter/filterimporter/autotests/filtertestkernel.h diff --git a/mailcommon/filter/filterimporter/tests/unittestenv/config-sqli= te-db.xml b/mailcommon/filter/filterimporter/autotests/unittestenv/config-s= qlite-db.xml similarity index 100% rename from mailcommon/filter/filterimporter/tests/unittestenv/config-sqlit= e-db.xml rename to mailcommon/filter/filterimporter/autotests/unittestenv/config-sql= ite-db.xml diff --git a/mailcommon/filter/filterimporter/tests/unittestenv/kdehome/sha= re/config/akonadi-firstrunrc b/mailcommon/filter/filterimporter/autotests/u= nittestenv/kdehome/share/config/akonadi-firstrunrc similarity index 100% rename from mailcommon/filter/filterimporter/tests/unittestenv/kdehome/shar= e/config/akonadi-firstrunrc rename to mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/sh= are/config/akonadi-firstrunrc diff --git a/mailcommon/filter/filterimporter/tests/unittestenv/kdehome/sha= re/config/kdebugrc b/mailcommon/filter/filterimporter/autotests/unittestenv= /kdehome/share/config/kdebugrc similarity index 100% rename from mailcommon/filter/filterimporter/tests/unittestenv/kdehome/shar= e/config/kdebugrc rename to mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/sh= are/config/kdebugrc diff --git a/mailcommon/filter/filterimporter/tests/unittestenv/kdehome/sha= re/config/kdedrc b/mailcommon/filter/filterimporter/autotests/unittestenv/k= dehome/share/config/kdedrc similarity index 100% rename from mailcommon/filter/filterimporter/tests/unittestenv/kdehome/shar= e/config/kdedrc rename to mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/sh= are/config/kdedrc diff --git a/mailcommon/filter/filterimporter/tests/unittestenv/xdgconfig-s= qlite.db/akonadi/akonadiserverrc b/mailcommon/filter/filterimporter/autotes= ts/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc similarity index 100% rename from mailcommon/filter/filterimporter/tests/unittestenv/xdgconfig-sq= lite.db/akonadi/akonadiserverrc rename to mailcommon/filter/filterimporter/autotests/unittestenv/xdgconfig-= sqlite.db/akonadi/akonadiserverrc diff --git a/messageviewer/CMakeLists.txt b/messageviewer/CMakeLists.txt index 299bf8a..9021ac6 100644 --- a/messageviewer/CMakeLists.txt +++ b/messageviewer/CMakeLists.txt @@ -229,6 +229,7 @@ install(DIRECTORY themes DESTINATION ${DATA_INSTALL_DIR= }/messageviewer ) install(FILES header/data/messageviewer_header_themes.knsrc DESTINATION ${= CONFIG_INSTALL_DIR} ) = # REACTIVATE add_subdirectory(grantleefilters) +add_subdirectory(scamdetection/autotests) add_subdirectory(scamdetection/tests) add_subdirectory(adblock/tests/) install(FILES notify/messageviewer.notifyrc DESTINATION ${KNOTIFYRC_INSTAL= L_DIR} ) diff --git a/messageviewer/scamdetection/tests/CMakeLists.txt b/messageview= er/scamdetection/autotests/CMakeLists.txt similarity index 70% copy from messageviewer/scamdetection/tests/CMakeLists.txt copy to messageviewer/scamdetection/autotests/CMakeLists.txt index bcccc03..e00397f 100644 --- a/messageviewer/scamdetection/tests/CMakeLists.txt +++ b/messageviewer/scamdetection/autotests/CMakeLists.txt @@ -13,12 +13,3 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) = ecm_add_tests(test_scamdetection.cpp NAME_PREFIX "messageviewer-" LINK_LIB= RARIES messageviewer Qt5::Test) = - -set(scamdetection_gui_SRCS scamdetection_gui.cpp) -add_executable(scamdetection_gui ${scamdetection_gui_SRCS}) -target_link_libraries(scamdetection_gui - KF5::KIOCore - messageviewer -) - - diff --git a/messageviewer/scamdetection/tests/test_scamdetection.cpp b/mes= sageviewer/scamdetection/autotests/test_scamdetection.cpp similarity index 100% rename from messageviewer/scamdetection/tests/test_scamdetection.cpp rename to messageviewer/scamdetection/autotests/test_scamdetection.cpp diff --git a/messageviewer/scamdetection/tests/test_scamdetection.h b/messa= geviewer/scamdetection/autotests/test_scamdetection.h similarity index 100% rename from messageviewer/scamdetection/tests/test_scamdetection.h rename to messageviewer/scamdetection/autotests/test_scamdetection.h diff --git a/messageviewer/scamdetection/tests/CMakeLists.txt b/messageview= er/scamdetection/tests/CMakeLists.txt index bcccc03..5f8d47e 100644 --- a/messageviewer/scamdetection/tests/CMakeLists.txt +++ b/messageviewer/scamdetection/tests/CMakeLists.txt @@ -11,9 +11,6 @@ set(QT_REQUIRED_VERSION "5.2.0") find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) = -ecm_add_tests(test_scamdetection.cpp NAME_PREFIX "messageviewer-" LINK_LIB= RARIES messageviewer Qt5::Test) - - set(scamdetection_gui_SRCS scamdetection_gui.cpp) add_executable(scamdetection_gui ${scamdetection_gui_SRCS}) target_link_libraries(scamdetection_gui