denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Add support to enumerate sections and key/value pairs with fallbacks

Browse Source
This commit is contained in:
Tobias Brunner
2014-02-12 14:34:33 +01:00
parent f4da1989cd
commit 9925eeabd2
3 changed files with 188 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_settings.c
+25 -11
View File
@@ -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);
verify_sections(keys, "main");
keys = linked_list_create_with_items("key1", NULL);
values = linked_list_create_with_items("val1", 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", "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");