[paludis-commits] r4565 - in trunk: . paludis

[dleverton at svn.pioto.org]

Author: dleverton
Date: 2008-04-15 18:34:46 +0000 (Tue, 15 Apr 2008)
New Revision: 4565

Modified:
   trunk/ChangeLog
   trunk/paludis/set_file_TEST.cc
   trunk/paludis/set_file_TEST_setup.sh
Log:
Add some more tests.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-15 16:00:31 UTC (rev 4564)
+++ trunk/ChangeLog	2008-04-15 18:34:46 UTC (rev 4565)
@@ -7,6 +7,10 @@
 
 2008-04-15 David Leverton
 
+	* paludis/: Add some more tests.
+
+2008-04-15 David Leverton
+
 	* paludis/, doc/configuration/: Support set names in .conf sets.
 
 2008-04-13 David Leverton

Modified: trunk/paludis/set_file_TEST.cc
===================================================================
--- trunk/paludis/set_file_TEST.cc	2008-04-15 16:00:31 UTC (rev 4564)
+++ trunk/paludis/set_file_TEST.cc	2008-04-15 18:34:46 UTC (rev 4565)
@@ -143,15 +143,17 @@
             {
                 SetSpecStringifier p;
                 f.contents()->accept(p);
-                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 ) ");
+                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 set ) ");
             }
 
             f.add("foo/bar");
             f.add("moo/oink");
+            f.add("settee");
+            f.add("couch");
             {
                 SetSpecStringifier p;
                 f.contents()->accept(p);
-                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 moo/oink ) ");
+                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 set moo/oink couch ) ");
             }
 
             f.rewrite();
@@ -160,16 +162,17 @@
                 std::ifstream ff("set_file_TEST_dir/paludisconf1");
                 TEST_CHECK(ff);
                 std::string g((std::istreambuf_iterator<char>(ff)), std::istreambuf_iterator<char>());
-                TEST_CHECK_EQUAL(g, "# this is a comment\n\n? foo/bar\n* >=bar/baz-1.23\n\n# the end\n* moo/oink\n");
+                TEST_CHECK_EQUAL(g, "# this is a comment\n\n? foo/bar\n* >=bar/baz-1.23\n\n* set\n? settee\n\n# the end\n* moo/oink\n* couch\n");
             }
 
             f.remove(">=bar/baz-1.23");
             f.remove("bar/cow");
+            f.remove("set");
 
             {
                 SetSpecStringifier p;
                 f.contents()->accept(p);
-                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( moo/oink ) ");
+                TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( moo/oink couch ) ");
             }
 
             f.rewrite();
@@ -178,7 +181,7 @@
                 std::ifstream ff("set_file_TEST_dir/paludisconf1");
                 TEST_CHECK(ff);
                 std::string g((std::istreambuf_iterator<char>(ff)), std::istreambuf_iterator<char>());
-                TEST_CHECK_EQUAL(g, "# this is a comment\n\n? foo/bar\n\n# the end\n* moo/oink\n");
+                TEST_CHECK_EQUAL(g, "# this is a comment\n\n? foo/bar\n\n? settee\n\n# the end\n* moo/oink\n* couch\n");
             }
         }
 

Modified: trunk/paludis/set_file_TEST_setup.sh
===================================================================
--- trunk/paludis/set_file_TEST_setup.sh	2008-04-15 16:00:31 UTC (rev 4564)
+++ trunk/paludis/set_file_TEST_setup.sh	2008-04-15 18:34:46 UTC (rev 4565)
@@ -19,6 +19,9 @@
 ? foo/bar
   * >=bar/baz-1.23
 
+* set
+? settee
+
   # the end
 END