[Aptitude-svn-commit] r3685 - in branches/aptitude-0.3/aptitude: . src/generic/tests

[Daniel Burrows]

Author: dburrows
Date: Tue Jul 26 03:47:12 2005
New Revision: 3685

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/tests/test_tags.cc
Log:
Use ASSERT_EQUAL instead of ASSERT

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jul 26 03:47:12 2005
@@ -1,5 +1,10 @@
 2005-07-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/tests/test_tags.cc:
+
+	  Use ASSERT_EQUAL instead of ASSERT for equality-based tests; I
+	  hope that this prints more useful assertion-failure messages.
+
 	* src/generic/tests/main.cc:
 
 	  As I suspected, the return value of runner.run() was reversed;

Modified: branches/aptitude-0.3/aptitude/src/generic/tests/test_tags.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/tests/test_tags.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/tests/test_tags.cc	Tue Jul 26 03:47:12 2005
@@ -62,19 +62,19 @@
     tag::const_iterator ti = t.begin();
 
     CPPUNIT_ASSERT(ti != t.end());
-    CPPUNIT_ASSERT(*ti == "tag1");
+    CPPUNIT_ASSERT_EQUAL(string("tag1"), *ti);
 
     ++ti;
 
 
     CPPUNIT_ASSERT(ti != t.end());
-    CPPUNIT_ASSERT(*ti == "tag2");
+    CPPUNIT_ASSERT_EQUAL(string("tag2"), *ti);
 
     ++ti;
 
 
     CPPUNIT_ASSERT(ti != t.end());
-    CPPUNIT_ASSERT(*ti == "tag3");
+    CPPUNIT_ASSERT_EQUAL(string("tag3"), *ti);
 
     ++ti;
 
@@ -98,7 +98,7 @@
     while(*s)
       {
 	tag parsed=parseTag(*s);
-	CPPUNIT_ASSERT(parsed.str() == "tag1::tag2::tag3");
+	CPPUNIT_ASSERT_EQUAL(string("tag1::tag2::tag3"), parsed.str());
 	++s;
       }
   }
@@ -107,7 +107,7 @@
   {
     for(const char **s=basicTagEntries; *s; ++s)
       for(const char **t=basicTagEntries; *t; ++t)
-	CPPUNIT_ASSERT(parseTag(*s) == parseTag(*t));
+	CPPUNIT_ASSERT_EQUAL(parseTag(*s), parseTag(*t));
   }
 
   void testTagOrder()
@@ -116,7 +116,7 @@
       {
 	tag ps = parseTag(*s);
 
-	CPPUNIT_ASSERT(ps == ps);
+	CPPUNIT_ASSERT_EQUAL(ps, ps);
 
 	for(const char **t = s; *t; ++t)
 	  {
@@ -143,17 +143,17 @@
 	tag_list :: const_iterator i = lp.begin();
 
 	CPPUNIT_ASSERT(i != lp.end());
-	CPPUNIT_ASSERT((*i).str() == "a::b");
+	CPPUNIT_ASSERT_EQUAL(string("a::b"), (*i).str());
 
 	++i;
 
 	CPPUNIT_ASSERT(i != lp.end());
-	CPPUNIT_ASSERT((*i).str() == "c::d");
+	CPPUNIT_ASSERT_EQUAL(string("c::d"), (*i).str());
 
 	++i;
 
 	CPPUNIT_ASSERT(i != lp.end());
-	CPPUNIT_ASSERT((*i).str() == "e::f");
+	CPPUNIT_ASSERT_EQUAL(string("e::f"), (*i).str());
 
 	++i;