a bunch of cleaning to get wayward unit tests passing on windows. not there yet.

[feisty_meow.git] / nucleus / library / tests_filesystem / test_filename.cpp

diff --git a/nucleus/library/tests_filesystem/test_filename.cpp b/nucleus/library/tests_filesystem/test_filename.cpp
index e237777788847890d54eaa60eeffee91fa797de7..c91c032040563061ab02b025d1913ae7f220be77 100644 (file)
--- a/nucleus/library/tests_filesystem/test_filename.cpp
+++ b/nucleus/library/tests_filesystem/test_filename.cpp
@@ -59,7 +59,9 @@ int test_filename::execute()
     astring GROUP = "separate-- ";
     filename turkey("/omega/ralph/turkey/buzzard.txt");
     string_array pieces;
-    turkey.separate(pieces);
+    bool rooted;
+    turkey.separate(rooted, pieces);
+    ASSERT_TRUE(rooted, GROUP + "the rooted value is erreonous.");
     ASSERT_TRUE(pieces[0].equal_to("omega"), GROUP + "the first piece didn't match.");
     ASSERT_TRUE(pieces[1].equal_to("ralph"), GROUP + "the second piece didn't match.");
     ASSERT_TRUE(pieces[2].equal_to("turkey"), GROUP + "the third piece didn't match.");
@@ -222,7 +224,7 @@ int test_filename::execute()
   {
     // eighth test group is only for windows side.
 //hmmm: might be nice to get the build machine launching this on a windows vm.
-    astring GROUP = "eighth: cygwin and msys paths";
+    astring GROUP = "eighth: cygwin and msys paths ";
     filename test1("/cygdrive/q/marbles");
     ASSERT_EQUAL(test1, astring("q:\\marbles"), GROUP + "test 1 failed");
     filename test2("/cygdrive/r");
@@ -251,13 +253,13 @@ int test_filename::execute()
     filename test14("/r/");
     ASSERT_EQUAL(test14, astring("r:\\"), GROUP + "test 14 failed");
     filename test15("/r");
-    ASSERT_EQUAL(test15, astring("r:"), GROUP + "test 15 failed");
+    ASSERT_EQUAL(test15, astring("r:\\"), GROUP + "test 15 failed");
     filename test16("/");
     ASSERT_EQUAL(test16, astring("\\"), GROUP + "test 16 failed");
     filename test17("r/");
     ASSERT_EQUAL(test17, astring("r\\"), GROUP + "test 17 failed");
     filename test18("/kr/soop");
-    ASSERT_NOT_EQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed");
+    ASSERT_EQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed");
   }
 #endif