]> git.saurik.com Git - apt.git/blobdiff - test/libapt/configuration_test.cc
projects / apt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rewrite all TFRewrite instances to use the new pkgTagSection::Write
[apt.git] / test / libapt / configuration_test.cc
diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index c9235500c1beee1ba9211c6fe5342c14a070b0ee..647d8a4af6377010a55f3fa2d3c632156a3be88a 100644 (file)
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -5,135 +5,142 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 
-#include "assert.h"
+#include <gtest/gtest.h>
 
 
-int main() {
+//FIXME: Test for configuration file parsing;
+// currently only integration/ tests test them implicitly
+
+TEST(ConfigurationTest,Lists)
+{
        Configuration Cnf;
        Configuration Cnf;
-       std::vector<std::string> fds;
 
        Cnf.Set("APT::Keep-Fds::",28);
        Cnf.Set("APT::Keep-Fds::",17);
        Cnf.Set("APT::Keep-Fds::2",47);
        Cnf.Set("APT::Keep-Fds::","broken");
 
        Cnf.Set("APT::Keep-Fds::",28);
        Cnf.Set("APT::Keep-Fds::",17);
        Cnf.Set("APT::Keep-Fds::2",47);
        Cnf.Set("APT::Keep-Fds::","broken");
-       fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds[0], "28");
-       equals(fds[1], "17");
-       equals(fds[2], "47");
-       equals(fds[3], "broken");
-       equals(fds.size(), 4);
-       equals(Cnf.Exists("APT::Keep-Fds::2"), true);
-       equals(Cnf.Find("APT::Keep-Fds::2"), "47");
-       equals(Cnf.FindI("APT::Keep-Fds::2"), 47);
-       equals(Cnf.Exists("APT::Keep-Fds::3"), false);
-       equals(Cnf.Find("APT::Keep-Fds::3"), "");
-       equals(Cnf.FindI("APT::Keep-Fds::3", 56), 56);
-       equals(Cnf.Find("APT::Keep-Fds::3", "not-set"), "not-set");
+       std::vector<std::string> fds = Cnf.FindVector("APT::Keep-Fds");
+       ASSERT_EQ(4, fds.size());
+       EXPECT_EQ("28", fds[0]);
+       EXPECT_EQ("17", fds[1]);
+       EXPECT_EQ("47", fds[2]);
+       EXPECT_EQ("broken", fds[3]);
+
+       EXPECT_TRUE(Cnf.Exists("APT::Keep-Fds::2"));
+       EXPECT_EQ("47", Cnf.Find("APT::Keep-Fds::2"));
+       EXPECT_EQ(47, Cnf.FindI("APT::Keep-Fds::2"));
+       EXPECT_FALSE(Cnf.Exists("APT::Keep-Fds::3"));
+       EXPECT_EQ("", Cnf.Find("APT::Keep-Fds::3"));
+       EXPECT_EQ(56, Cnf.FindI("APT::Keep-Fds::3", 56));
+       EXPECT_EQ("not-set", Cnf.Find("APT::Keep-Fds::3", "not-set"));
 
        Cnf.Clear("APT::Keep-Fds::2");
 
        Cnf.Clear("APT::Keep-Fds::2");
+       EXPECT_TRUE(Cnf.Exists("APT::Keep-Fds::2"));
        fds = Cnf.FindVector("APT::Keep-Fds");
        fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds[0], "28");
-       equals(fds[1], "17");
-       equals(fds[2], "");
-       equals(fds[3], "broken");
-       equals(fds.size(), 4);
-       equals(Cnf.Exists("APT::Keep-Fds::2"), true);
+       ASSERT_EQ(4, fds.size());
+       EXPECT_EQ("28", fds[0]);
+       EXPECT_EQ("17", fds[1]);
+       EXPECT_EQ("", fds[2]);
+       EXPECT_EQ("broken", fds[3]);
 
        Cnf.Clear("APT::Keep-Fds",28);
        fds = Cnf.FindVector("APT::Keep-Fds");
 
        Cnf.Clear("APT::Keep-Fds",28);
        fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds[0], "17");
