diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-03-16 18:10:47 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-03-16 18:10:47 (GMT) |
commit | 4a7ff5e95203af8379c8ffe3fdf133714ecbadef (patch) | |
tree | d6d7609aaac3031e23289800f60933e79ec583a5 /lib/tests/test_ini.c | |
parent | 92b969e2391936cbb66a8f547a77f94f05430419 (diff) | |
download | monitoring-plugins-4a7ff5e95203af8379c8ffe3fdf133714ecbadef.tar.gz |
Add tests:
- DOS-newline ini file
- section defined twice
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1951 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib/tests/test_ini.c')
-rw-r--r-- | lib/tests/test_ini.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c index 9031f7f..8474927 100644 --- a/lib/tests/test_ini.c +++ b/lib/tests/test_ini.c | |||
@@ -34,12 +34,15 @@ char* | |||
34 | list2str(np_arg_list *optlst) | 34 | list2str(np_arg_list *optlst) |
35 | { | 35 | { |
36 | char *optstr=NULL; | 36 | char *optstr=NULL; |
37 | np_arg_list *optltmp; | ||
37 | 38 | ||
38 | /* Put everything as a space-separated string */ | 39 | /* Put everything as a space-separated string */ |
39 | asprintf(&optstr, ""); | 40 | asprintf(&optstr, ""); |
40 | while (optlst) { | 41 | while (optlst) { |
41 | asprintf(&optstr, "%s%s ", optstr, optlst->arg); | 42 | asprintf(&optstr, "%s%s ", optstr, optlst->arg); |
43 | optltmp=optlst; | ||
42 | optlst=optlst->next; | 44 | optlst=optlst->next; |
45 | free(optltmp); | ||
43 | } | 46 | } |
44 | /* Strip last whitespace */ | 47 | /* Strip last whitespace */ |
45 | if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0'; | 48 | if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0'; |
@@ -52,7 +55,7 @@ main (int argc, char **argv) | |||
52 | { | 55 | { |
53 | char *optstr=NULL; | 56 | char *optstr=NULL; |
54 | 57 | ||
55 | plan_tests(10); | 58 | plan_tests(12); |
56 | 59 | ||
57 | optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk")); | 60 | optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk")); |
58 | ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected"); | 61 | ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected"); |
@@ -94,6 +97,14 @@ main (int argc, char **argv) | |||
94 | ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments"); | 97 | ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments"); |
95 | my_free(optstr); | 98 | my_free(optstr); |
96 | 99 | ||
100 | optstr=list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk")); | ||
101 | ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-dos.ini's Section Two as expected"); | ||
102 | my_free(optstr); | ||
103 | |||
104 | optstr=list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk")); | ||
105 | ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file"); | ||
106 | my_free(optstr); | ||
107 | |||
97 | return exit_status(); | 108 | return exit_status(); |
98 | } | 109 | } |
99 | 110 | ||