fix testcase names to make cmakelists easier

diff --git a/devel/devel.dmacvicar/RepositoryManager_tp.cc b/devel/devel.dmacvicar/RepositoryManager_tp.cc
index f72c7cc..1e5ff7c 100644 (file)
--- a/devel/devel.dmacvicar/RepositoryManager_tp.cc
+++ b/devel/devel.dmacvicar/RepositoryManager_tp.cc
@@ -12,8 +12,6 @@
 #include "zypp/Product.h"
 #include "zypp/Package.h"
 #include "zypp/RepoInfo.h"
-
-#include "zypp/repo/cached/RepoImpl.h"
 #include "zypp/data/ResolvableData.h"
 
 #include "zypp/RepoManager.h"
@@ -39,7 +37,7 @@ int main(int argc, char **argv)
       for ( RepoInfoList::const_iterator it = repos.begin(); it != repos.end(); ++it )
       {
         cout << *it << endl;
-        manager.loadFromCache(it->alias());
+        manager.loadFromCache(*it);
         //z->addResolvables(repo.resolvables());
       }
 

diff --git a/devel/devel.dmacvicar/testbed.cc b/devel/devel.dmacvicar/testbed.cc
index 193532b..3fb5d1e 100644 (file)
--- a/devel/devel.dmacvicar/testbed.cc
+++ b/devel/devel.dmacvicar/testbed.cc
@@ -17,30 +17,42 @@
 
 #include "zypp/sat/Pool.h"
 
+#include "zypp/PoolQuery.h"
+
 using namespace std;
 using namespace zypp;
 using namespace zypp::repo;
 
+bool result_cb( const ResObject::Ptr &r )
+{
+  cout << r << endl;
+}
+
 int main(int argc, char **argv)
 {
     try
     {
       ZYpp::Ptr z = getZYpp();
     
-      z->initializeTarget("/");
+      //z->initializeTarget("/");
       //z->target()->load();
 
       sat::Pool::instance().addRepoSolv("./foo.solv");
 
-      for ( ResPool::const_iterator it = z->pool().begin(); it != z->pool().end(); ++it )
-      {
-        ResObject::constPtr res = it->resolvable();
-        if ( res->name() == "kde4-kcolorchooser")
-        {
-          cout << res << endl;
-          cout << res->summary() << " | " << res->size() << endl;
-        }
-      }
+//       for ( ResPool::const_iterator it = z->pool().begin(); it != z->pool().end(); ++it )
+//       {
+//         ResObject::constPtr res = it->resolvable();
+//         if ( res->name() == "kde4-kcolorchooser")
+//         {
+//           cout << res << endl;
+//           cout << res->summary() << " | " << res->size() << endl;
+//         }
+//       }
+
+      PoolQuery query( &result_cb );
+      query.execute("kde");
+      
+
     }
     catch ( const Exception &e )
     {

diff --git a/tests/zypp/Arch.cc b/tests/zypp/Arch_test.cc
similarity index 100%
rename from tests/zypp/Arch.cc
rename to tests/zypp/Arch_test.cc

diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt
index e597143..edce49c 100644 (file)
--- a/tests/zypp/CMakeLists.txt
+++ b/tests/zypp/CMakeLists.txt
@@ -3,97 +3,28 @@
 # test:       ${loop_var}_test
 ADD_SUBDIRECTORY(base)
 
-FOREACH( loop_var ResKind)
+FOREACH( loop_var PoolQuery KeyRing MediaSetAccess ResKind Arch Url Edition Capabilities CheckSum PublicKey PathInfo Digest Fetcher FileChecker RepoManager RepoInfo RepoStatus ProgressData )
    ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc )
    TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework )
    ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test)
 ENDFOREACH( loop_var )
 