-       equals(fds[1], "");
-       equals(fds[2], "broken");
-       equals(fds.size(), 3);
+       ASSERT_EQ(3, fds.size());
+       EXPECT_EQ("17", fds[0]);
+       EXPECT_EQ("", fds[1]);
+       EXPECT_EQ("broken", fds[2]);
 
        Cnf.Clear("APT::Keep-Fds","");
 
        Cnf.Clear("APT::Keep-Fds","");
-       equals(Cnf.Exists("APT::Keep-Fds::2"), false);
+       EXPECT_FALSE(Cnf.Exists("APT::Keep-Fds::2"));
 
        Cnf.Clear("APT::Keep-Fds",17);
        Cnf.Clear("APT::Keep-Fds","broken");
        fds = Cnf.FindVector("APT::Keep-Fds");
 
        Cnf.Clear("APT::Keep-Fds",17);
        Cnf.Clear("APT::Keep-Fds","broken");
        fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds.empty(), true);
+       EXPECT_TRUE(fds.empty());
 
        Cnf.Set("APT::Keep-Fds::",21);
        Cnf.Set("APT::Keep-Fds::",42);
        fds = Cnf.FindVector("APT::Keep-Fds");
 
        Cnf.Set("APT::Keep-Fds::",21);
        Cnf.Set("APT::Keep-Fds::",42);
        fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds[0], "21");
-       equals(fds[1], "42");
-       equals(fds.size(), 2);
+       ASSERT_EQ(2, fds.size());
+       EXPECT_EQ("21", fds[0]);
+       EXPECT_EQ("42", fds[1]);
 
        Cnf.Clear("APT::Keep-Fds");
        fds = Cnf.FindVector("APT::Keep-Fds");
 
        Cnf.Clear("APT::Keep-Fds");
        fds = Cnf.FindVector("APT::Keep-Fds");
