X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ftests_filesystem%2Ftest_filename.cpp;h=6fa80759ceac3b118a564f0ab4a5a9697a3b3e7c;hb=2124f07354cd4e237acb129c536ec8af53b8cbd8;hp=20c642922737fc70a06203a512c664885534e538;hpb=7694650f42a2ceb801896662dbd531097fc11758;p=feisty_meow.git diff --git a/nucleus/library/tests_filesystem/test_filename.cpp b/nucleus/library/tests_filesystem/test_filename.cpp index 20c64292..6fa80759 100644 --- a/nucleus/library/tests_filesystem/test_filename.cpp +++ b/nucleus/library/tests_filesystem/test_filename.cpp @@ -59,12 +59,14 @@ int test_filename::execute() astring GROUP = "separate-- "; filename turkey("/omega/ralph/turkey/buzzard.txt"); string_array pieces; - turkey.separate(pieces); - ASSERT_TRUE(pieces[1].equal_to("omega"), GROUP + "the first piece didn't match."); - ASSERT_TRUE(pieces[2].equal_to("ralph"), GROUP + "the second piece didn't match."); - ASSERT_TRUE(pieces[3].equal_to("turkey"), GROUP + "the third piece didn't match."); - ASSERT_TRUE(pieces[4].equal_to("buzzard.txt"), GROUP + "the fourth piece didn't match."); - ASSERT_EQUAL(pieces.length(), 5, GROUP + "the list was the wrong length"); + 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."); + ASSERT_TRUE(pieces[3].equal_to("buzzard.txt"), GROUP + "the fourth piece didn't match."); + ASSERT_EQUAL(pieces.length(), 4, GROUP + "the list was the wrong length"); } { @@ -257,7 +259,7 @@ int test_filename::execute() filename test17("r/"); ASSERT_EQUAL(test17, astring("r\\"), GROUP + "test 17 failed"); filename test18("/kr/soop"); - ASSERT_EQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed"); + ASSERT_NOT_EQUAL(test18, astring("\\kr\\soop"), GROUP + "test 18 failed"); } #endif