-
-ADD_EXECUTABLE(Arch Arch.cc)
-TARGET_LINK_LIBRARIES(Arch zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(Url Url.cc)
-TARGET_LINK_LIBRARIES(Url zypp boost_unit_test_framework )
-
 ADD_EXECUTABLE(RWPtr RWPtr.cc)
 TARGET_LINK_LIBRARIES(RWPtr zypp)
 
-ADD_EXECUTABLE(Edition Edition.cc)
-TARGET_LINK_LIBRARIES(Edition zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(Capabilities Capabilities.cc)
-TARGET_LINK_LIBRARIES(Capabilities zypp boost_unit_test_framework )
-
 ADD_EXECUTABLE(PtrTypes PtrTypes.cc)
 TARGET_LINK_LIBRARIES(PtrTypes zypp  )
 
-ADD_EXECUTABLE(TranslatedText TranslatedText.cc)
-TARGET_LINK_LIBRARIES(TranslatedText zypp boost_unit_test_framework)
-
-ADD_EXECUTABLE(CheckSum CheckSum.cc)
-TARGET_LINK_LIBRARIES(CheckSum zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(PublicKey PublicKey.cc)
-TARGET_LINK_LIBRARIES(PublicKey zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(PathInfo PathInfo.cc)
-TARGET_LINK_LIBRARIES(PathInfo zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(Digest Digest.cc)
-TARGET_LINK_LIBRARIES(Digest zypp boost_unit_test_framework )
-
 #ADD_EXECUTABLE(Signature Signature.cc)
 #TARGET_LINK_LIBRARIES(Signature zypp boost_unit_test_framework)
 
-ADD_EXECUTABLE(KeyRing KeyRing.cc)
-TARGET_LINK_LIBRARIES(KeyRing zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( MediaSetAccess MediaSetAccessTest.cc )
-TARGET_LINK_LIBRARIES( MediaSetAccess zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( Fetcher Fetcher_test.cc )
-TARGET_LINK_LIBRARIES( Fetcher zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( FileChecker FileChecker_test.cc )
-TARGET_LINK_LIBRARIES( FileChecker zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( RepoManager RepoManager_test.cc )
-TARGET_LINK_LIBRARIES( RepoManager zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( RepoInfo RepoInfo_test.cc )
-TARGET_LINK_LIBRARIES( RepoInfo zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( RepoStatus RepoStatus_test.cc )
-TARGET_LINK_LIBRARIES( RepoStatus zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE( ProgressData ProgressData_test.cc )
-TARGET_LINK_LIBRARIES( ProgressData zypp boost_unit_test_framework )
-
 ADD_EXECUTABLE(Vendor1 Vendor1.cc)
 TARGET_LINK_LIBRARIES(Vendor1 zypp boost_unit_test_framework )
 
 ADD_EXECUTABLE(Vendor2 Vendor2.cc)
 TARGET_LINK_LIBRARIES(Vendor2 zypp boost_unit_test_framework )
 
-ADD_TEST(ArchTest ${CMAKE_CURRENT_BINARY_DIR}/Arch)
-ADD_TEST(UrlTest ${CMAKE_CURRENT_BINARY_DIR}/Url)
-ADD_TEST(Edition ${CMAKE_CURRENT_BINARY_DIR}/Edition)
-#ADD_TEST(Capabilities ${CMAKE_CURRENT_BINARY_DIR}/Capabilities)
 ADD_TEST(PtrTypesTest ${CMAKE_CURRENT_BINARY_DIR}/PtrTypes)
-ADD_TEST(TranslatedTextTest ${CMAKE_CURRENT_BINARY_DIR}/TranslatedText)
-ADD_TEST(CheckSumTest ${CMAKE_CURRENT_BINARY_DIR}/CheckSum)
-ADD_TEST(PublicKeyTest ${CMAKE_CURRENT_BINARY_DIR}/PublicKey)
-ADD_TEST(PathInfo ${CMAKE_CURRENT_BINARY_DIR}/PathInfo)
-ADD_TEST(Digest ${CMAKE_CURRENT_BINARY_DIR}/Digest)
 #ADD_TEST(Signature ${CMAKE_CURRENT_BINARY_DIR}/Signature)
-ADD_TEST(KeyRingTest ${CMAKE_CURRENT_BINARY_DIR}/KeyRing)
-ADD_TEST(MediaSetAccessTest ${CMAKE_CURRENT_BINARY_DIR}/MediaSetAccess ${CMAKE_CURRENT_SOURCE_DIR}/data/mediasetaccess)
-ADD_TEST(FileCheckerTest ${CMAKE_CURRENT_BINARY_DIR}/FileChecker ${CMAKE_CURRENT_SOURCE_DIR}/data/FileChecker)
-ADD_TEST(RepoManagerTest ${CMAKE_CURRENT_BINARY_DIR}/RepoManager ${CMAKE_CURRENT_SOURCE_DIR}/data/RepoManager)
-ADD_TEST(RepoInfoTest ${CMAKE_CURRENT_BINARY_DIR}/RepoInfo ${CMAKE_CURRENT_SOURCE_DIR}/data/RepoInfo)
-ADD_TEST(FetcherTest ${CMAKE_CURRENT_BINARY_DIR}/Fetcher)
-ADD_TEST(ProgressData_test ${CMAKE_CURRENT_BINARY_DIR}/ProgressData)
 ADD_TEST(Vendor1Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor1)
 ADD_TEST(Vendor2Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor2)
-ADD_TEST(RepoStatus ${CMAKE_CURRENT_BINARY_DIR}/RepoStatus)

diff --git a/tests/zypp/Capabilities.cc b/tests/zypp/Capabilities_test.cc
similarity index 100%
rename from tests/zypp/Capabilities.cc
rename to tests/zypp/Capabilities_test.cc

diff --git a/tests/zypp/CheckSum.cc b/tests/zypp/CheckSum_test.cc
similarity index 100%
rename from tests/zypp/CheckSum.cc
rename to tests/zypp/CheckSum_test.cc

diff --git a/tests/zypp/Digest.cc b/tests/zypp/Digest_test.cc
similarity index 100%
rename from tests/zypp/Digest.cc
rename to tests/zypp/Digest_test.cc

diff --git a/tests/zypp/Edition.cc b/tests/zypp/Edition_test.cc
similarity index 100%
rename from tests/zypp/Edition.cc
rename to tests/zypp/Edition_test.cc

diff --git a/tests/zypp/KeyRing.cc b/tests/zypp/KeyRing_test.cc
similarity index 100%
rename from tests/zypp/KeyRing.cc
rename to tests/zypp/KeyRing_test.cc

diff --git a/tests/zypp/MediaSetAccessTest.cc b/tests/zypp/MediaSetAccess_test.cc
similarity index 100%
rename from tests/zypp/MediaSetAccessTest.cc
rename to tests/zypp/MediaSetAccess_test.cc

diff --git a/tests/zypp/PathInfo.cc b/tests/zypp/PathInfo_test.cc
similarity index 100%
rename from tests/zypp/PathInfo.cc
rename to tests/zypp/PathInfo_test.cc

diff --git a/tests/zypp/PublicKey.cc b/tests/zypp/PublicKey_test.cc
similarity index 100%
rename from tests/zypp/PublicKey.cc
rename to tests/zypp/PublicKey_test.cc

diff --git a/tests/zypp/RepoManager_test.cc b/tests/zypp/RepoManager_test.cc
index e3b2672..50f42d3 100644 (file)
--- a/tests/zypp/RepoManager_test.cc
+++ b/tests/zypp/RepoManager_test.cc
@@ -9,7 +9,6 @@
 #include "zypp/KeyRing.h"
 #include "zypp/PublicKey.h"
 #include "zypp/TmpPath.h"
-#include "zypp/ResStore.h"
 #include "zypp/PathInfo.h"
 
 #include "zypp/RepoManager.h"

diff --git a/tests/zypp/Url.cc b/tests/zypp/Url_test.cc
similarity index 100%
rename from tests/zypp/Url.cc
rename to tests/zypp/Url_test.cc