X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=97fa6da0f50a0e6a03216fd8dc170fddb8c5f9e3;hp=36e08f1929d314c7da52d72692fb12538e7aa7ce;hb=HEAD;hpb=b592218402bfa779c024da2f32c4c782d52eaf88 diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp index 36e08f1..97fa6da 100644 --- a/test/simplecmd.cpp +++ b/test/simplecmd.cpp @@ -1,9 +1,24 @@ -/*************************************************************************** - * 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 #include #include @@ -15,9 +30,8 @@ #include #include -#include -#include -#include +#define BOOST_TEST_DYN_LINK +#include #include #include @@ -31,8 +45,9 @@ #include #include +#include "test_fixtures.hxx" + using namespace std; -using namespace CppUnit; string testfunc(const string& str) { @@ -110,42 +125,21 @@ BOOST_CLASS_EXPORT(testfunc_res) using namespace libt2n; -class test_simplecmd : public TestFixture -{ - CPPUNIT_TEST_SUITE(test_simplecmd); - - CPPUNIT_TEST(SimpleCmd); - CPPUNIT_TEST(SimpleException); - CPPUNIT_TEST(BigReturn); - CPPUNIT_TEST(BigParameter); - - CPPUNIT_TEST_SUITE_END(); +BOOST_FIXTURE_TEST_SUITE(test_simplecmd, KillChildOnShutdownFixture) - 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); - } - - void SimpleCmd() +BOOST_AUTO_TEST_CASE(SimpleCmd) +{ + 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"); command_server cs(ss); @@ -153,41 +147,47 @@ class test_simplecmd : public TestFixture // 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"); - sc.set_logging(&cerr,debug); - command_client cc(&sc); + // don't call atexit and stuff + _exit(0); + } - result_container rc; - cc.send_command(new testfunc_cmd("hello"),rc); + default: + // parent + { + // wait till server is up + sleep(1); + socket_client_connection sc("./socket"); + sc.set_logging(&cerr,debug); + command_client cc(&sc); - string ret=dynamic_cast(rc.get_result())->get_data(); + result_container rc; + cc.send_command(new testfunc_cmd("hello"),rc); - CPPUNIT_ASSERT_EQUAL(string("hello, testfunc() was here"),ret); - } + string ret=dynamic_cast(rc.get_result())->get_data(); + + BOOST_CHECK_EQUAL(string("hello, testfunc() was here"),ret); } } +} - void SimpleException() +BOOST_AUTO_TEST_CASE(SimpleException) +{ + 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"); command_server cs(ss); @@ -195,50 +195,54 @@ class test_simplecmd : public TestFixture // 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 + // don't call atexit and stuff + _exit(0); + } + + default: + // parent + { + // wait till server is up + sleep(1); + socket_client_connection sc("./socket"); + sc.set_logging(&cerr,debug); + command_client cc(&sc); + + result_container rc; + cc.send_command(new testfunc_cmd("throw"),rc); + + string ret; + + try { - // wait till server is up - sleep(1); - socket_client_connection sc("./socket"); - sc.set_logging(&cerr,debug); - command_client cc(&sc); - - result_container rc; - cc.send_command(new testfunc_cmd("throw"),rc); - - string ret; - - try - { - ret=dynamic_cast(rc.get_result())->get_data(); - } - catch(t2n_runtime_error &e) - { ret=e.what(); } - catch(...) - { throw; } - - CPPUNIT_ASSERT_EQUAL(string("throw me around"),ret); + ret=dynamic_cast(rc.get_result())->get_data(); } + catch(t2n_runtime_error &e) + { ret=e.what(); } + + BOOST_CHECK_EQUAL(string("throw me around"),ret); } } +} - void BigReturn() +BOOST_AUTO_TEST_CASE(BigReturn) +{ + 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"); command_server cs(ss); @@ -246,70 +250,79 @@ class test_simplecmd : public TestFixture // 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 testfunc_cmd("big"),rc); + default: + // parent + { + // wait till server is up + sleep(1); + socket_client_connection sc("./socket"); + command_client cc(&sc); - string ret=dynamic_cast(rc.get_result())->get_data(); + result_container rc; + cc.send_command(new testfunc_cmd("big"),rc); - CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'x'),ret); - } + string ret=dynamic_cast(rc.get_result())->get_data(); + + BOOST_CHECK_EQUAL(string().insert(0,100*1024,'x'),ret); } } +} - void BigParameter() +BOOST_AUTO_TEST_CASE(BigParameter) +{ + 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"); command_server cs(ss); - // max 10 sec - for (int i=0; i < 10; i++) + // max 60 sec - we need atleast 28 handle calls to transfer the buffer + for (int i=0; i < 60; 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 testfunc_cmd(string().insert(0,100*1024,'y')),rc); + // don't call atexit and stuff + _exit(0); + } - string ret=dynamic_cast(rc.get_result())->get_data(); + default: + // parent + { + // wait till server is up + sleep(1); + socket_client_connection sc("./socket"); + command_client cc(&sc); - CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret); - } + result_container rc; + cc.send_command(new testfunc_cmd(string().insert(0,100*1024,'y')),rc); + + string ret=dynamic_cast(rc.get_result())->get_data(); + + BOOST_CHECK_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret); } } +} -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(test_simplecmd); +BOOST_AUTO_TEST_SUITE_END()