encode UTF-8 characters correctly in QuoteString

[apt.git] / test / libapt / configuration_test.cc

diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 647d8a4af6377010a55f3fa2d3c632156a3be88a..6300b5256378d56846478173af67995f602c260c 100644 (file)
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -144,3 +144,20 @@ TEST(ConfigurationTest,Vector)
        EXPECT_EQ("abel", vec[0]);
        EXPECT_EQ("bravo", vec[1]);
 }
+TEST(ConfigurationTest,Merge)
+{
+       Configuration Cnf;
+       Cnf.Set("Binary::apt::option::foo", "bar");
+       Cnf.Set("option::foo", "foo");
+
+       Cnf.MoveSubTree("Binary::apt", "Binary::apt2");
+       EXPECT_FALSE(Cnf.Exists("Binary::apt::option"));
+       EXPECT_TRUE(Cnf.Exists("option"));
+       EXPECT_EQ("foo", Cnf.Find("option::foo"));
+       EXPECT_EQ("bar", Cnf.Find("Binary::apt2::option::foo"));
+
+       Cnf.MoveSubTree("Binary::apt2", NULL);
+       EXPECT_FALSE(Cnf.Exists("Binary::apt2::option"));
+       EXPECT_TRUE(Cnf.Exists("option"));
+       EXPECT_EQ("bar", Cnf.Find("option::foo"));
+}