From 5f95718e7ebe4dec017055500793b928d8946d8e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 6 Jun 2020 20:42:17 +0200 Subject: Port existing (in-file embedded) unit-tests to new framework. --- src/Makefile.am | 2 - src/connectionhandler.cc | 108 ----------------------- src/messagehandler.cc | 18 ---- src/messageparser.cc | 18 ---- src/node.cc | 18 ---- src/nodetree.cc | 51 ----------- src/saxparser.cc | 12 --- src/testclient.cc | 217 ----------------------------------------------- src/testclient.h | 28 ------ src/xml_encode_decode.cc | 21 ----- 10 files changed, 493 deletions(-) delete mode 100644 src/testclient.cc delete mode 100644 src/testclient.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index c942b75..d820912 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,6 @@ muniad_SOURCES = \ node.cc \ nodemanager.cc \ nodetree.cc \ - testclient.cc \ xml_encode_decode.cc \ xmlparser.cc \ ../hugin/hugin.c @@ -41,7 +40,6 @@ EXTRA_DIST = \ node.h \ nodemanager.h \ nodetree.h \ - testclient.h \ xml_encode_decode.h \ xmlparser.h \ ../hugin/hugin.h diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc index d0fb9e1..eb0f935 100644 --- a/src/connectionhandler.cc +++ b/src/connectionhandler.cc @@ -111,111 +111,3 @@ SubscriberList ConnectionHandler::subscriberlist(NodeIdList nodes) return clients; } - - -#ifdef TEST_CONNECTIONHANDLER -//deps: -//cflags: -//libs: - -#include "test.h" - -TEST_BEGIN; - -ConnectionHandler &h = connection_handler; - -h.init((clientid_t)1); -h.subscribe((clientid_t)1, (nodeid_t)1); -h.subscribe((clientid_t)1, (nodeid_t)2); - -h.init((clientid_t)2); -h.subscribe((clientid_t)2, (nodeid_t)1); -h.subscribe((clientid_t)2, (nodeid_t)2); - -h.init((clientid_t)3); -h.subscribe((clientid_t)3, (nodeid_t)3); - -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)1); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)3); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)4); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)1); - nodes.push_back((nodeid_t)2); - nodes.push_back((nodeid_t)3); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -h.close((clientid_t)1); -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)1); - nodes.push_back((nodeid_t)2); - nodes.push_back((nodeid_t)3); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -h.close((clientid_t)2); -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)1); - nodes.push_back((nodeid_t)2); - nodes.push_back((nodeid_t)3); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_TRUE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -h.close((clientid_t)3); -{ - NodeIdList nodes; - nodes.push_back((nodeid_t)1); - nodes.push_back((nodeid_t)2); - nodes.push_back((nodeid_t)3); - SubscriberList clst = h.subscriberlist(nodes); - - TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); - TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); - TEST_FALSE(clst.find((clientid_t)3) != clst.end(), "Got client 3?"); -} - -TEST_END; - -#endif/*TEST_CONNECTIONHANDLER*/ diff --git a/src/messagehandler.cc b/src/messagehandler.cc index 5467df9..0d536c3 100644 --- a/src/messagehandler.cc +++ b/src/messagehandler.cc @@ -214,21 +214,3 @@ MessageList handle_msg(MessageList msgList, clientid_t wsi) return outmsgs; } - -#ifdef TEST_MSGHANDLER -//Additional dependency files -//deps: -//Required cflags (autoconf vars may be used) -//cflags: -//Required link options (autoconf vars may be used) -//libs: -#include "test.h" - -TEST_BEGIN; - -// TODO: Put some testcode here (see test.h for usable macros). -TEST_TRUE(false, "No tests yet!"); - -TEST_END; - -#endif/*TEST_MSGHANDLER*/ diff --git a/src/messageparser.cc b/src/messageparser.cc index 82477b7..a5b6d71 100644 --- a/src/messageparser.cc +++ b/src/messageparser.cc @@ -399,21 +399,3 @@ message_t create_msg_move(nodeid_t id, nodeid_t to) m.move.parentid = to; return m; } - -#ifdef TEST_MSGPARSER -//Additional dependency files -//deps: -//Required cflags (autoconf vars may be used) -//cflags: -//Required link options (autoconf vars may be used) -//libs: -#include "test.h" - -TEST_BEGIN; - -// TODO: Put some testcode here (see test.h for usable macros). -TEST_TRUE(false, "No tests yet!"); - -TEST_END; - -#endif/*TEST_MSGPARSER*/ diff --git a/src/node.cc b/src/node.cc index 236a511..698c0b1 100644 --- a/src/node.cc +++ b/src/node.cc @@ -26,21 +26,3 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include "node.h" - -#ifdef TEST_NODE -//Additional dependency files -//deps: -//Required cflags (autoconf vars may be used) -//cflags: -//Required link options (autoconf vars may be used) -//libs: -#include "test.h" - -TEST_BEGIN; - -// TODO: Put some testcode here (see test.h for usable macros). -TEST_TRUE(false, "No tests yet!"); - -TEST_END; - -#endif/*TEST_NODE*/ diff --git a/src/nodetree.cc b/src/nodetree.cc index 1c3992e..2043c90 100644 --- a/src/nodetree.cc +++ b/src/nodetree.cc @@ -422,54 +422,3 @@ void NodeTree::fromXML(std::string xml) XmlParser p(this); p.parse(xml.c_str(), xml.size()); } - - -#ifdef TEST_NODETREE -//Additional dependency files -//deps: debug.cc log.cc -//Required cflags (autoconf vars may be used) -//cflags: -I.. -//Required link options (autoconf vars may be used) -//libs: -#include "test.h" -#include - -#define ROOT_ID 0 -#define LOSTFOUND_ID 1 -#define FINISHED_ID 2 -#define BACKLOG_ID 3 -#define PROJECTS_ID 4 -#define FIRST_NODE_ID 10 - -TEST_BEGIN; - -NodeTree tree; - -node_t t; -t.attributes["title"] = "root"; -t.id = ROOT_ID; -tree.insertAsChild(0, ROOT_ID, t); - -t.attributes["title"] = "Finished"; -t.id = FINISHED_ID; -tree.insertAsChild(ROOT_ID, FINISHED_ID, t); - -t.attributes["title"] = "Backlog"; -t.id = BACKLOG_ID; -tree.insertAsChild(ROOT_ID, BACKLOG_ID, t); - -t.attributes["title"] = "Lost+Found"; -t.id = LOSTFOUND_ID; -tree.insertAsChild(ROOT_ID, LOSTFOUND_ID, t); - -t.attributes["title"] = "Projects"; -t.id = PROJECTS_ID; -tree.insertAsChild(ROOT_ID, PROJECTS_ID, t); - -TEST_EQUAL_INT(5, tree.bfs(0).size(), "Testing BFS function"); -TEST_EQUAL_INT(PROJECTS_ID, tree.data(PROJECTS_ID).id, "Testing project id"); -TEST_EQUAL_INT(ROOT_ID, tree.data(ROOT_ID).id, "Testing root id"); - -TEST_END; - -#endif/*TEST_NODETREE*/ diff --git a/src/saxparser.cc b/src/saxparser.cc index ae0adff..871dc5a 100644 --- a/src/saxparser.cc +++ b/src/saxparser.cc @@ -239,15 +239,3 @@ void SAXParser::startTag(std::string, attributes_t &) void SAXParser::characterData(const std::string &) { } - -#ifdef TEST_SAXPARSER -//deps: -//cflags: -I.. -//libs: -lexpat -#include - -TEST_BEGIN; - -TEST_END; - -#endif/*TEST_SAXPARSER*/ diff --git a/src/testclient.cc b/src/testclient.cc deleted file mode 100644 index 3bd9d62..0000000 --- a/src/testclient.cc +++ /dev/null @@ -1,217 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set et sw=2 ts=2: */ -/*************************************************************************** - * testclient.cc - * - * Thu May 3 10:06:49 CEST 2012 - * Copyright 2012 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of Munia. - * - * Munia 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 2 of the License, or - * (at your option) any later version. - * - * Munia 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 Munia; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#include "testclient.h" - -#ifdef TEST_TESTCLIENT -//deps: -//cflags: $(LIBWEBSOCKETS_CFLAGS) -//libs: $(LIBWEBSOCKETS_LIBS) -#include "test.h" - -#include -#include -#include -#include -#include - -#include - -struct test -{ - const char *command; - const char *result; - bool success; -}; - -enum demo_protocols -{ - PROTOCOL_NODE, -}; - -struct test *current_test = nullptr; - -static int callback_node(struct lws_context *me, - struct lws *wsi, - enum lws_callback_reasons reason, - void *user, void *in, size_t len) -{ - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 4096 + - LWS_SEND_BUFFER_POST_PADDING]; - int l; - - switch (reason) - { - case LWS_CALLBACK_CLOSED: - fprintf(stderr, "mirror: LWS_CALLBACK_CLOSED\n"); - // wsi_mirror = nullptr; - break; - - case LWS_CALLBACK_CLIENT_ESTABLISHED: - // start the ball rolling, - // LWS_CALLBACK_CLIENT_WRITEABLE will come next service - lws_callback_on_writable(me, wsi); - break; - - case LWS_CALLBACK_CLIENT_RECEIVE: - fprintf(stderr, "rx %d '", (int)len); - fwrite(in, len, 1, stderr); - fprintf(stderr, "'\n"); - current_test->success = strncmp(current_test->result, (char*)in, len) == 0; - - current_test++; - lws_callback_on_writable(me, wsi); - break; - - case LWS_CALLBACK_CLIENT_WRITEABLE: - l = sprintf((char *)&buf[LWS_SEND_BUFFER_PRE_PADDING], - "%s", current_test->command); - - fprintf(stderr, "sx '%s'\n", &buf[LWS_SEND_BUFFER_PRE_PADDING]); - - lws_write(wsi, &buf[LWS_SEND_BUFFER_PRE_PADDING], - l, LWS_WRITE_TEXT); - - if(current_test->result == nullptr) - { - current_test->success = true; - current_test++; - lws_callback_on_writable(me, wsi); - } - - // without at least this delay, we choke the browser - // and the connection stalls, despite we now take care about - // flow control - - //usleep(200); - //sleep(1); - break; - - default: - break; - } - - return 0; -} - -static struct lws_protocols protocols[] = -{ - { "lws-node-protocol", callback_node, 0, }, - { nullptr, nullptr, 0 } -}; - -int client(const char *address, int port, struct test tests[]) -{ - current_test = &tests[0]; - - struct lws_context *context; - struct lws *wsi_node = nullptr; - int ietf_version = -1; // latest - - context = lws_create_context(CONTEXT_PORT_NO_LISTEN, nullptr, - protocols, - lws_internal_extensions, - nullptr, nullptr, -1, -1, 0); - if(context == nullptr) - { - fprintf(stderr, "Creating lws context failed\n"); - return 1; - } - - // sit there servicing the websocket context to handle incoming - // packets, and drawing random circles on the mirror protocol websocket - int n = 1; - while(n >= 0 && current_test->command) - { - n = lws_service(context, 1000); - - if(wsi_node == nullptr) - { - wsi_node = lws_client_connect(context, address, port, - 0, "/", address, address, - protocols[PROTOCOL_NODE].name, - ietf_version); - - if` (wsi_node == nullptr) - { - fprintf(stderr, "lws node connect failed\n"); - return -1; - } - } - else - { - //fprintf(stderr, "closing mirror session\n"); - //lws_close_and_free_session(context, - // wsi_mirror, LWS_CLOSE_STATUS_GOINGAWAY); - } - } - - fprintf(stderr, "Exiting\n"); - - lws_context_destroy(context); - - return 0; -} - -TEST_BEGIN; -#define BASE "0 create 0 -1; 0 update 0 \"root\"; 0 create 1 0; 0 update 1 \"Finished\"; 0 create 2 0; 0 update 2 \"Backlog\"; 0 create 3 0; 0 update 3 \"Lost+Found\"; 0 create 4 0; 0 update 4 \"Projects\";" -#define RMBASE "0 remove 4; 0 remove 3; 0 remove 2; 0 remove 1; 0 remove 0;" - -static struct test tests[] = -{ - { "subscribe 0", BASE, false }, - { "unsubscribe 0", RMBASE, false }, - { "create 0", nullptr, false }, - { "subscribe 0", BASE" 0 create 10 0; 0 update 10 \"\";", false }, - { "update 10 \"My title\"", "0 update 10 \"My title\";", false }, - { "unsubscribe 0", "0 remove 10; "RMBASE, false }, - { "subscribe 0", BASE" 0 create 10 0; 0 update 10 \"My title\";", false }, - { "move 10 1", "0 move 10 1;", false }, - { "create 10", "0 create 11 10;", false }, - { "remove 10", "0 remove 11; 0 remove 10;", false }, - //{ "subscribe 0", BASE"0 add title description 5", false }, - //{ "add title2 description 0", BASE"0 add title2 description 6", false }, - //{ "unsubscribe 0", nullptr, false }, - //{ "subscribe 0", BASE"0 add title description 5; add title description 6", false }, - //{ "unsubscribe 0", nullptr, false }, - { nullptr, nullptr, false } -}; - -client("localhost", 10001, tests); - -struct test *t = &tests[0]; -while(t->command) -{ - TEST_TRUE(t->success, "%s", t->command); - t++; -} -// TODO: Put some testcode here (see test.h for usable macros). -//TEST_TRUE(false, "No tests yet!"); - -TEST_END; - -#endif/*TEST_TESTCLIENT*/ diff --git a/src/testclient.h b/src/testclient.h deleted file mode 100644 index f9562f4..0000000 --- a/src/testclient.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set et sw=2 ts=2: */ -/*************************************************************************** - * testclient.h - * - * Thu May 3 10:06:49 CEST 2012 - * Copyright 2012 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of Munia. - * - * Munia 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 2 of the License, or - * (at your option) any later version. - * - * Munia 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 Munia; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#pragma once diff --git a/src/xml_encode_decode.cc b/src/xml_encode_decode.cc index b1777d9..4d56a5f 100644 --- a/src/xml_encode_decode.cc +++ b/src/xml_encode_decode.cc @@ -85,24 +85,3 @@ std::string xml_decode(std::string str) return str; } - -#ifdef TEST_XML_ENCODE_DECODE -//deps: -//cflags: -//libs: -#include - -TEST_BEGIN; - -std::string in = "&AC\"D\'<>\"&E<>"; -std::string enc = xml_encode(in); -std::string denc = xml_encode(enc); -std::string dec = xml_decode(denc); -std::string ddec = xml_decode(dec); - -TEST_EQUAL_STR(in, ddec, "compare"); -TEST_EQUAL_STR(enc, dec, "compare"); - -TEST_END; - -#endif/*TEST_XML_ENCODE_DECODE*/ -- cgit v1.2.3