summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/conf.cc37
-rw-r--r--test/conf_clear.cc23
-rw-r--r--test/libapt/configuration_test.cc78
-rw-r--r--test/libapt/makefile6
-rw-r--r--test/makefile12
5 files changed, 84 insertions, 72 deletions
diff --git a/test/conf.cc b/test/conf.cc
deleted file mode 100644
index 340647b5f..000000000
--- a/test/conf.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/error.h>
-
-using namespace std;
-
-int main(int argc,const char *argv[])
-{
- Configuration Cnf;
-
- ReadConfigFile(Cnf,argv[1],true);
-
- // Process 'simple-key' type sections
- const Configuration::Item *Top = Cnf.Tree("simple-key");
- for (Top = (Top == 0?0:Top->Child); Top != 0; Top = Top->Next)
- {
- Configuration Block(Top);
-
- string VendorID = Top->Tag;
- string FingerPrint = Block.Find("Fingerprint");
- string Name = Block.Find("Name"); // Description?
-
- if (FingerPrint.empty() == true || Name.empty() == true)
- _error->Error("Block %s is invalid",VendorID.c_str());
-
- cout << VendorID << ' ' << FingerPrint << ' ' << Name << endl;
- }
-
- // Print any errors or warnings found during parsing
- if (_error->empty() == false)
- {
- bool Errors = _error->PendingError();
- _error->DumpErrors();
- return Errors == true?100:0;
- }
-
- return 0;
-}
diff --git a/test/conf_clear.cc b/test/conf_clear.cc
deleted file mode 100644
index 259aa0f39..000000000
--- a/test/conf_clear.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/error.h>
-
-using namespace std;
-
-int main(int argc,const char *argv[])
-{
- Configuration Cnf;
-
- cout << "adding elements" << endl;
- Cnf.Set("APT::Keep-Fds::",28);
- Cnf.Set("APT::Keep-Fds::",17);
- Cnf.Set("APT::Keep-Fds::",47);
- Cnf.Dump();
-
- cout << "Removing elements" << endl;
- Cnf.Clear("APT::Keep-Fds",17);
- Cnf.Clear("APT::Keep-Fds",28);
- Cnf.Clear("APT::Keep-Fds",47);
- Cnf.Dump();
-
- return 0;
-}
diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
new file mode 100644
index 000000000..5b23d17fb
--- /dev/null
+++ b/test/libapt/configuration_test.cc
@@ -0,0 +1,78 @@
+#include <apt-pkg/configuration.h>
+
+#include <string>
+#include <vector>
+
+#include "assert.h"
+
+int main(int argc,const char *argv[]) {
+ 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");
+ 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");
+
+ Cnf.Clear("APT::Keep-Fds::2");
+ 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);
+
+ 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);
+
+ Cnf.Clear("APT::Keep-Fds","");
+ equals(Cnf.Exists("APT::Keep-Fds::2"), false);
+
+ Cnf.Clear("APT::Keep-Fds",17);
+ Cnf.Clear("APT::Keep-Fds","broken");
+ fds = Cnf.FindVector("APT::Keep-Fds");
+ equals(fds.empty(), true);
+
+ 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);
+
+ Cnf.Clear("APT::Keep-Fds");
+ fds = Cnf.FindVector("APT::Keep-Fds");
+ equals(fds.empty(), true);
+
+ 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);
+
+ //FIXME: Test for configuration file parsing;
+ // currently only integration/ tests test them implicitly
+
+ return 0;
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 87a1213c0..366907d89 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -58,3 +58,9 @@ PROGRAM = URI${BASENAME}
SLIBS = -lapt-pkg
SOURCE = uri_test.cc
include $(PROGRAM_H)
+
+# test the Configuration class
+PROGRAM = Configuration${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = configuration_test.cc
+include $(PROGRAM_H)
diff --git a/test/makefile b/test/makefile
index 5a674c42e..9fcd6a826 100644
--- a/test/makefile
+++ b/test/makefile
@@ -25,18 +25,6 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile
SOURCE = testextract.cc
include $(PROGRAM_H)
-# Program for testing the config file parser
-PROGRAM=conftest_clear
-SLIBS = -lapt-pkg
-SOURCE = conf_clear.cc
-include $(PROGRAM_H)
-
-# Program for testing the config file parser
-PROGRAM=conftest
-SLIBS = -lapt-pkg
-SOURCE = conf.cc
-include $(PROGRAM_H)
-
# Program for testing the tar/deb extractor
PROGRAM=testdeb
SLIBS = -lapt-pkg -lapt-inst