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

[Daniel Burrows]

Author: dburrows
Date: Tue Sep  6 18:41:00 2005
New Revision: 4052

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/tests/test_wtree.cc
Log:
Strip out some useless debugging junk and fix some thinkos.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Sep  6 18:41:00 2005
@@ -2,6 +2,11 @@
 
 	* tests/test_wtree.cc:
 
+	  Strip out some useless debugging dumps and correct some thinkos
+	  in the tests.
+
+	* tests/test_wtree.cc:
+
 	  Explicitly test commutativity of intersection.
 
 	* src/generic/immset.h, tests/test_wtree.cc:

Modified: branches/aptitude-0.3/aptitude/tests/test_wtree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_wtree.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_wtree.cc	Tue Sep  6 18:41:00 2005
@@ -886,30 +886,21 @@
     CPPUNIT_ASSERT(m1.domain_intersects(m2));
 
     m2.put(6, 5);
+
+
     CPPUNIT_ASSERT(!m1.shares_value(m2));
     CPPUNIT_ASSERT(m1.domain_intersects(m2));
     CPPUNIT_ASSERT(m1.has_related_mapping(m2, std::less<std::pair<int, int> >()));
-    CPPUNIT_ASSERT(m2.has_related_mapping(m1, std::less<std::pair<int, int> >()));
-
-    std::cerr << m1 << ":" << std::endl;
-    m1.dump(std::cerr);
-    std::cerr << m2 << ":" << std::endl;
-    m2.dump(std::cerr);
+    CPPUNIT_ASSERT(m2.has_related_mapping(m1, std::greater<std::pair<int, int> >()));
 
     m2.put(6, 0);
 
-
-    std::cerr << m1 << ":" << std::endl;
-    m1.dump(std::cerr);
-    std::cerr << m2 << ":" << std::endl;
-    m2.dump(std::cerr);
-
     CPPUNIT_ASSERT(!m1.shares_value(m2));
     CPPUNIT_ASSERT(m1.domain_intersects(m2));
     CPPUNIT_ASSERT(!m1.has_related_mapping(m2, std::less<std::pair<int, int> >()));
     CPPUNIT_ASSERT(m1.has_related_mapping(m2, std::greater<std::pair<int, int> >()));
     CPPUNIT_ASSERT(!m2.has_related_mapping(m1, std::greater<std::pair<int, int> >()));
-    CPPUNIT_ASSERT(m2.has_related_mapping(m1, std::greater<std::pair<int, int> >()));
+    CPPUNIT_ASSERT(m2.has_related_mapping(m1, std::less<std::pair<int, int> >()));
   }
 };