[Aptitude-svn-commit] r3949 - in branches/aptitude-0.3/aptitude: . tests

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 02:21:12 2005
New Revision: 3949

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Handle dependency sources correctly.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 02:21:12 2005
@@ -2,6 +2,11 @@
 
 	* tests/test_apt_universe.cc:
 
+	  Handle dependency sources correctly when testing the solver
+	  graph.
+
+	* tests/test_apt_universe.cc:
+
 	  Generate more useful test failure messages.
 
 	* tests/Makefile.am, tests/data:

Modified: branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	Thu Aug 25 02:21:12 2005
@@ -94,7 +94,35 @@
 	  for(aptitude_universe::package::version_iterator vi
 		= (*pi).versions_begin(); !vi.end(); ++vi)
 	    {
-	      if(solvers.find(*vi) == solvers.end())
+	      if((*pi) == d.get_source().get_package())
+		{
+		  if(*vi == d.get_source())
+		    {
+		      if(d.solved_by(*vi))
+			{
+			  std::ostringstream out;
+
+			  out << "Dependency source "
+			      << (*vi).get_package().get_name() << " "
+			      << (*vi).get_name()
+			      << " unexpectedly solves " << d;
+
+			  CPPUNIT_FAIL(out.str());
+			}
+		    }
+		  else if(!d.solved_by(*vi))
+		    {
+		      std::ostringstream out;
+
+		      out << "Dependency source removal "
+			  << (*vi).get_package().get_name() << " "
+			  << (*vi).get_name()
+			  << " unexpectedly doesn't solve " << d;
+
+		      CPPUNIT_FAIL(out.str());
+		    }
+		}
+	      else if(solvers.find(*vi) == solvers.end())
 		{
 		  if(d.solved_by(*vi))
 		    {