diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-02-10 18:01:50 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-02-12 14:34:33 +0100 |
| commit | 9925eeabd2a617cb45d0f0a2f1b3605f763ffd2c (patch) | |
| tree | da44e03dac702e1cd876c32304218ffb1314a403 /src/libstrongswan/tests/suites/test_settings.c | |
| parent | f4da1989cd595785a4c3e2f6effcfbb28a103377 (diff) | |
| download | strongswan-9925eeabd2a617cb45d0f0a2f1b3605f763ffd2c.tar.bz2 strongswan-9925eeabd2a617cb45d0f0a2f1b3605f763ffd2c.tar.xz | |
settings: Add support to enumerate sections and key/value pairs with fallbacks
Diffstat (limited to 'src/libstrongswan/tests/suites/test_settings.c')
| -rw-r--r-- | src/libstrongswan/tests/suites/test_settings.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c index b97a70656..096465191 100644 --- a/src/libstrongswan/tests/suites/test_settings.c +++ b/src/libstrongswan/tests/suites/test_settings.c @@ -714,14 +714,23 @@ START_TEST(test_add_fallback) verify_string("subval2", "main.sub1.key2"); verify_string("subsubval1", "main.sub1.subsub.subkey1"); - /* fallbacks currently have no effect on section & key/value enumerators */ - keys = linked_list_create_with_items(NULL); + keys = linked_list_create_with_items("sub1", NULL); + verify_sections(keys, "main"); + keys = linked_list_create_with_items("subsub", NULL); verify_sections(keys, "main.sub1"); keys = linked_list_create_with_items("key1", NULL); values = linked_list_create_with_items("val1", NULL); + verify_key_values(keys, values, "main"); + + keys = linked_list_create_with_items("key1", "key2", NULL); + values = linked_list_create_with_items("val1", "subval2", NULL); verify_key_values(keys, values, "main.sub1"); + keys = linked_list_create_with_items("subkey1", NULL); + values = linked_list_create_with_items("subsubval1", NULL); + verify_key_values(keys, values, "main.sub1.subsub"); + settings->add_fallback(settings, "main", "base"); verify_string("val1", "main.key1"); verify_string("baseval2", "main.key2"); @@ -732,18 +741,23 @@ START_TEST(test_add_fallback) verify_string("subbase3", "main.sub1.key3"); verify_string("subbase4", "main.sub2.key4"); - keys = linked_list_create_with_items(NULL); - verify_sections(keys, "main.sub1"); - keys = linked_list_create_with_items("sub1", NULL); + + keys = linked_list_create_with_items("sub1", "sub2", NULL); verify_sections(keys, "main"); + keys = linked_list_create_with_items("subsub", NULL); + verify_sections(keys, "main.sub1"); - keys = linked_list_create_with_items("key1", NULL); - values = linked_list_create_with_items("val1", NULL); + keys = linked_list_create_with_items("key1", "key2", NULL); + values = linked_list_create_with_items("val1", "baseval2", NULL); + verify_key_values(keys, values, "main"); + + keys = linked_list_create_with_items("key1", "key2", "key3", NULL); + values = linked_list_create_with_items("val1", "subval2", "subbase3", NULL); verify_key_values(keys, values, "main.sub1"); - keys = linked_list_create_with_items("key1", NULL); - values = linked_list_create_with_items("val1", NULL); - verify_key_values(keys, values, "main"); + keys = linked_list_create_with_items("subkey1", "subkey2", NULL); + values = linked_list_create_with_items("subsubval1", "subsubbaseval2", NULL); + verify_key_values(keys, values, "main.sub1.subsub"); settings->set_str(settings, "main.sub1.key2", "val2"); verify_string("val2", "main.sub1.key2"); |