improve test coverage

diff --git a/Makefile.am b/Makefile.am
index a4124cbf1d4aac545e2a279118882c658ee014ee..54f528a6cadca2323966a1c17f920409dc3daccd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,6 +75,7 @@ check_vnstat_SOURCES = tests/vnstat_tests.c tests/vnstat_tests.h \
   tests/fs_tests.c tests/fs_tests.h \
   tests/id_tests.c tests/id_tests.h \
   tests/iflist_tests.c tests/iflist_tests.h \
+  tests/cli_tests.c tests/cli_tests.h \
   tests/daemon_tests.c tests/daemon_tests.h
 
 check_vnstat_SOURCES += src/cfg.c src/cfg.h \
@@ -92,7 +93,9 @@ check_vnstat_SOURCES += src/cfg.c src/cfg.h \
   src/iflist.c src/iflist.h \
   src/misc.c src/misc.h \
   src/fs.c src/fs.h \
-  src/id.c src/id.h
+  src/id.c src/id.h \
+  src/vnstat_func.c src/vnstat_func.h \
+  src/traffic.c src/traffic.h
 
 if HAVE_LIBGD
 check_vnstat_CFLAGS += -DHAVE_IMAGE

diff --git a/Makefile.in b/Makefile.in
index 3240d9e64cec4c9a93679ce1ef7e1f532a490022..bf163b9ba8f77e45df1502bc280f2c57a4d4cdc5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,15 +125,17 @@ am__check_vnstat_SOURCES_DIST = tests/vnstat_tests.c \
        tests/ifinfo_tests.h tests/misc_tests.c tests/misc_tests.h \
        tests/fs_tests.c tests/fs_tests.h tests/id_tests.c \
        tests/id_tests.h tests/iflist_tests.c tests/iflist_tests.h \
-       tests/daemon_tests.c tests/daemon_tests.h src/cfg.c src/cfg.h \
-       src/cfgoutput.c src/cfgoutput.h src/common.c src/common.h \
-       src/daemon.c src/daemon.h src/dbsql.c src/dbsql.h \
-       src/dbaccess.c src/dbaccess.h src/datacache.c src/datacache.h \
-       src/dbshow.c src/dbshow.h src/dbjson.c src/dbjson.h \
-       src/dbxml.c src/dbxml.h src/ibw.c src/ibw.h src/ifinfo.c \
-       src/ifinfo.h src/iflist.c src/iflist.h src/misc.c src/misc.h \
-       src/fs.c src/fs.h src/id.c src/id.h tests/image_tests.c \
-       tests/image_tests.h src/image.c src/image.h
+       tests/cli_tests.c tests/cli_tests.h tests/daemon_tests.c \
+       tests/daemon_tests.h src/cfg.c src/cfg.h src/cfgoutput.c \
+       src/cfgoutput.h src/common.c src/common.h src/daemon.c \
+       src/daemon.h src/dbsql.c src/dbsql.h src/dbaccess.c \
+       src/dbaccess.h src/datacache.c src/datacache.h src/dbshow.c \
+       src/dbshow.h src/dbjson.c src/dbjson.h src/dbxml.c src/dbxml.h \
+       src/ibw.c src/ibw.h src/ifinfo.c src/ifinfo.h src/iflist.c \
+       src/iflist.h src/misc.c src/misc.h src/fs.c src/fs.h src/id.c \
+       src/id.h src/vnstat_func.c src/vnstat_func.h src/traffic.c \
+       src/traffic.h tests/image_tests.c tests/image_tests.h \
+       src/image.c src/image.h
 am__dirstamp = $(am__leading_dot)dirstamp
 @HAVE_CHECK_TRUE@@HAVE_LIBGD_TRUE@am__objects_1 = tests/check_vnstat-image_tests.$(OBJEXT) \
 @HAVE_CHECK_TRUE@@HAVE_LIBGD_TRUE@     src/check_vnstat-image.$(OBJEXT)
