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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 00:10:58 2005
New Revision: 3855

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_resolver.cc
Log:
Don't crash in the solution test.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 00:10:58 2005
@@ -1,5 +1,9 @@
 2005-08-15  Daniel Burrows  <dburrows at debian.org>
 
+	* tests/test_resolver.cc:
+
+	  Fix several outright crashes in the solution test.
+
 	* src/generic/problemresolver/test1.txt, src/generic/problemresolver/test3.txt:
 
 	  Fix the test cases for the new solution formats.

Modified: branches/aptitude-0.3/aptitude/tests/test_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_resolver.cc	Tue Aug 16 00:10:58 2005
@@ -156,39 +156,39 @@
     dummy_solution s1(&a1, &a1+1, s0,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
-		      s1.get_broken(),
+		      s0.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);
     dummy_solution s2(&a2, &a2+1, s0,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
-		      s1.get_broken(),
+		      s0.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);
     dummy_solution s3(&a3, &a3+1, s0,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
-		      s1.get_broken(),
+		      s0.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);
     dummy_solution s4(&a4, &a4+1, s0,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
-		      s1.get_broken(),
+		      s0.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);
 
     // the following two should be equal.
-    dummy_solution s5(&a3, &a3+1, s1,
+    dummy_solution s5(&a4, &a4+1, s1,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
 		      s1.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);
-    dummy_solution s6(&a1, &a1+1, s3,
+    dummy_solution s6(&a1, &a1+1, s4,
 		      (dummy_universe::dep *) 0,
 		      (dummy_universe::dep *) 0,
-		      s1.get_broken(),
+		      s4.get_broken(),
 		      dummy_end_iterator<dummy_universe::version>(),
 		      0, 0);