X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c3ded84c6f99bda4caf63c8662416ffb0189d31b..c21dab6848cbe90736a998cbec8050fdf5110dd7:/test/libapt/configuration_test.cc

diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 6300b5256..bdc17cbf4 100644
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -112,6 +112,34 @@ TEST(ConfigurationTest,DirsAndFiles)
 	EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State"));
 	EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State::lists"));
 }
+TEST(ConfigurationTest,DevNullInPaths)
+{
+	Configuration Cnf;
+	EXPECT_EQ("", Cnf.FindFile("Dir"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::State::status"));
+	Cnf.Set("Dir::State", "/dev/null");
+	EXPECT_EQ("/dev/null", Cnf.FindFile("Dir::State"));
+	Cnf.Set("Dir", "/");
+	Cnf.Set("Dir::State::status", "status");
+	EXPECT_EQ("/dev/null", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/dev/null", Cnf.FindFile("Dir::State::status"));
+	Cnf.Set("Dir::State", "");
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/status", Cnf.FindFile("Dir::State::status"));
+	Cnf.Set("Dir", "/dev/null");
+	EXPECT_EQ("/dev/null", Cnf.FindFile("Dir"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/dev/null", Cnf.FindFile("Dir::State::status"));
+	Cnf.Set("Dir", "/rootdir");
+	EXPECT_EQ("/rootdir", Cnf.FindFile("Dir"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/rootdir/status", Cnf.FindFile("Dir::State::status"));
+	Cnf.Set("Dir::State::status", "/foo/status");
+	EXPECT_EQ("/rootdir", Cnf.FindFile("Dir"));
+	EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+	EXPECT_EQ("/foo/status", Cnf.FindFile("Dir::State::status"));
+}
 TEST(ConfigurationTest,Vector)
 {
 	Configuration Cnf;
@@ -148,6 +176,7 @@ TEST(ConfigurationTest,Merge)
 {
 	Configuration Cnf;
 	Cnf.Set("Binary::apt::option::foo", "bar");
+	Cnf.Set("Binary::apt::option::empty", "");
 	Cnf.Set("option::foo", "foo");
 
 	Cnf.MoveSubTree("Binary::apt", "Binary::apt2");
@@ -156,8 +185,13 @@ TEST(ConfigurationTest,Merge)
 	EXPECT_EQ("foo", Cnf.Find("option::foo"));
 	EXPECT_EQ("bar", Cnf.Find("Binary::apt2::option::foo"));
 
+	EXPECT_FALSE(Cnf.Exists("option::empty"));
+	EXPECT_TRUE(Cnf.Exists("Binary::apt2::option::empty"));
+	Cnf.Set("option::empty", "not");
+
 	Cnf.MoveSubTree("Binary::apt2", NULL);
 	EXPECT_FALSE(Cnf.Exists("Binary::apt2::option"));
 	EXPECT_TRUE(Cnf.Exists("option"));
 	EXPECT_EQ("bar", Cnf.Find("option::foo"));
+	EXPECT_EQ("", Cnf.Find("option::empty"));
 }