-/***************************************************************************
- * Copyright (C) 2004 by Intra2net AG *
- * info@intra2net.com *
- * *
- ***************************************************************************/
+/*
+Copyright (C) 2004 by Intra2net AG
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
#include <sstream>
#include <stdexcept>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/binary_iarchive.hpp>
#include <command_client.hxx>
#include <command_server.hxx>
+#include "test_fixtures.hxx"
+
using namespace std;
-using namespace CppUnit;
using namespace libt2n;
string testfunc4(const string& str)
BOOST_CLASS_EXPORT(testfunc4a_cmd)
BOOST_CLASS_EXPORT(testfunc4b_cmd)
-class test_cmdgroup : public TestFixture
-{
- CPPUNIT_TEST_SUITE(test_cmdgroup);
-
- CPPUNIT_TEST(GroupOk);
- CPPUNIT_TEST(WrongGroup);
-
- CPPUNIT_TEST_SUITE_END();
-
- pid_t child_pid;
-
- public:
-
- void setUp()
- { }
- void tearDown()
- {
- // make sure the server-child is dead before the next test runs
- kill(child_pid,SIGKILL);
- sleep(1);
- }
+BOOST_FIXTURE_TEST_SUITE(test_cmdgroup, KillChildOnShutdownFixture)
- void GroupOk()
+BOOST_AUTO_TEST_CASE(GroupOk)
+{
+ switch(child_pid=fork())
{
- switch(child_pid=fork())
+ case -1:
{
- case -1:
- {
- CPPUNIT_FAIL("fork error");
- break;
- }
- case 0:
- // child
+ BOOST_FAIL("fork error");
+ break;
+ }
+ case 0:
+ // child
+ {
+ try
{
socket_server ss("./socket");
group_command_server<cmd_group_a> cs(ss);
// max 10 sec
for (int i=0; i < 10; i++)
cs.handle(1000000);
-
- // don't call atexit and stuff
- _exit(0);
+ } catch(...)
+ {
+ std::cerr << "exception in child. ignoring\n";
}
- default:
- // parent
- {
- // wait till server is up
- sleep(1);
- socket_client_connection sc("./socket");
- command_client cc(&sc);
+ // don't call atexit and stuff
+ _exit(0);
+ }
- result_container rc;
- cc.send_command(new testfunc4a_cmd("hello"),rc);
+ default:
+ // parent
+ {
+ // wait till server is up
+ sleep(1);
+ socket_client_connection sc("./socket");
+ command_client cc(&sc);
- string ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
+ result_container rc;
+ cc.send_command(new testfunc4a_cmd("hello"),rc);
- CPPUNIT_ASSERT_EQUAL(string("hello, testfunc() was here"),ret);
- }
+ string ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
+
+ BOOST_CHECK_EQUAL(string("hello, testfunc() was here"),ret);
}
}
+}
- void WrongGroup()
+BOOST_AUTO_TEST_CASE(WrongGroup)
+{
+ switch(child_pid=fork())
{
- switch(child_pid=fork())
+ case -1:
{
- case -1:
- {
- CPPUNIT_FAIL("fork error");
- break;
- }
- case 0:
- // child
+ BOOST_FAIL("fork error");
+ break;
+ }
+ case 0:
+ // child
+ {
+ try
{
socket_server ss("./socket");
group_command_server<cmd_group_b> cs(ss);
// max 10 sec
for (int i=0; i < 10; i++)
cs.handle(1000000);
-
- // don't call atexit and stuff
- _exit(0);
- }
-
- default:
- // parent
+ } catch(...)
{
- // wait till server is up
- sleep(1);
- socket_client_connection sc("./socket");
- command_client cc(&sc);
+ std::cerr << "exception in child. ignoring\n";
+ }
- result_container rc;
- cc.send_command(new testfunc4a_cmd("hello"),rc);
+ // don't call atexit and stuff
+ _exit(0);
+ }
- string ret;
+ default:
+ // parent
+ {
+ // wait till server is up
+ sleep(1);
+ socket_client_connection sc("./socket");
+ command_client cc(&sc);
- try
- {
- ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
- }
- catch(t2n_command_error &e)
- { ret=e.what(); }
- catch(...)
- { throw; }
+ result_container rc;
+ cc.send_command(new testfunc4a_cmd("hello"),rc);
- string expected_what="illegal command of type ";
+ string ret;
- CPPUNIT_ASSERT_EQUAL(expected_what,ret.substr(0,expected_what.size()));
+ try
+ {
+ ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
}
+ catch(t2n_command_error &e)
+ { ret=e.what(); }
+
+ string expected_what="illegal command of type ";
+
+ BOOST_CHECK_EQUAL(expected_what,ret.substr(0,expected_what.size()));
}
}
+}
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(test_cmdgroup);
+BOOST_AUTO_TEST_SUITE_END()
git://developer.intra2net.com / libt2n / blobdiff