add default and override handling for Cnf::FindVector

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

diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc
index 707142aef9fd517a976debb86659029b43a77020..51cfecee321ed3990ccc1b7ed34fb1ba28b08bc8 100644 (file)
--- a/test/libapt/getlanguages_test.cc
+++ b/test/libapt/getlanguages_test.cc
@@ -7,13 +7,6 @@
 
 #include <iostream>
 
-// simple helper to quickly output a vector of strings
-void dumpVector(std::vector<std::string> vec) {
-       for (std::vector<std::string>::const_iterator v = vec.begin();
-            v != vec.end(); v++)
-               std::cout << *v << std::endl;
-}
-
 int main(int argc,char *argv[])
 {
        if (argc != 2) {
@@ -112,6 +105,14 @@ int main(int argc,char *argv[])
        vec = APT::Configuration::getLanguages(false, false, env);
        equals(vec.size(), 1);
        equals(vec[0], "fr");
+
+       _config->Set("Acquire::Languages", "environment,en");
+       env[0] = "de_DE.UTF-8";
+       vec = APT::Configuration::getLanguages(false, false, env);
+       equals(vec.size(), 3);
+       equals(vec[0], "de_DE");
+       equals(vec[1], "de");
+       equals(vec[2], "en");
        _config->Set("Acquire::Languages", "");
 
        _config->Set("Acquire::Languages::1", "environment");
@@ -133,13 +134,27 @@ 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(), 8);
        equals(vec[0], "de_DE");
        equals(vec[1], "de");
        equals(vec[2], "en");
        equals(vec[3], "none");
-       equals(vec[4], "pt");
-       equals(vec[5], "tr");
+       equalsOr4(vec[4], "pt", "tr", "ast_DE", "tlh_DE");
+       equalsOr4(vec[5], "tr", "pt", "ast_DE", "tlh_DE");
+       equalsOr4(vec[6], "tr", "pt", "ast_DE", "tlh_DE");
+       equalsOr4(vec[7], "tr", "pt", "ast_DE", "tlh_DE");
+       equalsNot(vec[4], vec[5]);
+       equalsNot(vec[4], vec[6]);
+       equalsNot(vec[4], vec[7]);
+       equalsNot(vec[5], vec[6]);
+       equalsNot(vec[5], vec[7]);
+       equalsNot(vec[6], vec[7]);
+
+       _config->Set("Acquire::Languages", "none");
+       vec = APT::Configuration::getLanguages(true, false, env);
+       equals(vec.size(), 1);
+       equals(vec[0], "none");
+       _config->Set("Acquire::Languages", "");
 
        _config->Set("Dir::State::lists", "/non-existing-dir");
        _config->Set("Acquire::Languages::1", "none");
@@ -162,7 +177,8 @@ int main(int argc,char *argv[])
        _config->Set("Acquire::Languages", "none");
        env[0] = "de_DE.UTF-8";
        vec = APT::Configuration::getLanguages(true, false, env);
-       equals(vec.size(), 0);
+       equals(vec.size(), 1);
+       equals(vec[0], "none");
 
        _config->Set("Acquire::Languages", "");
        //FIXME: Remove support for this deprecated setting