From: Teemu Toivola <git@humdi.net>
Date: Sun, 10 Aug 2014 16:59:44 +0000 (+0300)
Subject: increase test coverage, fix line length limit in importdb
X-Git-Tag: v1.12~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44c4eb4b0983a43254989bc009421f683252bc80;p=vnstat

increase test coverage, fix line length limit in importdb
---

diff --git a/src/dbaccess.c b/src/dbaccess.c
index bbf29b4..cbc039c 100644
--- a/src/dbaccess.c
+++ b/src/dbaccess.c
@@ -923,7 +923,7 @@ int importdb(const char *filename)
 			printf("parsing %s", line);
 		}
 
-		if (strlen(line)<9) {
+		if (strlen(line)<6) {
 			continue;
 		}
 
diff --git a/tests/Makefile b/tests/Makefile
index 9368b81..4910bb9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@ CFLAGS ?= -Wall -Wextra -g
 CFLAGS += -DPROCNETDEV=\"testdir/proc/dev\" -DSYSCLASSNET=\"testdir/proc\"
 LDLIBS = -lm -lcheck -lrt -lpthread
 OBJS = vnstat_tests.o common_tests.o database_tests.o config_tests.o ifinfo_tests.o misc_tests.o daemon_tests.o
-OBJS += common.o ifinfo.o dbaccess.o dbcache.o cfg.o misc.o daemon.o
+OBJS += common.o ifinfo.o dbshow.o dbaccess.o dbcache.o cfg.o misc.o daemon.o
 
 vpath %.c ../src
 vpath %.h ../src
@@ -27,7 +27,7 @@ vnstat_tests: $(OBJS)
 
 vnstat_tests.o: vnstat_tests.c vnstat_tests.h common_tests.h database_tests.h common.h
 common_tests.o: common_tests.c common_tests.h vnstat_tests.h common.h dbaccess.h cfg.h
-database_tests.o: database_tests.c database_tests.h vnstat_tests.h common.h ifinfo.h dbaccess.h dbcache.h cfg.h
+database_tests.o: database_tests.c database_tests.h vnstat_tests.h common.h ifinfo.h dbaccess.h dbcache.h dbshow.h cfg.h
 config_tests.o: config_tests.c config_tests.h vnstat_tests.h common.h cfg.h
 ifinfo_tests.o: ifinfo_tests.c ifinfo_tests.h vnstat_tests.h common.h ifinfo.h dbaccess.h misc.h cfg.h
 misc_tests.o: misc_tests.c misc_tests.h vnstat_tests.h common.h misc.h
@@ -37,6 +37,7 @@ common.o: common.c common.h
 ifinfo.o: ifinfo.c ifinfo.h common.h dbaccess.h misc.h cfg.h
 dbaccess.o: dbaccess.c dbaccess.h common.h
 dbcache.o: dbcache.c dbcache.h dbaccess.h common.h ifinfo.h cfg.h
+dbshow.o: dbshow.c dbshow.h misc.h common.h
 cfg.o: cfg.c cfg.h common.h
 misc.o: misc.c misc.h common.h
 daemon.o: daemon.c daemon.h common.h ifinfo.h dbaccess.h dbcache.h misc.h cfg.h
diff --git a/tests/database_tests.c b/tests/database_tests.c
index cd82a75..2e11d9c 100644
--- a/tests/database_tests.c
+++ b/tests/database_tests.c
@@ -4,6 +4,7 @@
 #include "ifinfo.h"
 #include "dbaccess.h"
 #include "dbcache.h"
+#include "dbshow.h"
 #include "cfg.h"
 
 START_TEST(initdb_activates_database)
@@ -761,6 +762,170 @@ START_TEST(dbcheck_with_filled_cache)
 }
 END_TEST
 
