Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / tests / zypp / Selectable_test.cc

diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc
index 1e02bb6..abd03a8 100644 (file)
--- a/tests/zypp/Selectable_test.cc
+++ b/tests/zypp/Selectable_test.cc
@@ -109,8 +109,8 @@ inline bool initStatus( ResStatus::TransactValue fromState, ResStatus::TransactB
 //         TRANSACT   = bit::RangeValue<TransactField,2>::value  // transact according to state
 //       };
 
-template <class TIter>
-inline bool _all( TIter begin_r, TIter end_r, ResStatus::TransactValue val_r )
+template <class _Iter>
+inline bool _all( _Iter begin_r, _Iter end_r, ResStatus::TransactValue val_r )
 {
   for_( it, begin_r, end_r )
   {
@@ -120,8 +120,8 @@ inline bool _all( TIter begin_r, TIter end_r, ResStatus::TransactValue val_r )
   return true;
 }
 
-template <class TIter>
-inline bool _none( TIter begin_r, TIter end_r, ResStatus::TransactValue val_r )
+template <class _Iter>
+inline bool _none( _Iter begin_r, _Iter end_r, ResStatus::TransactValue val_r )
 {
   for_( it, begin_r, end_r )
   {
@@ -131,8 +131,8 @@ inline bool _none( TIter begin_r, TIter end_r, ResStatus::TransactValue val_r )
   return true;
 }
 
-template <class TIter>
-inline bool _atLeastOne( TIter begin_r, TIter end_r, ResStatus::TransactValue val_r )
+template <class _Iter>
+inline bool _atLeastOne( _Iter begin_r, _Iter end_r, ResStatus::TransactValue val_r )
 { return ! _none( begin_r, end_r, val_r ); }
 
 inline bool _allBySolver( ui::Selectable::Ptr sel )
@@ -296,11 +296,11 @@ void testStatusTable( ui::Selectable::Ptr sel )
   } while ( comb.next() );
 }
 
-BOOST_AUTO_TEST_CASE(status_verify)
+BOOST_AUTO_TEST_CASE(status_change)
 {
   // this verifies the Selectables computes ui::Status
   ResPoolProxy poolProxy( test.poolProxy() );
-  ResPoolProxy::ScopedSaveState saveState( poolProxy );
+  poolProxy.saveState();
   {
     ui::Selectable::Ptr sel( poolProxy.lookup( ResKind::package, "installed_only" ) );
     BOOST_REQUIRE( !sel->installedEmpty() );
@@ -329,20 +329,3 @@ BOOST_AUTO_TEST_CASE(status_verify)
 
 /////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_TEST_CASE(pickstatus_cycle)
-{
-  return;
-  // TODO: automate it
-  ResPoolProxy poolProxy( test.poolProxy() );
-  ResPoolProxy::ScopedSaveState saveState( poolProxy );
-  ui::Selectable::Ptr sel( poolProxy.lookup( ResKind::package, "installed_and_available" ) );
-
-  USR << dump(sel) << endl;
-  for ( const PoolItem & pi : sel->picklist() )
-  {
-    (sel->pickInstall( pi, ResStatus::USER ) ? WAR : ERR) << (pi.multiversionInstall() ? "M " : "  " ) << pi << endl;
-    USR << dump(sel) << endl;
-  }
-}
-
-/////////////////////////////////////////////////////////////////////////////