Switch time() calls to monotonic clock calls (#7597)
[libt2n] / test / simplecmd.cpp
index 03071de..97fa6da 100644 (file)
@@ -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>
@@ -46,8 +45,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;
 
 string testfunc(const string& str)
 {
@@ -125,231 +125,204 @@ BOOST_CLASS_EXPORT(testfunc_res)
 
 using namespace libt2n;
 
-class test_simplecmd : public TestFixture
+BOOST_FIXTURE_TEST_SUITE(test_simplecmd, KillChildOnShutdownFixture)
+
+BOOST_AUTO_TEST_CASE(SimpleCmd)
 {
-    CPPUNIT_TEST_SUITE(test_simplecmd);
+    switch(child_pid=fork())
+    {
+        case -1:
+        {
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
+            {
+                socket_server ss("./socket");
+                command_server cs(ss);
 
-    CPPUNIT_TEST(SimpleCmd);
-    CPPUNIT_TEST(SimpleException);
-    CPPUNIT_TEST(BigReturn);
-    CPPUNIT_TEST(BigParameter);
+                // max 10 sec
+                for (int i=0; i < 10; i++)
+                    cs.handle(1000000);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
+            }
 
-    CPPUNIT_TEST_SUITE_END();
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-    pid_t child_pid;
+        default:
+        // parent
+        {
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc("./socket");
+            sc.set_logging(&cerr,debug);
+            command_client cc(&sc);
 
-    public:
+            result_container rc;
+            cc.send_command(new testfunc_cmd("hello"),rc);
 
-    void setUp()
-    { }
+            string ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
 
-    void tearDown()
-    {
-        // make sure the server-child is dead before the next test runs
-        kill(child_pid,SIGKILL);
-        sleep(1);
+            BOOST_CHECK_EQUAL(string("hello, testfunc() was here"),ret);
+        }
     }
+}
 
-    void SimpleCmd()
+BOOST_AUTO_TEST_CASE(SimpleException)
+{
+    switch(child_pid=fork())
     {
-        switch(child_pid=fork())
+        case -1:
+        {
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
         {
-            case -1:
+            try
             {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+                socket_server ss("./socket");
+                command_server cs(ss);
+
+                // max 10 sec
+                for (int i=0; i < 10; i++)
+                    cs.handle(1000000);
+            } catch(...)
             {
-                try
-                {
-                    socket_server ss("./socket");
-                    command_server 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");
-                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<testfunc_res*>(rc.get_result())->get_data();
+            result_container rc;
+            cc.send_command(new testfunc_cmd("throw"),rc);
 
-                CPPUNIT_ASSERT_EQUAL(string("hello, testfunc() was here"),ret);
-            }
-        }
-    }
+            string ret;
 
-    void SimpleException()
-    {
-        switch(child_pid=fork())
-        {
-            case -1:
+            try
             {
-                CPPUNIT_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++)
-                        cs.handle(1000000);
-                } catch(...)
-                {
-                    std::cerr << "exception in child. ignoring\n";
-                }
-
-                // don't call atexit and stuff
-                _exit(0);
+                ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
             }
+            catch(t2n_runtime_error &e)
+                { ret=e.what(); }
 
-            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
-                {
-                    ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
-                }
-                catch(t2n_runtime_error &e)
-                    { ret=e.what(); }
-                catch(...)
-                    { throw; }
-
-                CPPUNIT_ASSERT_EQUAL(string("throw me around"),ret);
-            }
+            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:
+        {
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
         {
-            case -1:
+            try
             {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+                socket_server ss("./socket");
+                command_server cs(ss);
+
+                // max 10 sec
+                for (int i=0; i < 10; i++)
+                    cs.handle(1000000);
+            } catch(...)
             {
-                try
-                {
-                    socket_server ss("./socket");
-                    command_server 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);
+        }
 
-                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<testfunc_res*>(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<testfunc_res*>(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:
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
-                CPPUNIT_FAIL("fork error");
-                break;
+                socket_server ss("./socket");
+                command_server cs(ss);
+
+                // max 60 sec - we need atleast 28 handle calls to transfer the buffer
+                for (int i=0; i < 60; i++) {
+                    cs.handle(1000000);
             }
-            case 0:
-            // child
+            } catch(...)
             {
-                try
-                {
-                    socket_server ss("./socket");
-                    command_server cs(ss);
-
-                    // max 60 sec - we need atleast 28 handle calls to transfer the buffer
-                    for (int i=0; i < 60; 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 testfunc_cmd(string().insert(0,100*1024,'y')),rc);
+            result_container rc;
+            cc.send_command(new testfunc_cmd(string().insert(0,100*1024,'y')),rc);
 
-                string ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
+            string ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
 
-                CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret);
-            }
+            BOOST_CHECK_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret);
         }
     }
+}
 
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(test_simplecmd);
+BOOST_AUTO_TEST_SUITE_END()