Merge 0.9->trunk

[prosody.git] / tests / test_core_configmanager.lua

diff --git a/tests/test_core_configmanager.lua b/tests/test_core_configmanager.lua
index 132dfc7456bd98360556bf3c4ec52328c6f908e4..d79199658eace9f21aff6181de872afea36600ea 100644 (file)
--- a/tests/test_core_configmanager.lua
+++ b/tests/test_core_configmanager.lua
@@ -9,27 +9,23 @@
 
 
 function get(get, config)
-       config.set("example.com", "test", "testkey", 123);
-       assert_equal(get("example.com", "test", "testkey"), 123, "Retrieving a set key");
+       config.set("example.com", "testkey", 123);
+       assert_equal(get("example.com", "testkey"), 123, "Retrieving a set key");
 
-       config.set("*", "test", "testkey1", 321);
-       assert_equal(get("*", "test", "testkey1"), 321, "Retrieving a set global key");
-       assert_equal(get("example.com", "test", "testkey1"), 321, "Retrieving a set key of undefined host, of which only a globally set one exists");
+       config.set("*", "testkey1", 321);
+       assert_equal(get("*", "testkey1"), 321, "Retrieving a set global key");
+       assert_equal(get("example.com", "testkey1"), 321, "Retrieving a set key of undefined host, of which only a globally set one exists");
        
-       config.set("example.com", "test", ""); -- Creates example.com host in config
-       assert_equal(get("example.com", "test", "testkey1"), 321, "Retrieving a set key, of which only a globally set one exists");
+       config.set("example.com", ""); -- Creates example.com host in config
+       assert_equal(get("example.com", "testkey1"), 321, "Retrieving a set key, of which only a globally set one exists");
        
        assert_equal(get(), nil, "No parameters to get()");
        assert_equal(get("undefined host"), nil, "Getting for undefined host");
-       assert_equal(get("undefined host", "undefined section"), nil, "Getting for undefined host & section");
-       assert_equal(get("undefined host", "undefined section", "undefined key"), nil, "Getting for undefined host & section & key");
-
-       assert_equal(get("example.com", "undefined section", "testkey"), nil, "Defined host, undefined section");
+       assert_equal(get("undefined host", "undefined key"), nil, "Getting for undefined host & key");
 end
 
 function set(set, u)
-       assert_equal(set("*"), false, "Set with no section/key");
-       assert_equal(set("*", "set_test"), false, "Set with no key");
+       assert_equal(set("*"), false, "Set with no key");
 
        assert_equal(set("*", "set_test", "testkey"), true, "Setting a nil global value");
        assert_equal(set("*", "set_test", "testkey", 123), true, "Setting a global value");