merged lp:~donkult/apt/experimental

7 files changed, 43 insertions, 9 deletions

diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index fae9b6c64..a07be4b57 100644
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -26,6 +26,18 @@ void assertEquals(int const &expect, unsigned int const &get, unsigned long cons
 	assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
 }
 
+void assertEquals(unsigned long const &expect, int const &get, unsigned long const &line) {
+	if (get < 0)
+		OutputAssertEqual(expect, "==", get, line);
+	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
+void assertEquals(int const &expect, unsigned long const &get, unsigned long const &line) {
+	if (expect < 0)
+		OutputAssertEqual(expect, "==", get, line);
+	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
 
 #define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
 
@@ -54,6 +66,21 @@ void assertEqualsOr2(int const &expect1, int const &expect2, unsigned int const
 }
 
 
+#define equalsOr3(w,x,y,z) assertEqualsOr3(x, y, z, w, __LINE__)
+
+template < typename X, typename Y >
+void OutputAssertEqualOr3(X expect1, X expect2, X expect3, char const* compare, Y get, unsigned long const &line) {
+	std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 << "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl;
+}
+
+template < typename X, typename Y >
+void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) {
+	if (expect1 == get || expect2 == get || expect3 == get)
+		return;
+	OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
+}
+
+
 // simple helper to quickly output a vectors
 template < typename X >
 void dumpVector(X vec) {
diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc
index f6aa7a697..a1c801ea2 100644
--- a/test/libapt/getlanguages_test.cc
+++ b/test/libapt/getlanguages_test.cc
@@ -126,13 +126,19 @@ int main(int argc,char *argv[])
 
 	_config->Set("Dir::State::lists", argv[1]);
 	vec = APT::Configuration::getLanguages(true, false, env);
-	equals(vec.size(), 6);
+	equals(vec.size(), 7);
 	equals(vec[0], "de_DE");
 	equals(vec[1], "de");
 	equals(vec[2], "en");
 	equals(vec[3], "none");
-	equalsOr2(vec[4], "pt", "tr");
-	equalsOr2(vec[5], "tr", "pt");
+	equalsOr3(vec[4], "pt", "tr", "ast_DE");
+	equalsOr3(vec[5], "tr", "pt", "ast_DE");
+	equalsOr3(vec[6], "tr", "pt", "ast_DE");
+
+	_config->Set("Acquire::Languages", "none");
+	vec = APT::Configuration::getLanguages(true, false, env);
+	equals(vec.size(), 0);
+	_config->Set("Acquire::Languages", "");
 
 	_config->Set("Dir::State::lists", "/non-existing-dir");
 	_config->Set("Acquire::Languages::1", "none");
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc
index 5ee014cca..b2c95e840 100644
--- a/test/libapt/getlistoffilesindir_test.cc
+++ b/test/libapt/getlistoffilesindir_test.cc
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <iostream>
 
-#define P(x)	string(argv[1]).append("/").append(x)
+#define P(x)	std::string(argv[1]).append("/").append(x)
 
 int main(int argc,char *argv[])
 {
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index 2cb71cc38..396e4cf6b 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
    equals(sha2.VerifyFile(argv[1]), true);
    }
    {
-   HashString sha2("SHA256:"+string(argv[4]));
+   HashString sha2("SHA256:" + std::string(argv[4]));
    equals(sha2.VerifyFile(argv[1]), true);
    }
 
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index 7b496878d..b5d92d9d2 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -4,8 +4,8 @@
 #include "assert.h"
 
 int main(int argc,char *argv[]) {
-	string Package;
-	string Version;
+	std::string Package;
+	std::string Version;
 	unsigned int Op = 5;
 	unsigned int Null = 0;
 	bool StripMultiArch = true;
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 8cb2e049c..ada2dc38b 100755
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -64,7 +64,8 @@ do
 		touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \
 			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
 			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
-			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak"
+			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \
+			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE"
 	elif [ $name = "HashSums${EXT}" ]; then
 		TMP="$(mktemp)"
 		dmesg > $TMP
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index af6eb2cc6..bfe0d7222 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -4,7 +4,7 @@
 
 int main(int argc,char *argv[])
 {
-   string input, output, expected;
+   std::string input, output, expected;
 
    // no input
    input = "foobar";