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

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 25 00:55:57 2005
New Revision: 3948

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
Log:
Generate more useful test failure messages.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 25 00:55:57 2005
@@ -1,5 +1,9 @@
 2005-08-24  Daniel Burrows  <dburrows at debian.org>
 
+	* tests/test_apt_universe.cc:
+
+	  Generate more useful test failure messages.
+
 	* tests/Makefile.am, tests/data:
 
 	  Add some test data so I can have well-defined tests in the

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 00:55:57 2005
@@ -75,7 +75,17 @@
 	for(aptitude_universe::dep::solver_iterator si
 	      = d.solvers_begin(); !si.end(); ++si)
 	  {
-	    CPPUNIT_ASSERT(d.solved_by(*si));
+	    if(!d.solved_by(*si))
+	      {
+		std::ostringstream out;
+
+		out << (*si).get_package().get_name() << " "
+		    << (*si).get_name()
+		    << " should solve "
+		    << d << " but doesn't.";
+
+		CPPUNIT_FAIL(out.str());
+	      }
 	    solvers.insert(*si);
 	  }
 
@@ -85,12 +95,35 @@
 		= (*pi).versions_begin(); !vi.end(); ++vi)
 	    {
 	      if(solvers.find(*vi) == solvers.end())
-		CPPUNIT_ASSERT(!d.solved_by(*vi));
+		{
+		  if(d.solved_by(*vi))
+		    {
+		      std::ostringstream out;
+
+		      out << (*vi).get_package().get_name() << " "
+			  << (*vi).get_name()
+			  << " unexpectedly solves "
+			  << d;
+
+		      CPPUNIT_FAIL(out.str());
+		    }
+		}
 	      else
 		solvers.erase(*vi);
 	    }
 
-	CPPUNIT_ASSERT(solvers.empty());
+	if(!solvers.empty())
+	  {
+	    std::ostringstream out;
+
+	    for(std::set<aptitude_universe::version>::const_iterator
+		  si = solvers.begin(); si != solvers.end(); ++si)
+	      out << "Solver " << (*si).get_package().get_name()
+		  << " " << (*si).get_name() << " of dependency "
+		  << d << " does not appear in the global list of versions!";
+
+	    CPPUNIT_FAIL(out.str());
+	  }
       }
   }
 
@@ -144,7 +177,7 @@
 		      << (*si).get_package().get_name() << " "
 		      << (*si).get_name() << " or "
 		      << (*vi).get_package().get_name() << " "
-		      << (*vi).get_name() << std::endl;
+		      << (*vi).get_name();
 		  CPPUNIT_FAIL(out.str());
 		}
 	    }