Author: mlandres Date: Thu Nov 20 22:36:34 2008 New Revision: 11762 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11762&view=rev Log: remove obsolete satsolver/ includes Modified: trunk/libzypp/tests/sat/SolvParsing_test.cc trunk/libzypp/tests/sat/Solvable_test.cc trunk/libzypp/zypp/Patch.cc trunk/libzypp/zypp/sat/Pool.cc Modified: trunk/libzypp/tests/sat/SolvParsing_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/sat/SolvParsing_test.cc?rev=11762&r1=11761&r2=11762&view=diff ============================================================================== --- trunk/libzypp/tests/sat/SolvParsing_test.cc (original) +++ trunk/libzypp/tests/sat/SolvParsing_test.cc Thu Nov 20 22:36:34 2008 @@ -2,7 +2,6 @@ #include <iostream> #include -#include #include "zypp/base/Logger.h" #include "zypp/TmpPath.h" #include "zypp/RepoManager.h" @@ -30,7 +29,7 @@ * the final object * * so the test covers both satsolver-tools - * right insertion and parsing + * right insertion and parsing * and libzypp ResObject and friends data * extraction from solv files */ @@ -48,7 +47,7 @@ filesystem::TmpDir tmp; RepoManagerOptions opts = RepoManagerOptions::makeTestSetup(tmp.path()); RepoManager mgr(opts); - + KeyRingTestReceiver keyring_callbacks; KeyRingTestSignalReceiver receiver; @@ -67,23 +66,23 @@ BOOST_AUTO_TEST_CASE(attributes) { init_pool_yum(); - MIL << sat::Pool::instance(); + MIL << sat::Pool::instance(); Repository r = sat::Pool::instance().reposFind("updates"); - + int c = 0; - + for ( Repository::SolvableIterator it = r.solvablesBegin(); it != r.solvablesEnd(); ++it ) { - sat::Solvable s = *it; + sat::Solvable s = *it; //MIL << s.ident() << endl; if ( s.ident() == "openssl-devel" ) - { + { c++; Package::Ptr p = asKind<Package>(makeResObject(s)); BOOST_CHECK(p); - + //solvable 5 (6): //name: openssl-devel 0.9.8d-17.2 i586 BOOST_CHECK_EQUAL(p->name(), "openssl-devel"); @@ -91,7 +90,7 @@ BOOST_CHECK_EQUAL(p->vendor(), "SUSE LINUX Products GmbH, Nuernberg, Germany"); //solvable:checksum: 9f6a44015ad97680e9f93d0edefa1d533940479c BOOST_CHECK_EQUAL(p->checksum(), CheckSum::sha1("9f6a44015ad97680e9f93d0edefa1d533940479c")); - //solvable:summary: + //solvable:summary: BOOST_CHECK_EQUAL(p->summary(), "Include Files and Libraries mandatory for Development."); //solvable:description: This package contains all necessary include files and libraries needed //to develop applications that require these. @@ -120,13 +119,13 @@ //solvable:sourceevr: (void) //solvable:sourcename: openssl //solvable:headerend: 34861 - + } } - + // check that we actually found all testeable // resolvables BOOST_CHECK_EQUAL(c, 1); - - + + } Modified: trunk/libzypp/tests/sat/Solvable_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/sat/Solvable_test.cc?rev=11762&r1=11761&r2=11762&view=diff ============================================================================== --- trunk/libzypp/tests/sat/Solvable_test.cc (original) +++ trunk/libzypp/tests/sat/Solvable_test.cc Thu Nov 20 22:36:34 2008 @@ -2,7 +2,6 @@ #include <iostream> #include -#include #include "zypp/base/Logger.h" #include "zypp/base/Easy.h" #include "zypp/Pattern.h" @@ -30,19 +29,19 @@ { MIL << sat::Pool::instance(); Repository r = sat::Pool::instance().reposFind("opensuse"); - + int c = 0; - + for ( Repository::SolvableIterator it = r.solvablesBegin(); it != r.solvablesEnd(); ++it ) { - sat::Solvable s = *it; + sat::Solvable s = *it; //MIL << s.ident() << endl; if ( s.ident() == "pattern:apparmor" ) - { + { c++; - + // solvable 21795 (21796): // name: pattern:apparmor 11.0-67 i586 // vendor: SUSE LINUX Products GmbH, Nuernberg, Germany @@ -74,17 +73,17 @@ BOOST_CHECK_EQUAL(p->isDefault(), false); } if ( s.ident() == "pattern:default" ) - { + { c++; Pattern::Ptr p = asKind<Pattern>(makeResObject(s)); BOOST_CHECK(p); BOOST_CHECK_EQUAL(p->userVisible(), false); } } - + // check that we actually found all testeable // resolvables BOOST_CHECK_EQUAL(c, 2); - - + + } Modified: trunk/libzypp/zypp/Patch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Patch.cc?rev=11762&r1=11761&r2=11762&view=diff ============================================================================== --- trunk/libzypp/zypp/Patch.cc (original) +++ trunk/libzypp/zypp/Patch.cc Thu Nov 20 22:36:34 2008 @@ -9,12 +9,9 @@ /** \file zypp/Patch.cc * */ -extern "C" -{ -#include -} +#include <iostream> -#include "zypp/base/Logger.h" +#include "zypp/base/LogTools.h" #include "zypp/Patch.h" #include "zypp/sat/WhatProvides.h" Modified: trunk/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.cc?rev=11762&r1=11761&r2=11762&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Pool.cc (original) +++ trunk/libzypp/zypp/sat/Pool.cc Thu Nov 20 22:36:34 2008 @@ -10,11 +10,6 @@ * */ -extern "C" -{ -#include -#include -} #include <iostream> #include "zypp/base/Easy.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org