Increase version

[libt2n] / test / serialize.cpp

diff --git a/test/serialize.cpp b/test/serialize.cpp
index db31fba..3019952 100644 (file)
--- a/test/serialize.cpp
+++ b/test/serialize.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 <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
@@ -15,9 +30,10 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include "test_fixtures.hxx"
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
@@ -32,7 +48,6 @@
 #include <command_server.hxx>
 
 using namespace std;
-using namespace CppUnit;
 
 string testfunc3(const string& str)
 {
@@ -104,44 +119,25 @@ class testfunc3_cmd : public libt2n::command
 
 using namespace libt2n;
 
-class test_serialize : public TestFixture
-{
-    CPPUNIT_TEST_SUITE(test_serialize);
-
-    CPPUNIT_TEST(ClientSerializeErr);
-
-    // TODO: Server Deserialization Error
-    // TODO: Server Serialization Error
-    // TODO: Client Deserialization Error
-    // but those probably need separate client/server binaries
-
-    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_serialize, KillChildOnShutdownFixture)
+// TODO: Server Deserialization Error
+// TODO: Server Serialization Error
+// TODO: Client Deserialization Error
+// but those probably need separate client/server binaries
 
-    void ClientSerializeErr()
+BOOST_AUTO_TEST_CASE(ClientSerializeErr)
+{
+    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);
@@ -149,36 +145,36 @@ class test_serialize : 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");
+            command_client cc(&sc);
+
+            string errormsg;
+
+            result_container rc;
+            try
             {
-                // wait till server is up
-                sleep(1);
-                socket_client_connection sc("./socket");
-                command_client cc(&sc);
-
-                string errormsg;
-
-                result_container rc;
-                try
-                {
-                    cc.send_command(new testfunc3_cmd("xyz"),rc);
-                }
-                catch(t2n_serialization_error &e)
-                    { errormsg=e.what(); }
-                catch(...)
-                    { throw; }
-
-                CPPUNIT_ASSERT_EQUAL(string("archive_exception while serializing on client-side, code 2 (unregistered class)"),errormsg);
+                cc.send_command(new testfunc3_cmd("xyz"),rc);
             }
+            catch(t2n_serialization_error &e)
+                { errormsg=e.what(); }
+
+            BOOST_CHECK_EQUAL(string("archive_exception while serializing on client-side, code 2 (unregistered class)"),errormsg);
         }
     }
+}
 
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(test_serialize);
+BOOST_AUTO_TEST_SUITE_END()