From 8b103c0c778aa22dbe7688e7d11df20b7c80be70 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Fri, 23 Jan 2009 02:39:45 -0500 Subject: Add die tests for parse_ini --- .gitignore | 3 +- configure.in | 2 +- lib/tests/Makefile.am | 6 +-- lib/tests/test_ini.c | 117 ------------------------------------------------- lib/tests/test_ini.t | 6 --- lib/tests/test_ini1.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/tests/test_ini1.t | 6 +++ lib/tests/test_ini3.c | 33 ++++++++++++++ lib/tests/test_ini3.t | 34 ++++++++++++++ lib/tests/test_opts3.t | 8 +++- 10 files changed, 202 insertions(+), 130 deletions(-) delete mode 100644 lib/tests/test_ini.c delete mode 100755 lib/tests/test_ini.t create mode 100644 lib/tests/test_ini1.c create mode 100755 lib/tests/test_ini1.t create mode 100644 lib/tests/test_ini3.c create mode 100755 lib/tests/test_ini3.t diff --git a/.gitignore b/.gitignore index 780461f9..be40c084 100644 --- a/.gitignore +++ b/.gitignore @@ -93,7 +93,8 @@ NP-VERSION-FILE /lib/tests/utils_disk.Po /lib/tests/utils_tcp.Po /lib/tests/parse_ini.Po -/lib/tests/test_ini +/lib/tests/test_ini1 +/lib/tests/test_ini3 /lib/tests/test_opts1 /lib/tests/test_opts2 /lib/tests/test_opts3 diff --git a/configure.in b/configure.in index 57e438c5..68ac0a00 100644 --- a/configure.in +++ b/configure.in @@ -188,7 +188,7 @@ AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"]) if test "$enable_extra_opts" = "yes" ; then AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.]) if test "$enable_libtap" = "yes"; then - EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2 test_opts3" + EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3" AC_SUBST(EXTRA_TEST) fi fi diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 4bab2f2a..694baf00 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts1 test_opts2 test_opts3 +EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 -np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t +np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini EXTRA_DIST = $(np_test_scripts) $(np_test_files) @@ -28,7 +28,7 @@ AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags) AM_LDFLAGS = $(tap_ldflags) -ltap LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a -SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts1.c test_opts2.c test_opts3.c +SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c test: ${noinst_PROGRAMS} perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c deleted file mode 100644 index c0853d7c..00000000 --- a/lib/tests/test_ini.c +++ /dev/null @@ -1,117 +0,0 @@ -/***************************************************************************** -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* -*****************************************************************************/ - -#include "common.h" -#include "utils_base.h" -#include "parse_ini.h" - -#include "tap.h" - -void my_free(char *string) { - if (string != NULL) { - printf("string:\n\t|%s|\n", string); - free(string); - } -} - -char* -list2str(np_arg_list *optlst) -{ - char *optstr=NULL; - np_arg_list *optltmp; - - /* Put everything as a space-separated string */ - asprintf(&optstr, ""); - while (optlst) { - asprintf(&optstr, "%s%s ", optstr, optlst->arg); - optltmp=optlst; - optlst=optlst->next; - free(optltmp); - } - /* 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(12); - - 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=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 check is expected to die - It's commented so we can eventually put - * it in a separate file for testing the return value - */ - /* optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section")); - ok( 0, "die if section isn't found"); - my_free(optstr); */ - - 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); - - 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=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=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=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); - - 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); - - optstr=list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk")); - ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-dos.ini's Section Two as expected"); - my_free(optstr); - - optstr=list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk")); - ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file"); - my_free(optstr); - - optstr=list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp")); - ok( !strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --jail"), "Long options"); - my_free(optstr); - - return exit_status(); -} - diff --git a/lib/tests/test_ini.t b/lib/tests/test_ini.t deleted file mode 100755 index 0487098c..00000000 --- a/lib/tests/test_ini.t +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/perl -use Test::More; -if (! -e "./test_ini") { - plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; -} -exec "./test_ini"; diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c new file mode 100644 index 00000000..c0853d7c --- /dev/null +++ b/lib/tests/test_ini1.c @@ -0,0 +1,117 @@ +/***************************************************************************** +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* +*****************************************************************************/ + +#include "common.h" +#include "utils_base.h" +#include "parse_ini.h" + +#include "tap.h" + +void my_free(char *string) { + if (string != NULL) { + printf("string:\n\t|%s|\n", string); + free(string); + } +} + +char* +list2str(np_arg_list *optlst) +{ + char *optstr=NULL; + np_arg_list *optltmp; + + /* Put everything as a space-separated string */ + asprintf(&optstr, ""); + while (optlst) { + asprintf(&optstr, "%s%s ", optstr, optlst->arg); + optltmp=optlst; + optlst=optlst->next; + free(optltmp); + } + /* 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(12); + + 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=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 check is expected to die - It's commented so we can eventually put + * it in a separate file for testing the return value + */ + /* optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section")); + ok( 0, "die if section isn't found"); + my_free(optstr); */ + + 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); + + 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=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=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=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); + + 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); + + optstr=list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk")); + ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-dos.ini's Section Two as expected"); + my_free(optstr); + + optstr=list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk")); + ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file"); + my_free(optstr); + + optstr=list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp")); + ok( !strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --jail"), "Long options"); + my_free(optstr); + + return exit_status(); +} + diff --git a/lib/tests/test_ini1.t b/lib/tests/test_ini1.t new file mode 100755 index 00000000..0487098c --- /dev/null +++ b/lib/tests/test_ini1.t @@ -0,0 +1,6 @@ +#!/usr/bin/perl +use Test::More; +if (! -e "./test_ini") { + plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; +} +exec "./test_ini"; diff --git a/lib/tests/test_ini3.c b/lib/tests/test_ini3.c new file mode 100644 index 00000000..814b3ec0 --- /dev/null +++ b/lib/tests/test_ini3.c @@ -0,0 +1,33 @@ +/***************************************************************************** +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* +*****************************************************************************/ + +#include "parse_ini.h" + +int +main (int argc, char **argv) +{ + + /* + * This is for testing arguments expected to die. + */ + + np_get_defaults(argv[1], argv[0]); + + return 0; +} + diff --git a/lib/tests/test_ini3.t b/lib/tests/test_ini3.t new file mode 100755 index 00000000..57388dda --- /dev/null +++ b/lib/tests/test_ini3.t @@ -0,0 +1,34 @@ +#!/usr/bin/perl +use Test::More; +use strict; +use warnings; + +if (! -e "./test_ini") { + plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test"; +} + +# array of argument arrays +# - First value is the expected return code +# - 2nd value is the NAGIOS_CONFIG_PATH +# TODO: looks like we look in default path after looking trough this variable - shall we? +# - 3rd value is the plugin name +# - 4th is the ini locator +my @TESTS = ( + [3, undef, "section", "section_unknown@./config-tiny.ini"], +); + +plan tests => scalar(@TESTS); + +my $count=1; + +foreach my $args (@TESTS) { + my $rc = shift(@$args); + if (my $env = shift(@$args)) { + $ENV{"NAGIOS_CONFIG_PATH"} = $env; + } else { + delete($ENV{"NAGIOS_CONFIG_PATH"}); + } + system {'./test_ini2'} @$args; + cmp_ok($?>>8, '==', $rc, "Parse-ini die " . $count++); +} + diff --git a/lib/tests/test_opts3.t b/lib/tests/test_opts3.t index 35b44687..fa7876d0 100755 --- a/lib/tests/test_opts3.t +++ b/lib/tests/test_opts3.t @@ -28,8 +28,12 @@ plan tests => scalar(@TESTS); my $count=1; foreach my $args (@TESTS) { - my $rc = shift(@$args); - $ENV{"NAGIOS_CONFIG_PATH"} = shift(@$args); + my $rc = shift(@$args); + if (my $env = shift(@$args)) { + $ENV{"NAGIOS_CONFIG_PATH"} = $env; + } else { + delete($ENV{"NAGIOS_CONFIG_PATH"}); + } system {'./test_opts3'} @$args; cmp_ok($?>>8, '==', $rc, "Extra-opts die " . $count++); } -- cgit v1.2.3-74-g34f1