Author: dmacvicar Date: Fri Feb 8 17:01:37 2008 New Revision: 8576 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8576&view=rev Log: fix testcase names to make cmakelists easier Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccess_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccessTest.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url_test.cc - copied, changed from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url.cc Removed: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccessTest.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url.cc Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc?rev=8576&r1=8575&r2=8576&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc Fri Feb 8 17:01:37 2008 @@ -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 @@ 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()); } Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc?rev=8576&r1=8575&r2=8576&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/devel/devel.dmacvicar/testbed.cc Fri Feb 8 17:01:37 2008 @@ -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 ) { Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Arch.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt?rev=8576&r1=8575&r2=8576&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt Fri Feb 8 17:01:37 2008 @@ -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) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Capabilities.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/CheckSum.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Digest.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Edition.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/KeyRing.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccess_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccessTest.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccess_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccess_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/MediaSetAccessTest.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/PathInfo.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/PublicKey.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc?rev=8576&r1=8575&r2=8576&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/RepoManager_test.cc Fri Feb 8 17:01:37 2008 @@ -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" Copied: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url_test.cc (from r8575, branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url.cc) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url_test.cc?p2=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url_test.cc&p1=branches/tmp/ma/jump_sat/libzypp/tests/zypp/Url.cc&r1=8575&r2=8576&rev=8576&view=diff ============================================================================== (empty) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org