+START_TEST(importdb_can_parse_exported_database)
+{
+	int i;
+	char buffer[512];
+	DATA filleddb;
+	FILE *exportfile;
+
+	initdb();
+	strcpy(data.interface, "something");
+	strcpy(data.nick, "nothing");
+	data.totalrx = 1;
+	data.totaltx = 2;
+	data.currx = 3;
+	data.curtx = 4;
+	data.totalrxk = 5;
+	data.totaltxk = 6;
+	data.btime = 7;
+
+	for (i=0; i<30; i++) {
+		data.day[i].date = i+1;
+		data.day[i].rx = data.day[i].tx = i*100;
+		data.day[i].rxk = data.day[i].txk = i;
+		data.day[i].used = 1;
+	}
+
+	for (i=0; i<10; i++) {
+		data.top10[i].date = i+1;
+		data.top10[i].rx = data.top10[i].tx = i*100;
+		data.top10[i].rxk = data.top10[i].txk = i;
+		data.top10[i].used = 1;
+	}
+
+	for (i=0; i<12; i++) {
+		data.month[i].month = i+1;
+		data.month[i].rx = data.month[i].tx = i*100;
+		data.month[i].rxk = data.month[i].txk = i;
+		data.month[i].used = 1;
+	}
+
+	for (i=0; i<24; i++) {
+		data.hour[i].date = i+1;
+		data.hour[i].rx = data.hour[i].tx = i*100;
+	}
+
+	memcpy(&filleddb, &data, sizeof(DATA));
+	ck_assert_int_eq(remove_directory(TESTDIR), 1);
+	ck_assert_int_eq(clean_testdbdir(), 1);
+
+	fflush(stdout);
+	snprintf(buffer, 512, "%s/dbexport", TESTDBDIR);
+	exportfile = fopen(buffer, "w");
+	dup2(fileno(exportfile), STDOUT_FILENO);
+	fclose(exportfile);
+	dumpdb();
+	memset(&data, '\0', sizeof(DATA));
+
+	ck_assert_int_eq(importdb(buffer), 1);
+
+	ck_assert_str_eq(data.interface, filleddb.interface);
+	ck_assert_str_eq(data.nick, filleddb.nick);
+	ck_assert_int_eq(data.version, filleddb.version);
+	ck_assert_int_eq(data.active, filleddb.active);
+	ck_assert_int_eq(data.totalrx, filleddb.totalrx);
+	ck_assert_int_eq(data.totaltx, filleddb.totaltx);
+	ck_assert_int_eq(data.currx, filleddb.currx);
+	ck_assert_int_eq(data.curtx, filleddb.curtx);
+	ck_assert_int_eq(data.totalrxk, filleddb.totalrxk);
+	ck_assert_int_eq(data.totaltxk, filleddb.totaltxk);
+	ck_assert_int_eq(data.btime, filleddb.btime);
+	ck_assert_int_eq(data.created, filleddb.created);
+	ck_assert_int_eq(data.lastupdated, filleddb.lastupdated);
+
+	for (i=0; i<30; i++) {
+		ck_assert_int_eq(data.day[i].date, filleddb.day[i].date);
+		ck_assert_int_eq(data.day[i].rx, filleddb.day[i].rx);
+		ck_assert_int_eq(data.day[i].tx, filleddb.day[i].tx);
+		ck_assert_int_eq(data.day[i].rxk, filleddb.day[i].rxk);
+		ck_assert_int_eq(data.day[i].txk, filleddb.day[i].txk);
+		ck_assert_int_eq(data.day[i].used, filleddb.day[i].used);
+	}
+
+	for (i=0; i<10; i++) {
+		ck_assert_int_eq(data.top10[i].date, filleddb.top10[i].date);
+		ck_assert_int_eq(data.top10[i].rx, filleddb.top10[i].rx);
+		ck_assert_int_eq(data.top10[i].tx, filleddb.top10[i].tx);
+		ck_assert_int_eq(data.top10[i].rxk, filleddb.top10[i].rxk);
+		ck_assert_int_eq(data.top10[i].txk, filleddb.top10[i].txk);
+		ck_assert_int_eq(data.top10[i].used, filleddb.top10[i].used);
+	}
+
+	for (i=0; i<12; i++) {
+		ck_assert_int_eq(data.month[i].month, filleddb.month[i].month);
+		ck_assert_int_eq(data.month[i].rx, filleddb.month[i].rx);
+		ck_assert_int_eq(data.month[i].tx, filleddb.month[i].tx);
+		ck_assert_int_eq(data.month[i].rxk, filleddb.month[i].rxk);
+		ck_assert_int_eq(data.month[i].txk, filleddb.month[i].txk);
+		ck_assert_int_eq(data.month[i].used, filleddb.month[i].used);
+	}
+
+	for (i=0; i<24; i++) {
+		ck_assert_int_eq(data.hour[i].date, filleddb.hour[i].date);
+		ck_assert_int_eq(data.hour[i].rx, filleddb.hour[i].rx);
+		ck_assert_int_eq(data.hour[i].tx, filleddb.hour[i].tx);
+	}
+}
+END_TEST
+
+START_TEST(database_outputs_do_not_crash)
+{
+	int i;
+
+	initdb();
+	defaultcfg();
+	strcpy(data.interface, "something");
+	strcpy(data.nick, "nothing");
+	data.totalrx = 1;
+	data.totaltx = 2;
+	data.currx = 3;
+	data.curtx = 4;
+	data.totalrxk = 5;
+	data.totaltxk = 6;
+	data.btime = 7;
+
+	for (i=0; i<30; i++) {
+		data.day[i].date = i+1;
+		data.day[i].rx = data.day[i].tx = i*100;
+		data.day[i].rxk = data.day[i].txk = i;
+		data.day[i].used = 1;
+	}
+
+	for (i=0; i<10; i++) {
+		data.top10[i].date = i+1;
+		data.top10[i].rx = data.top10[i].tx = i*100;
+		data.top10[i].rxk = data.top10[i].txk = i;
+		data.top10[i].used = 1;
+	}
+
+	for (i=0; i<12; i++) {
+		data.month[i].month = i+1;
+		data.month[i].rx = data.month[i].tx = i*100;
+		data.month[i].rxk = data.month[i].txk = i;
+		data.month[i].used = 1;
+	}
+
+	for (i=0; i<24; i++) {
+		data.hour[i].date = i+1;
+		data.hour[i].rx = data.hour[i].tx = i*100;
+	}
+
+	suppress_output();
+
+	showdb(0);
+	showdb(1);
+	showdb(2);
+	showdb(3);
+	showdb(4);
+	showdb(5);
+	showdb(6);
+	showdb(7);
+	showdb(8);
+	showdb(9);
+}
+END_TEST
+
 void add_database_tests(Suite *s)
 {
 	/* Database test cases */
@@ -810,5 +975,7 @@ void add_database_tests(Suite *s)
 	tcase_add_test(tc_db, dbcheck_with_empty_cache);
 	tcase_add_test(tc_db, dbcheck_with_no_changes_in_iflist);
 	tcase_add_test(tc_db, dbcheck_with_filled_cache);
+	tcase_add_test(tc_db, importdb_can_parse_exported_database);
+	tcase_add_test(tc_db, database_outputs_do_not_crash);
 	suite_add_tcase(s, tc_db);
 }