i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KPath: Fixed Normalize() return code, changed Leaf().

Browse Source 
* Normalize() now returns the error code that vfs_normalize_path()
  returns.
* Leaf() now returns "" instead of "/" for the root. It's not used
  outside of KPath.
* Adapted RemoveLeaf() to deal with this correctly.
* "KPath = string" no longer changes the buffer size.
* Added missing operator tests for =, ==, and !=.
This commit is contained in:
Axel Dörfler
2017-04-30 17:13:33 +02:00
parent ec407447c9
commit e1b4aed0cb
3 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/system/kernel/fs/KPathTest.cpp
+63 -5
View File
@@ -97,8 +97,7 @@ KPathTest::TestLeaf()
path.SetTo("/");
CPPUNIT_ASSERT(strcmp(path.Path(), "/") == 0);
// CPPUNIT_ASSERT(path.Leaf() == NULL);
// TODO: why '/'?
CPPUNIT_ASSERT(strcmp(path.Leaf(), "") == 0);
path.SetTo("a/b");
CPPUNIT_ASSERT(strcmp(path.Path(), "a/b") == 0);
@@ -150,19 +149,30 @@ KPathTest::TestRemoveLeaf()
path.SetTo("a//b/c");
removed = path.RemoveLeaf();
CPPUNIT_ASSERT(removed);
CPPUNIT_ASSERT_MESSAGE("1. removed", removed);
CPPUNIT_ASSERT(strcmp(path.Path(), "a//b") == 0);
CPPUNIT_ASSERT(path.Length() == 4);
removed = path.RemoveLeaf();
CPPUNIT_ASSERT(removed);
CPPUNIT_ASSERT_MESSAGE("2. removed", removed);
CPPUNIT_ASSERT(strcmp(path.Path(), "a") == 0);
CPPUNIT_ASSERT(path.Length() == 1);
removed = path.RemoveLeaf();
CPPUNIT_ASSERT(!removed);
CPPUNIT_ASSERT_MESSAGE("3. !removed", !removed);
CPPUNIT_ASSERT(strcmp(path.Path(), "a") == 0);
CPPUNIT_ASSERT(path.Length() == 1);
path.SetTo("/a");
removed = path.RemoveLeaf();
CPPUNIT_ASSERT_MESSAGE("4. removed", removed);
CPPUNIT_ASSERT(strcmp(path.Path(), "/") == 0);
CPPUNIT_ASSERT(path.Length() == 1);
removed = path.RemoveLeaf();
CPPUNIT_ASSERT_MESSAGE("5. !removed", !removed);
CPPUNIT_ASSERT(strcmp(path.Path(), "/") == 0);
CPPUNIT_ASSERT(path.Length() == 1);
}
@@ -218,9 +228,53 @@ KPathTest::TestNormalize()
}
void
KPathTest::TestAssign()
{
KPath one("first", false, 10);
CPPUNIT_ASSERT(one.Length() == 5);
KPath two("second", false, 20);
two = one;
CPPUNIT_ASSERT(strcmp(two.Path(), one.Path()) == 0);
CPPUNIT_ASSERT(two.Path() != one.Path());
CPPUNIT_ASSERT(two.BufferSize() == one.BufferSize());
CPPUNIT_ASSERT(two.Length() == one.Length());
one = "/whatever";
CPPUNIT_ASSERT(one.Length() == 9);
CPPUNIT_ASSERT(one.BufferSize() == two.BufferSize());
CPPUNIT_ASSERT(strcmp(one.Path(), "/whatever") == 0);
}
void
KPathTest::TestEquals()
{
KPath a("one");
KPath b("two");
CPPUNIT_ASSERT_MESSAGE("1.", !(a == b));
b = a;
CPPUNIT_ASSERT_MESSAGE("2.", a == b);
b = "ones";
CPPUNIT_ASSERT_MESSAGE("3.", !(a == b));
}
void
KPathTest::TestNotEquals()
{
KPath a("one");
KPath b("two");
CPPUNIT_ASSERT_MESSAGE("1.", a != b);
b = a;
CPPUNIT_ASSERT_MESSAGE("2.", !(a != b));
b = "ones";
CPPUNIT_ASSERT_MESSAGE("3.", a != b);
}
@@ -243,8 +297,12 @@ KPathTest::AddTests(BTestSuite& parent)
"KPathTest::TestDetachBuffer", &KPathTest::TestDetachBuffer));
suite.addTest(new CppUnit::TestCaller<KPathTest>(
"KPathTest::TestNormalize", &KPathTest::TestNormalize));
suite.addTest(new CppUnit::TestCaller<KPathTest>(
"KPathTest::TestAssign", &KPathTest::TestAssign));
suite.addTest(new CppUnit::TestCaller<KPathTest>(
"KPathTest::TestEquals", &KPathTest::TestEquals));
suite.addTest(new CppUnit::TestCaller<KPathTest>(
"KPathTest::TestNotEquals", &KPathTest::TestNotEquals));
parent.addTest("KPathTest", &suite);
}