-       equals(fds.empty(), true);
+       EXPECT_TRUE(fds.empty());
+}
+TEST(ConfigurationTest,Integers)
+{
+       Configuration Cnf;
 
        Cnf.CndSet("APT::Version", 42);
        Cnf.CndSet("APT::Version", "66");
 
        Cnf.CndSet("APT::Version", 42);
        Cnf.CndSet("APT::Version", "66");
-       equals(Cnf.Find("APT::Version"), "42");
-       equals(Cnf.FindI("APT::Version"), 42);
-       equals(Cnf.Find("APT::Version", "33"), "42");
-       equals(Cnf.FindI("APT::Version", 33), 42);
-       equals(Cnf.Find("APT2::Version", "33"), "33");
-       equals(Cnf.FindI("APT2::Version", 33), 33);
-
-       equals(Cnf.FindFile("Dir::State"), "");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "");
+       EXPECT_EQ("42", Cnf.Find("APT::Version"));
+       EXPECT_EQ(42, Cnf.FindI("APT::Version"));
+       EXPECT_EQ("42", Cnf.Find("APT::Version", "33"));
+       EXPECT_EQ(42, Cnf.FindI("APT::Version", 33));
+       EXPECT_EQ("33", Cnf.Find("APT2::Version", "33"));
+       EXPECT_EQ(33, Cnf.FindI("APT2::Version", 33));
+}
+TEST(ConfigurationTest,DirsAndFiles)
+{
+       Configuration Cnf;
+
+       EXPECT_EQ("", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("", Cnf.FindFile("Dir::Aptitude::State"));
        Cnf.Set("Dir", "/srv/sid");
        Cnf.Set("Dir", "/srv/sid");
-       equals(Cnf.FindFile("Dir::State"), "");
+       EXPECT_EQ("", Cnf.FindFile("Dir::State"));
        Cnf.Set("Dir::State", "var/lib/apt");
        Cnf.Set("Dir::Aptitude::State", "var/lib/aptitude");
        Cnf.Set("Dir::State", "var/lib/apt");
        Cnf.Set("Dir::Aptitude::State", "var/lib/aptitude");
-       equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+       EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 
        Cnf.Set("RootDir", "/");
 
        Cnf.Set("RootDir", "/");
-       equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+       EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
        Cnf.Set("RootDir", "//./////.////");
        Cnf.Set("RootDir", "//./////.////");
-       equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+       EXPECT_EQ("/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
        Cnf.Set("RootDir", "/rootdir");
        Cnf.Set("RootDir", "/rootdir");
-       equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude");
+       EXPECT_EQ("/rootdir/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("/rootdir/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
        Cnf.Set("RootDir", "/rootdir/");
        Cnf.Set("RootDir", "/rootdir/");
-       equals(Cnf.FindFile("Dir::State"), "/rootdir/srv/sid/var/lib/apt");
-       equals(Cnf.FindFile("Dir::Aptitude::State"), "/rootdir/srv/sid/var/lib/aptitude");
+       EXPECT_EQ("/rootdir/srv/sid/var/lib/apt", Cnf.FindFile("Dir::State"));
+       EXPECT_EQ("/rootdir/srv/sid/var/lib/aptitude", Cnf.FindFile("Dir::Aptitude::State"));
 
        Cnf.Set("Dir::State", "/dev/null");
        Cnf.Set("Dir::State::lists", "lists/");
 
        Cnf.Set("Dir::State", "/dev/null");
        Cnf.Set("Dir::State::lists", "lists/");
-       equals(Cnf.FindDir("Dir::State"), "/rootdir/dev/null");
-       equals(Cnf.FindDir("Dir::State::lists"), "/rootdir/dev/null");
-
-       Cnf.Set("Moo::Bar", "1");
-       Cnf.Clear();
-       equals(Cnf.Find("Moo::Bar"), "");
+       EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State"));
+       EXPECT_EQ("/rootdir/dev/null", Cnf.FindDir("Dir::State::lists"));
+}
+TEST(ConfigurationTest,Vector)
+{
+       Configuration Cnf;
 
        std::vector<std::string> vec = Cnf.FindVector("Test::Vector", "");
 
        std::vector<std::string> vec = Cnf.FindVector("Test::Vector", "");
-       equals(vec.size(), 0);
+       EXPECT_EQ(0, vec.size());
        vec = Cnf.FindVector("Test::Vector", "foo");
        vec = Cnf.FindVector("Test::Vector", "foo");
-       equals(vec.size(), 1);
-       equals(vec[0], "foo");
+       ASSERT_EQ(1, vec.size());
+       EXPECT_EQ("foo", vec[0]);
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
-       equals(vec.size(), 2);
-       equals(vec[0], "foo");
-       equals(vec[1], "bar");
+       EXPECT_EQ(2, vec.size());
+       EXPECT_EQ("foo", vec[0]);
+       EXPECT_EQ("bar", vec[1]);
        Cnf.Set("Test::Vector::", "baz");
        Cnf.Set("Test::Vector::", "bob");
        Cnf.Set("Test::Vector::", "dob");
        vec = Cnf.FindVector("Test::Vector");
        Cnf.Set("Test::Vector::", "baz");
        Cnf.Set("Test::Vector::", "bob");
        Cnf.Set("Test::Vector::", "dob");
        vec = Cnf.FindVector("Test::Vector");
-       equals(vec.size(), 3);
-       equals(vec[0], "baz");
-       equals(vec[1], "bob");
-       equals(vec[2], "dob");
+       ASSERT_EQ(3, vec.size());
+       EXPECT_EQ("baz", vec[0]);
+       EXPECT_EQ("bob", vec[1]);
+       EXPECT_EQ("dob", vec[2]);
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
-       equals(vec.size(), 3);
-       equals(vec[0], "baz");
-       equals(vec[1], "bob");
-       equals(vec[2], "dob");
+       ASSERT_EQ(3, vec.size());
+       EXPECT_EQ("baz", vec[0]);
+       EXPECT_EQ("bob", vec[1]);
+       EXPECT_EQ("dob", vec[2]);
        Cnf.Set("Test::Vector", "abel,bravo");
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
        Cnf.Set("Test::Vector", "abel,bravo");
        vec = Cnf.FindVector("Test::Vector", "foo,bar");
-       equals(vec.size(), 2);
-       equals(vec[0], "abel");
-       equals(vec[1], "bravo");
-
-       //FIXME: Test for configuration file parsing;
-       // currently only integration/ tests test them implicitly
-
-       return 0;
+       ASSERT_EQ(2, vec.size());
+       EXPECT_EQ("abel", vec[0]);
+       EXPECT_EQ("bravo", vec[1]);
 }
 }
APT (for Cydia)