@@ -149,6 +151,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @HAVE_CHECK_TRUE@      tests/check_vnstat-fs_tests.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      tests/check_vnstat-id_tests.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      tests/check_vnstat-iflist_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      tests/check_vnstat-cli_tests.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      tests/check_vnstat-daemon_tests.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      src/check_vnstat-cfg.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      src/check_vnstat-cfgoutput.$(OBJEXT) \
@@ -166,6 +169,8 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @HAVE_CHECK_TRUE@      src/check_vnstat-misc.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      src/check_vnstat-fs.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      src/check_vnstat-id.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      src/check_vnstat-vnstat_func.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      src/check_vnstat-traffic.$(OBJEXT) \
 @HAVE_CHECK_TRUE@      $(am__objects_1)
 check_vnstat_OBJECTS = $(am_check_vnstat_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -693,7 +698,8 @@ vnstati_SOURCES = src/vnstati.c src/vnstati.h \
 @HAVE_CHECK_TRUE@      tests/misc_tests.h tests/fs_tests.c \
 @HAVE_CHECK_TRUE@      tests/fs_tests.h tests/id_tests.c \
 @HAVE_CHECK_TRUE@      tests/id_tests.h tests/iflist_tests.c \
-@HAVE_CHECK_TRUE@      tests/iflist_tests.h tests/daemon_tests.c \
+@HAVE_CHECK_TRUE@      tests/iflist_tests.h tests/cli_tests.c \
+@HAVE_CHECK_TRUE@      tests/cli_tests.h tests/daemon_tests.c \
 @HAVE_CHECK_TRUE@      tests/daemon_tests.h src/cfg.c src/cfg.h \
 @HAVE_CHECK_TRUE@      src/cfgoutput.c src/cfgoutput.h src/common.c \
 @HAVE_CHECK_TRUE@      src/common.h src/daemon.c src/daemon.h \
@@ -704,7 +710,9 @@ vnstati_SOURCES = src/vnstati.c src/vnstati.h \
 @HAVE_CHECK_TRUE@      src/dbxml.h src/ibw.c src/ibw.h src/ifinfo.c \
 @HAVE_CHECK_TRUE@      src/ifinfo.h src/iflist.c src/iflist.h \
 @HAVE_CHECK_TRUE@      src/misc.c src/misc.h src/fs.c src/fs.h \
-@HAVE_CHECK_TRUE@      src/id.c src/id.h $(am__append_4)
+@HAVE_CHECK_TRUE@      src/id.c src/id.h src/vnstat_func.c \
+@HAVE_CHECK_TRUE@      src/vnstat_func.h src/traffic.c src/traffic.h \
+@HAVE_CHECK_TRUE@      $(am__append_4)
 all: all-recursive
 
 .SUFFIXES:
@@ -904,6 +912,8 @@ tests/check_vnstat-id_tests.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/check_vnstat-iflist_tests.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/check_vnstat-cli_tests.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/check_vnstat-daemon_tests.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 src/$(am__dirstamp):
@@ -944,6 +954,10 @@ src/check_vnstat-fs.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/check_vnstat-id.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
+src/check_vnstat-vnstat_func.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
+src/check_vnstat-traffic.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
 tests/check_vnstat-image_tests.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 src/check_vnstat-image.$(OBJEXT): src/$(am__dirstamp) \
@@ -1028,6 +1042,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_vnstat-iflist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_vnstat-image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_vnstat-misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_vnstat-traffic.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_vnstat-vnstat_func.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/daemon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/datacache.Po@am__quote@
@@ -1048,6 +1064,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vnstat_func.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vnstatd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vnstati.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/check_vnstat-cli_tests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/check_vnstat-common_tests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/check_vnstat-config_tests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/check_vnstat-daemon_tests.Po@am__quote@
@@ -1232,6 +1249,20 @@ tests/check_vnstat-iflist_tests.obj: tests/iflist_tests.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o tests/check_vnstat-iflist_tests.obj `if test -f 'tests/iflist_tests.c'; then $(CYGPATH_W) 'tests/iflist_tests.c'; else $(CYGPATH_W) '$(srcdir)/tests/iflist_tests.c'; fi`
 
+tests/check_vnstat-cli_tests.o: tests/cli_tests.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT tests/check_vnstat-cli_tests.o -MD -MP -MF tests/$(DEPDIR)/check_vnstat-cli_tests.Tpo -c -o tests/check_vnstat-cli_tests.o `test -f 'tests/cli_tests.c' || echo '$(srcdir)/'`tests/cli_tests.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tests/$(DEPDIR)/check_vnstat-cli_tests.Tpo tests/$(DEPDIR)/check_vnstat-cli_tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tests/cli_tests.c' object='tests/check_vnstat-cli_tests.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o tests/check_vnstat-cli_tests.o `test -f 'tests/cli_tests.c' || echo '$(srcdir)/'`tests/cli_tests.c
+
+tests/check_vnstat-cli_tests.obj: tests/cli_tests.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT tests/check_vnstat-cli_tests.obj -MD -MP -MF tests/$(DEPDIR)/check_vnstat-cli_tests.Tpo -c -o tests/check_vnstat-cli_tests.obj `if test -f 'tests/cli_tests.c'; then $(CYGPATH_W) 'tests/cli_tests.c'; else $(CYGPATH_W) '$(srcdir)/tests/cli_tests.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tests/$(DEPDIR)/check_vnstat-cli_tests.Tpo tests/$(DEPDIR)/check_vnstat-cli_tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='tests/cli_tests.c' object='tests/check_vnstat-cli_tests.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o tests/check_vnstat-cli_tests.obj `if test -f 'tests/cli_tests.c'; then $(CYGPATH_W) 'tests/cli_tests.c'; else $(CYGPATH_W) '$(srcdir)/tests/cli_tests.c'; fi`
+
 tests/check_vnstat-daemon_tests.o: tests/daemon_tests.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT tests/check_vnstat-daemon_tests.o -MD -MP -MF tests/$(DEPDIR)/check_vnstat-daemon_tests.Tpo -c -o tests/check_vnstat-daemon_tests.o `test -f 'tests/daemon_tests.c' || echo '$(srcdir)/'`tests/daemon_tests.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tests/$(DEPDIR)/check_vnstat-daemon_tests.Tpo tests/$(DEPDIR)/check_vnstat-daemon_tests.Po
@@ -1470,6 +1501,34 @@ src/check_vnstat-id.obj: src/id.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o src/check_vnstat-id.obj `if test -f 'src/id.c'; then $(CYGPATH_W) 'src/id.c'; else $(CYGPATH_W) '$(srcdir)/src/id.c'; fi`
 
+src/check_vnstat-vnstat_func.o: src/vnstat_func.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT src/check_vnstat-vnstat_func.o -MD -MP -MF src/$(DEPDIR)/check_vnstat-vnstat_func.Tpo -c -o src/check_vnstat-vnstat_func.o `test -f 'src/vnstat_func.c' || echo '$(srcdir)/'`src/vnstat_func.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/check_vnstat-vnstat_func.Tpo src/$(DEPDIR)/check_vnstat-vnstat_func.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/vnstat_func.c' object='src/check_vnstat-vnstat_func.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o src/check_vnstat-vnstat_func.o `test -f 'src/vnstat_func.c' || echo '$(srcdir)/'`src/vnstat_func.c
+
+src/check_vnstat-vnstat_func.obj: src/vnstat_func.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT src/check_vnstat-vnstat_func.obj -MD -MP -MF src/$(DEPDIR)/check_vnstat-vnstat_func.Tpo -c -o src/check_vnstat-vnstat_func.obj `if test -f 'src/vnstat_func.c'; then $(CYGPATH_W) 'src/vnstat_func.c'; else $(CYGPATH_W) '$(srcdir)/src/vnstat_func.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/check_vnstat-vnstat_func.Tpo src/$(DEPDIR)/check_vnstat-vnstat_func.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/vnstat_func.c' object='src/check_vnstat-vnstat_func.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o src/check_vnstat-vnstat_func.obj `if test -f 'src/vnstat_func.c'; then $(CYGPATH_W) 'src/vnstat_func.c'; else $(CYGPATH_W) '$(srcdir)/src/vnstat_func.c'; fi`
+
+src/check_vnstat-traffic.o: src/traffic.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT src/check_vnstat-traffic.o -MD -MP -MF src/$(DEPDIR)/check_vnstat-traffic.Tpo -c -o src/check_vnstat-traffic.o `test -f 'src/traffic.c' || echo '$(srcdir)/'`src/traffic.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/check_vnstat-traffic.Tpo src/$(DEPDIR)/check_vnstat-traffic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/traffic.c' object='src/check_vnstat-traffic.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o src/check_vnstat-traffic.o `test -f 'src/traffic.c' || echo '$(srcdir)/'`src/traffic.c
+
+src/check_vnstat-traffic.obj: src/traffic.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT src/check_vnstat-traffic.obj -MD -MP -MF src/$(DEPDIR)/check_vnstat-traffic.Tpo -c -o src/check_vnstat-traffic.obj `if test -f 'src/traffic.c'; then $(CYGPATH_W) 'src/traffic.c'; else $(CYGPATH_W) '$(srcdir)/src/traffic.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/check_vnstat-traffic.Tpo src/$(DEPDIR)/check_vnstat-traffic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/traffic.c' object='src/check_vnstat-traffic.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -c -o src/check_vnstat-traffic.obj `if test -f 'src/traffic.c'; then $(CYGPATH_W) 'src/traffic.c'; else $(CYGPATH_W) '$(srcdir)/src/traffic.c'; fi`
+
 tests/check_vnstat-image_tests.o: tests/image_tests.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_vnstat_CFLAGS) $(CFLAGS) -MT tests/check_vnstat-image_tests.o -MD -MP -MF tests/$(DEPDIR)/check_vnstat-image_tests.Tpo -c -o tests/check_vnstat-image_tests.o `test -f 'tests/image_tests.c' || echo '$(srcdir)/'`tests/image_tests.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tests/$(DEPDIR)/check_vnstat-image_tests.Tpo tests/$(DEPDIR)/check_vnstat-image_tests.Po

diff --git a/tests/cli_tests.c b/tests/cli_tests.c
new file mode 100644 (file)
index 0000000..6f9f40b
--- /dev/null
+++ b/tests/cli_tests.c
@@ -0,0 +1,145 @@
+#include "common.h"
+#include "vnstat_tests.h"
+#include "vnstat_func.h"
+#include "cfg.h"
+#include "cli_tests.h"
+
+START_TEST(vnstat_can_init_params)
+{
+    PARAMS p;
+
+    initparams(&p);
+}
+END_TEST
+
+START_TEST(vnstat_showhelp_does_not_crash)
+{
+    PARAMS p;
+
+    initparams(&p);
+    strncpy_nt(p.definterface, "ethgone", 32);
+    suppress_output();
+    showhelp(&p);
+}
+END_TEST
+
+START_TEST(vnstat_showlonghelp_does_not_crash)
+{
+    PARAMS p;
+
+    initparams(&p);
+    strncpy_nt(p.definterface, "ethgone", 32);
+    suppress_output();
+    showlonghelp(&p);
+}
+END_TEST
+
+START_TEST(vnstat_handlers_do_nothing_by_default)
+{
+    PARAMS p, b;
+
+    initparams(&p);
+    memcpy(&b, &p, sizeof(PARAMS));
+    handleremoveinterface(&p);
+    handlerenameinterface(&p);
+    handleaddinterface(&p);
+    handlesetalias(&p);
+    handletrafficmeters(&p);
+    ck_assert_int_eq(memcmp(&p, &b, sizeof(PARAMS)), 0);
+}
+END_TEST
+
+START_TEST(vnstat_handletrafficmeters_exists_when_interface_is_not_available)
+{
+    PARAMS p;
+
+    ck_assert_int_eq(remove_directory(TESTDIR), 1);
+    defaultcfg();
+    initparams(&p);
+    strncpy_nt(cfg.iface, "ethfoo", 32);
+       strncpy_nt(p.interface, "default", 32);
+       strncpy_nt(p.definterface, cfg.iface, 32);
+    p.livetraffic = 1;
+    suppress_output();
+
+    handletrafficmeters(&p);
+}
+END_TEST
+
+START_TEST(vnstat_parseargs_does_nothing_without_args)
+{
+    PARAMS p;
+    char *argv[] = {"vnstat", "-h", NULL};
+    int argc = sizeof(argv) / sizeof(char*) - 1;
+
+    initparams(&p);
+    parseargs(&p, argc, argv);
+}
+END_TEST
+
+START_TEST(vnstat_parseargs_can_help)
+{
+    PARAMS p;
+    char *argv[] = {"vnstat", "--help", NULL};
+    int argc = sizeof(argv) / sizeof(char*) - 1;
+
+    initparams(&p);
+    debug = 1;
+    suppress_output();
+    parseargs(&p, argc, argv);
+}
+END_TEST
+
+START_TEST(vnstat_parseargs_can_longhelp)
+{
+    PARAMS p;
+    char *argv[] = {"vnstat", "--longhelp", NULL};
+    int argc = sizeof(argv) / sizeof(char*) - 1;
+
+    initparams(&p);
+    suppress_output();
+    parseargs(&p, argc, argv);
+}
+END_TEST
+
+START_TEST(vnstat_parseargs_can_show_version)
+{
+    PARAMS p;
+    char *argv[] = {"vnstat", "--version", NULL};
+    int argc = sizeof(argv) / sizeof(char*) - 1;
+
+    initparams(&p);
+    suppress_output();
+    parseargs(&p, argc, argv);
+}
+END_TEST
+
+START_TEST(vnstat_parseargs_detects_unknown_parameters)
+{
+    PARAMS p;
+    char *argv[] = {"vnstat", "--something_fishy", NULL};
+    int argc = sizeof(argv) / sizeof(char*) - 1;
+
+    initparams(&p);
+    suppress_output();
+    parseargs(&p, argc, argv);
+}
+END_TEST
+
+void add_cli_tests(Suite *s)
+{
+       TCase *tc_cli = tcase_create("CLI");
+       tcase_add_checked_fixture(tc_cli, setup, teardown);
+       tcase_add_unchecked_fixture(tc_cli, setup, teardown);
+    tcase_add_test(tc_cli, vnstat_can_init_params);
+       tcase_add_test(tc_cli, vnstat_showhelp_does_not_crash);
+       tcase_add_test(tc_cli, vnstat_showlonghelp_does_not_crash);
+    tcase_add_test(tc_cli, vnstat_handlers_do_nothing_by_default);
+    tcase_add_exit_test(tc_cli, vnstat_handletrafficmeters_exists_when_interface_is_not_available, 1);
+    tcase_add_test(tc_cli, vnstat_parseargs_does_nothing_without_args);
+       tcase_add_exit_test(tc_cli, vnstat_parseargs_can_help, 0);
+    tcase_add_exit_test(tc_cli, vnstat_parseargs_can_longhelp, 0);
+    tcase_add_exit_test(tc_cli, vnstat_parseargs_can_show_version, 0);
+    tcase_add_exit_test(tc_cli, vnstat_parseargs_detects_unknown_parameters, 1);
+    suite_add_tcase(s, tc_cli);
+}

diff --git a/tests/cli_tests.h b/tests/cli_tests.h
new file mode 100644 (file)
index 0000000..4072562
--- /dev/null
+++ b/tests/cli_tests.h
@@ -0,0 +1,6 @@
+#ifndef CLI_TESTS_H
+#define CLI_TESTS_H
+
+void add_cli_tests(Suite *s);
+
+#endif

diff --git a/tests/vnstat_tests.c b/tests/vnstat_tests.c
index 0a3906580452426ca61c4102f340bd1645fbfd75..ee3d1b3699868058891581ef6955f85f5a01f157 100644 (file)
--- a/tests/vnstat_tests.c
+++ b/tests/vnstat_tests.c
@@ -11,6 +11,7 @@
 #include "fs_tests.h"
 #include "id_tests.h"
 #include "iflist_tests.h"
+#include "cli_tests.h"
 #if defined(HAVE_IMAGE)
 #include "image_tests.h"
 #endif
@@ -54,6 +55,7 @@ Suite *test_suite(void)
        add_fs_tests(s);
        add_id_tests(s);
        add_iflist_tests(s);
+       add_cli_tests(s);
 #if defined(HAVE_IMAGE)
        add_image_tests(s);
 #endif