From f952a214aa64606392cfdcf976e703547e39fdfc Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Tue, 27 Mar 2012 13:21:06 +0200 Subject: [PATCH] some tests for socket class --- .gitignore | 2 +- tests/Makefile.am | 25 +++++++++++-------- tests/loggerTest | Bin 62970 -> 66744 bytes tests/socketTest.c | 61 ++++++++++++++++----------------------------- 4 files changed, 37 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index f9e7c69..0846e85 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ coveragereport/ /missing stamp-h1 src/taskrambler -/tests/classTest +/tests/*Test diff --git a/tests/Makefile.am b/tests/Makefile.am index bb2385f..2736f23 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet -TESTS = classTest loggerTest# socketTest serverTest -check_PROGRAMS = classTest loggerTest# socketTest serverTest +TESTS = classTest loggerTest socketTest# serverTest +check_PROGRAMS = classTest loggerTest socketTest# serverTest COMMON = runtest.c CLASS = $(COMMON) \ @@ -10,17 +10,19 @@ CLASS = $(COMMON) \ ../src/class/interface/i_class.c \ mock/mock_class.c -LOGGER = $(COMMON) \ - ../src/class/interface.c \ - ../src/class/interface/i_class.c \ +LOGGER = $(CLASS) \ ../src/logger/logger.c \ ../src/logger/stderr.c \ ../src/logger/syslog.c \ ../src/logger/interface/i_logger.c \ mock/mock_logger.c -#SOCKET = $(LOGGER) ../src/socket.c ../src/socket/listen.c \ -# ../src/socket/accept.c ../src/socket/connect.c +SOCKET = $(LOGGER) \ + ../src/socket/socket.c \ + ../src/socket/listen.c \ + ../src/socket/accept.c \ + ../src/socket/connect.c + #SERVER = $(SOCKET) ../src/server.c ../src/server/run.c \ # ../src/server/close_conn.c ../src/utils/signalHandling.c @@ -32,12 +34,13 @@ loggerTest_SOURCES = $(LOGGER) loggerTest.c loggerTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . loggerTest_LDFLAGS = -lgcov -#socketTest_SOURCES = $(SOCKET) socketTest.c -#socketTest_CFLAGS = -Wall -ggdb -O0 -I ../include -I .. -I . -# +socketTest_SOURCES = $(SOCKET) socketTest.c +socketTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I . +socketTest_LDFLAGS = -lgcov + #serverTest_SOURCES = $(SERVER) serverTest.c #serverTest_CFLAGS = -Wall -ggdb -O0 -I ../include -I .. -I . -EXTRA_DIST = runtest.h mock/mock_class.h +EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h check-build: $(check_PROGRAMS) diff --git a/tests/loggerTest b/tests/loggerTest index 08e44f29cfdba8aa6a7874be0d45ffac0358fca3..2fdb4ace95cfc9e69c6cd17fa406fb5f5d366f28 100755 GIT binary patch delta 18890 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

dz5=sly|0-T&h|e9)9?Xon!(mV+ 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 #include "runtest.h" -#include "logger.h" -#include "cclass.h" +#include "class.h" #include "socket.h" +#include "logger.h" +#include "mock/mock_logger.h" #define TEST_PORT 11212 -int level = -1; -char * msg = NULL; - -static void -logfnct_mock(int _level, const char * _msg) -{ - level = _level; - msg = malloc(strlen(_msg) + 1); - strcpy(msg, _msg); -} - const char testname[] = "socketTest"; -LOGGER logger = NULL; -SOCK sock = NULL; + +MockLogger logger = NULL; +Sock sock = NULL; static int __setUp() { - logger = new(LOGGER, NULL); - logger_add(logger, logfnct_mock); + logger = new(MockLogger, LOGGER_DEBUG); - sock = new(SOCK, logger, TEST_PORT); + sock = new(Sock, logger, TEST_PORT); - ASSERT_INSTANCE_OF(SOCK, sock); - ASSERT_INSTANCE_OF(LOGGER, sock->logger); + ASSERT_INSTANCE_OF(Sock, sock); + ASSERT_INSTANCE_OF(MockLogger, sock->log); ASSERT_EQUAL(TEST_PORT, sock->port); ASSERT_NOT_EQUAL(0, sock->handle); @@ -48,21 +38,14 @@ static int __tearDown() { - level = -1; - - if (NULL != msg) { - free(msg); - msg = NULL; - } - if (NULL != logger) { ASSERT_OBJECT(logger); - delete(&logger); + delete(logger); } if (NULL != sock) { ASSERT_OBJECT(sock); - delete(&sock); + delete(sock); } return TEST_OK; @@ -73,29 +56,29 @@ static int testListen() { - sock_listen(sock, 10); + socketListen(sock, 10); return TEST_OK; } static int -testAccept() +testAcceptConnect() { - SOCK acc, con; + Sock acc, con; char addr[16]; pid_t pid; - sock_listen(sock, 10); + socketListen(sock, 10); pid = fork(); switch(pid) { case 0: - con = new(SOCK, logger, TEST_PORT); + con = new(Sock, logger, TEST_PORT); sleep(1); - sock_connect(con, "127.0.0.1"); - delete(&con); + socketConnect(con, "127.0.0.1", &addr); + delete(con); __tearDown(); exit(EXIT_SUCCESS); @@ -103,12 +86,12 @@ testAccept() return TEST_FAILED; default: - acc = sock_accept(sock, addr); + acc = socketAccept(sock, &addr); } if (NULL != acc) { ASSERT_OBJECT(acc); - delete(&acc); + delete(acc); } return TEST_OK; @@ -116,7 +99,7 @@ testAccept() const testfunc tests[] = { testListen, - testAccept + testAcceptConnect }; const size_t count = FUNCS_COUNT(tests);