[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/krss/resources/libkrssresource/tests
From:       Dmitry Ivanov <vonami () gmail ! com>
Date:       2009-03-31 13:19:58
Message-ID: 1238505598.595613.31843.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 947417 by divanov:

Break the testing environment into:
 - kdehome1 - for testing all the operations except item importing
 - kdehome2 - for testing item importing only. Added a simple test for that,
   to be extended later.

This could have been just 2 resources started by akonaditest
by I prefer to keep things separated. Benchmark tests come later.


 M  +7 -5      CMakeLists.txt  
 A             importitemsjobtest.cpp   [License: GPL (v2+)]
 A             importitemsjobtest.h   [License: GPL (v2+)]
 M  +1 -1      importopmljobtest.cpp  
 D             unittestenv/config.xml  
 AM            unittestenv/config1.xml   unittestenv/config.xml#946564
 AM            unittestenv/config2.xml   unittestenv/config.xml#946564
 D             unittestenv/kdehome (directory)  
 AM            unittestenv/kdehome1 (directory)   unittestenv/kdehome#946564
 D             unittestenv/kdehome1/broken.opml  
 AM            unittestenv/kdehome1/original.opml   \
unittestenv/kdehome/original1.opml#946564  D             \
unittestenv/kdehome1/original1.opml    D             \
unittestenv/kdehome1/original2.opml    M  +1 -1      \
unittestenv/kdehome1/share/config/akonadi_opml_rss_resource_0rc    AM            \
unittestenv/kdehome1/to-import-broken.opml   unittestenv/kdehome/broken.opml#946564  \
AM            unittestenv/kdehome2 (directory)   unittestenv/kdehome#946564  D        \
unittestenv/kdehome2/broken.opml    AM            unittestenv/kdehome2/original.opml  \
unittestenv/kdehome/original2.opml#946564  D             \
unittestenv/kdehome2/original1.opml    D             \
unittestenv/kdehome2/original2.opml    A             \
unittestenv/kdehome2/planetkde-correctness.xml    D             \
unittestenv/kdehome2/planetkde_org_rss20.xml    M  +2 -1      \
unittestenv/kdehome2/share/config/akonadi_opml_rss_resource_0rc    D             \
unittestenv/kdehome2/to-import.opml  


--- trunk/playground/pim/krss/resources/libkrssresource/tests/CMakeLists.txt \
#947416:947417 @@ -5,15 +5,16 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
 
-macro(add_akonadi_isolated_test _testName)
+macro(add_akonadi_isolated_test _testName _configName)
   set(_targetName ${_testName})
+  set(_configFile ${_configName})
   set(_srcList ${ARGN})
 
   # add the dbus interace to every test (easier than adding to particular tests \
only)  qt4_add_dbus_interface(_srcList ../org.kde.krss.xml krssinterface)
 
   kde4_add_executable(${_targetName} TEST ${_srcList})
-  target_link_libraries(${_targetName} ${QT_QTTEST_LIBRARY} ${KDE4_AKONADI_LIBS} \
${KDE4_KDECORE_LIBS} krss) +  target_link_libraries(${_targetName} \
${QT_QTTEST_LIBRARY} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} krss krssresource)  
   # based on kde4_add_unit_test
   if (WIN32)
@@ -28,14 +29,15 @@
 
   find_program(_testrunner akonaditest)
 
-  add_test( krss-${_targetName} ${_testrunner} -c \
${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} ) +  add_test( \
krss-${_targetName} ${_testrunner} -c \
${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/${_configFile} ${_executable} )  \
endmacro(add_akonadi_isolated_test)  
 macro(add_simple_test _testName)
   set(_targetName ${_testName})
   set(_srcList ${ARGN})
   kde4_add_unit_test(${_targetName} ${_srcList})
-  target_link_libraries(${_targetName} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTTEST_LIBRARY} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} krss) +  \
target_link_libraries(${_targetName} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTTEST_LIBRARY} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} krss krssresource)  \
endmacro(add_simple_test)  
-add_akonadi_isolated_test(importopmljobtest importopmljobtest.cpp)
+add_akonadi_isolated_test(importopmljobtest config1.xml importopmljobtest.cpp)
+add_akonadi_isolated_test(importitemsjobtest config2.xml importitemsjobtest.cpp)
--- trunk/playground/pim/krss/resources/libkrssresource/tests/importopmljobtest.cpp \
#947416:947417 @@ -129,7 +129,7 @@
     org::kde::krss *interface = new org::kde::krss( \
                "org.freedesktop.Akonadi.Resource.akonadi_opml_rss_resource_0",
                                                     "/KRss", \
QDBusConnection::sessionBus(), this );  
-    QDBusReply<QVariantMap> reply = interface->call( "importOpml", kdehome + \
"/broken.opml", defaultTag ); +    QDBusReply<QVariantMap> reply = interface->call( \
"importOpml", kdehome + "/to-import-broken.opml", defaultTag );  QVERIFY( \
reply.isValid() );  QVERIFY( reply.value().value( "error" ).toInt() != 0 );
 }
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/config1.xml \
#property svn:mergeinfo  + 
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/config2.xml \
#property svn:mergeinfo  + 
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome1 \
#property svn:mergeinfo  + 
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome1/original.opml \
#property svn:mergeinfo  + 
--- trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome1/share/config/akonadi_opml_rss_resource_0rc \
#946564:947417 @@ -1,2 +1,2 @@
 [General]
-Path[$e]=file://$KDEHOME/original1.opml
+Path[$e]=file://$KDEHOME/original.opml
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome1/to-import-broken.opml \
#property svn:mergeinfo  + 
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome2 \
#property svn:mergeinfo  + 
** trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome2/original.opml \
#property svn:mergeinfo  + 
--- trunk/playground/pim/krss/resources/libkrssresource/tests/unittestenv/kdehome2/share/config/akonadi_opml_rss_resource_0rc \
#946564:947417 @@ -1,2 +1,3 @@
 [General]
-Path[$e]=file://$KDEHOME/original1.opml
+Path[$e]=file://$KDEHOME/original.opml
+BlockFetch[$e]=true


[prev in list] [next in list] [prev in thread] [next in thread]