- Make equal-less parameters illegal

[nagiosplug.git] / lib / tests / test_ini.c

diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c
index 302a2e56226397fa8d835f34c2c9c3e3421b6619..9031f7f8abce45863a27f8bbb8750e55a8afe9a9 100644 (file)
--- a/lib/tests/test_ini.c
+++ b/lib/tests/test_ini.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "parse_ini.h"
+#include "utils_base.h"
 
 #include "tap.h"
 
@@ -29,57 +30,69 @@ void my_free(char *string) {
        }
 }
 
+char*
+list2str(np_arg_list *optlst)
+{
+       char *optstr=NULL;
+
+       /* Put everything as a space-separated string */
+       asprintf(&optstr, "");
+       while (optlst) {
+               asprintf(&optstr, "%s%s ", optstr, optlst->arg);
+               optlst=optlst->next;
+       }
+       /* Strip last whitespace */
+       if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0';
+
+       return optstr;
+}
+
 int
 main (int argc, char **argv)
 {
        char *optstr=NULL;
 
-       plan_tests(4);
+       plan_tests(10);
 
-       optstr=np_get_defaults("section@./config-tiny.ini", "check_disk");
-       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "config-tiny.ini's section as expected");
+       optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
+       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
        my_free(optstr);
 
-       optstr=np_get_defaults("@./config-tiny.ini", "section");
-       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name, without specific");
+       optstr=list2str(np_get_defaults("@./config-tiny.ini", "section"));
+       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name, without specific");
        my_free(optstr);
 
-       /* This test currently crashes */
-       /*
-       optstr=np_get_defaults("section_unknown@./config-tiny.ini", "section");
-       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name over specified one");
+       optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section"));
+       ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name over specified one");
        my_free(optstr);
-       */
 
-       optstr=np_get_defaults("Section Two@./config-tiny.ini", "check_disk");
+       optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
        ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected");
        my_free(optstr);
 
-       /* These tests currently crash parse_ini.c */
-       /*
-       optstr=np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk");
+       optstr=list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
        my_free(optstr);
 
-       optstr=np_get_defaults("section2@./config-tiny.ini", "check_disk");
+       optstr=list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk"));
        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section2 with whitespace before section name");
        my_free(optstr);
 
-       optstr=np_get_defaults("section3@./config-tiny.ini", "check_disk");
+       optstr=list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk"));
        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section3 with whitespace after section name");
        my_free(optstr);
-       */
 
-       optstr=np_get_defaults("check_mysql@./plugin.ini", "check_disk");
+       optstr=list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk"));
        ok( !strcmp(optstr, "--username=operator --password=secret"), "plugin.ini's check_mysql as expected");
        my_free(optstr);
 
-       /* This test crashes at the moment. I think it is not expecting single character parameter names */
-       /*
-       optstr=np_get_defaults("check_mysql2@./config-tiny.ini", "check_disk");
+       optstr=list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
        ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
        my_free(optstr);
-       */
+
+       optstr=list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
+       ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
+       my_free(optstr);
 
        return exit_status();
 }