Author: schubi2 Date: Fri Apr 18 18:41:03 2008 New Revision: 9712 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9712&view=rev Log: added testcases for resolverqueue Added: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/delete-1-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/queue/installOneOf-1-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/queue/lock-1-test.xml trunk/libzypp-testsuite/solver/data.deptestomatic/queue/udpate-1-test.xml Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/install-packages.xml.gz trunk/libzypp-testsuite/solver/src/deptestomatic.cc Added: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/delete-1-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/queue/delete-1-test.xml?rev=9712&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/queue/delete-1-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/queue/delete-1-test.xml Fri Apr 18 18:41:03 2008 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<test> +<setup> + <system file="exercise-1-system.xml.gz"/> + <channel name="test" file="install-packages.xml.gz"/> +</setup> +<trial> + <addQueueDelete name="F"/> +</trial> +</test> Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/install-packages.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/queue/install-packages.xml.gz?rev=9712&r1=9711&r2=9712&view=diff ============================================================================== Binary files - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/installOneOf-1-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/queue/installOneOf-1-test.xml?rev=9712&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/queue/installOneOf-1-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/queue/installOneOf-1-test.xml Fri Apr 18 18:41:03 2008 @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<test> +<setup> + <system file="exercise-1-system.xml.gz"/> + <channel name="test" file="install-packages.xml.gz"/> +</setup> +<trial> + <addQueueInstallOneOf> + <item package="A"/> + </addQueueInstallOneOf> +</trial> +</test> Added: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/lock-1-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/queue/lock-1-test.xml?rev=9712&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/queue/lock-1-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/queue/lock-1-test.xml Fri Apr 18 18:41:03 2008 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<test> +<setup> + <system file="exercise-1-system.xml.gz"/> + <channel name="test" file="install-packages.xml.gz"/> +</setup> +<trial> + <addQueueLock package="F"/> +</trial> +</test> Added: trunk/libzypp-testsuite/solver/data.deptestomatic/queue/udpate-1-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/queue/udpate-1-test.xml?rev=9712&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/queue/udpate-1-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/queue/udpate-1-test.xml Fri Apr 18 18:41:03 2008 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<test> +<setup> + <system file="exercise-1-system.xml.gz"/> + <channel name="test" file="install-packages.xml.gz"/> +</setup> +<trial> + <addQueueUpdate package="F"/> +</trial> +</test> Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=9712&r1=9711&r2=9712&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Fri Apr 18 18:41:03 2008 @@ -1160,14 +1160,118 @@ } } else if (node->equals ("addQueueInstall")) { string name = node->getProp ("name"); + string soft = node->getProp ("soft"); if (name.empty()) { cerr << "addQueueInstall need 'name' parameter" << endl; return; } - zypp::solver::detail::SolverQueueItemInstall_Ptr install = new zypp::solver::detail::SolverQueueItemInstall(pool, name); + zypp::solver::detail::SolverQueueItemInstall_Ptr install = + new zypp::solver::detail::SolverQueueItemInstall(pool, name, (soft.empty() ? false : true)); solverQueue.push_back (install); + } else if (node->equals ("addQueueDelete")) { + string name = node->getProp ("name"); + string soft = node->getProp ("soft"); + + if (name.empty()) + { + cerr << "addQueueDelete need 'name' parameter" << endl; + return; + } + zypp::solver::detail::SolverQueueItemDelete_Ptr del = + new zypp::solver::detail::SolverQueueItemDelete(pool, name, (soft.empty() ? false : true)); + solverQueue.push_back (del); + } else if (node->equals ("addQueueLock")) { + string soft = node->getProp ("soft"); + string kind_name = node->getProp ("kind"); + string name = node->getProp ("name"); + if (name.empty()) + name = node->getProp ("package"); + + string source_alias = node->getProp ("channel"); + if (source_alias.empty()) + source_alias = "@System"; + + if (name.empty()) + { + cerr << "transact need 'name' parameter" << endl; + return; + } + + PoolItem poolItem = get_poolItem( source_alias, name, kind_name ); + if (poolItem) { + zypp::solver::detail::SolverQueueItemLock_Ptr lock = + new zypp::solver::detail::SolverQueueItemLock(pool, poolItem, (soft.empty() ? false : true)); + solverQueue.push_back (lock); + } + else { + cerr << "Unknown item " << source_alias << "::" << name << endl; + } + } else if (node->equals ("addQueueUpdate")) { + string kind_name = node->getProp ("kind"); + string name = node->getProp ("name"); + if (name.empty()) + name = node->getProp ("package"); + + string source_alias = node->getProp ("channel"); + if (source_alias.empty()) + source_alias = "@System"; + + if (name.empty()) + { + cerr << "transact need 'name' parameter" << endl; + return; + } + + PoolItem poolItem = get_poolItem( source_alias, name, kind_name ); + if (poolItem) { + zypp::solver::detail::SolverQueueItemUpdate_Ptr lock = + new zypp::solver::detail::SolverQueueItemUpdate(pool, poolItem); + solverQueue.push_back (lock); + } + else { + cerr << "Unknown item " << source_alias << "::" << name << endl; + } + } else if (node->equals ("addQueueInstallOneOf")) { + XmlNode_Ptr requestNode = node->children(); + zypp::solver::detail::PoolItemList poolItemList; + while (requestNode) { + if (requestNode->equals("item")) { + string kind_name = requestNode->getProp ("kind"); + string name = requestNode->getProp ("name"); + if (name.empty()) + name = requestNode->getProp ("package"); + + string source_alias = requestNode->getProp ("channel"); + if (source_alias.empty()) + source_alias = "@System"; + + if (name.empty()) + { + cerr << "transact need 'name' parameter" << endl; + } else { + PoolItem poolItem = get_poolItem( source_alias, name, kind_name ); + if (poolItem) { + poolItemList.push_back(poolItem); + } + else { + cerr << "Unknown item " << source_alias << "::" << name << endl; + } + } + } else { + cerr << "addQueueInstallOneOf: cannot find flag 'item'" << endl; + } + requestNode = requestNode->next(); + } + if (poolItemList.empty()) { + cerr << "addQueueInstallOneOf has an empty list" << endl; + return; + } else { + zypp::solver::detail::SolverQueueItemInstallOneOf_Ptr install = + new zypp::solver::detail::SolverQueueItemInstallOneOf(pool, poolItemList); + solverQueue.push_back (install); + } } else if (node->equals ("createTestcase")) { string path = node->getProp ("path"); if (path.empty()) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org