X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fcmdgroup.cpp;fp=test%2Fcmdgroup.cpp;h=1c30cc3534dd2d2ccbc0a23b0639418d9be0b140;hp=6b092ec7bdbbe72dca5d3017b00ca078ff300ffa;hb=307b5e74c506b609d5c407be0943f45255ab5122;hpb=3d9c0861e86edcbfad10b84da332093fd6438f32

diff --git a/test/cmdgroup.cpp b/test/cmdgroup.cpp
index 6b092ec..1c30cc3 100644
--- a/test/cmdgroup.cpp
+++ b/test/cmdgroup.cpp
@@ -30,9 +30,8 @@ on this file might be covered by the GNU General Public License.
 #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>
@@ -47,8 +46,9 @@ on this file might be covered by the GNU General Public License.
 #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)
@@ -173,134 +173,112 @@ BOOST_CLASS_EXPORT(cmd_group_b)
 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:
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+                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);
+            } catch(...)
             {
-                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);
-                } catch(...)
-                {
-                    std::cerr << "exception in child. ignoring\n";
-                }
-
-                // don't call atexit and stuff
-                _exit(0);
+                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);
+        }
+
+        default:
+        // parent
+        {
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc("./socket");
+            command_client cc(&sc);
 
-                result_container rc;
-                cc.send_command(new testfunc4a_cmd("hello"),rc);
+            result_container rc;
+            cc.send_command(new testfunc4a_cmd("hello"),rc);
 
-                string ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
+            string ret=dynamic_cast<testfunc4_res*>(rc.get_result())->get_data();
 
-                CPPUNIT_ASSERT_EQUAL(string("hello, testfunc() was here"),ret);
-            }
+            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
             {
-                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);
-                } catch(...)
-                {
-                    std::cerr << "exception in child. ignoring\n";
-                }
-
-                // don't call atexit and stuff
-                _exit(0);
-            }
+                socket_server ss("./socket");
+                group_command_server<cmd_group_b> cs(ss);
 
-            default:
-            // parent
+                // max 10 sec
+                for (int i=0; i < 10; i++)
+                    cs.handle(1000000);
+            } 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(); }
+            catch(...)
+                { throw; }
+
+            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()