X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=97fa6da0f50a0e6a03216fd8dc170fddb8c5f9e3;hp=b48fab6def40a0e96a4c4243ee6502c1e64985f5;hb=44b4600fd51677e54dd167734ca9252b58237cda;hpb=d184c64894e6c4f3adb9467078acfc9e7446664a

diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp
index b48fab6..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 <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
@@ -15,9 +30,14 @@
 #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 <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#include <boost/serialization/serialization.hpp>
 
 #include <container.hxx>
 #include <socket_client.hxx>
@@ -25,23 +45,23 @@
 #include <command_client.hxx>
 #include <command_server.hxx>
 
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/level.hpp>
-#include <boost/serialization/tracking.hpp>
-#include <boost/serialization/export.hpp>
+#include "test_fixtures.hxx"
 
 using namespace std;
-using namespace libt2n;
-using namespace CppUnit;
 
 string testfunc(const string& str)
 {
-    string ret(str);
-    ret+=", testfunc() was here";
+    string ret;
+    if (str=="throw")
+        throw libt2n::t2n_runtime_error("throw me around");
+    if (str=="big")
+        ret.insert(0,100*1024,'x');
+    else
+        ret=str+", testfunc() was here";
     return ret;
 }
 
-class testfunc_res : public result
+class testfunc_res : public libt2n::result
 {
     private:
         string res;
@@ -50,7 +70,7 @@ class testfunc_res : public result
         template<class Archive>
         void serialize(Archive & ar, const unsigned int version)
         {
-            ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(result);
+            ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);
             ar & BOOST_SERIALIZATION_NVP(res);
         }
 
@@ -69,6 +89,7 @@ class testfunc_res : public result
         }
 };
 
+
 class testfunc_cmd : public libt2n::command
 {
     private:
@@ -78,7 +99,6 @@ class testfunc_cmd : public libt2n::command
         template<class Archive>
         void serialize(Archive & ar, const unsigned int version)
         {
-            cerr << "ser: testfunc_cmd" << endl;
             ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);
             ar & BOOST_SERIALIZATION_NVP(param);
         }
@@ -92,78 +112,217 @@ class testfunc_cmd : public libt2n::command
             param=str;
         }
 
-        result* operator()()
+        libt2n::result* operator()()
         {
             return new testfunc_res(testfunc(param));
         }
 };
 
+#include <boost/serialization/export.hpp>
 
 BOOST_CLASS_EXPORT(testfunc_cmd)
 BOOST_CLASS_EXPORT(testfunc_res)
 
-class test_simplecmd : public TestFixture
+using namespace libt2n;
+
+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);
+                // 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);
+        }
 
-    public:
+        default:
+        // parent
+        {
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc("./socket");
+            sc.set_logging(&cerr,debug);
+            command_client cc(&sc);
 
-    void setUp()
-    {
-}
+            result_container rc;
+            cc.send_command(new testfunc_cmd("hello"),rc);
+
+            string ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
 
-    void tearDown()
-    { }
+            BOOST_CHECK_EQUAL(string("hello, testfunc() was here"),ret);
+        }
+    }
+}
 
-    void SimpleCmd()
+BOOST_AUTO_TEST_CASE(SimpleException)
+{
+    switch(child_pid=fork())
     {
-        pid_t pid;
+        case -1:
+        {
+            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++)
+                    cs.handle(1000000);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
+            }
+
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-        switch(pid=fork())
+        default:
+        // parent
         {
-            case -1:
+            // 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
             {
-                CPPUNIT_FAIL("fork error");
-                break;
+                ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
             }
-            case 0:
-            // child
+            catch(t2n_runtime_error &e)
+                { ret=e.what(); }
+
+            BOOST_CHECK_EQUAL(string("throw me around"),ret);
+        }
+    }
+}
+
+BOOST_AUTO_TEST_CASE(BigReturn)
+{
+    switch(child_pid=fork())
+    {
+        case -1:
+        {
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 socket_server ss("./socket");
-                ss.set_logging(&cerr,debug);
                 command_server 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);
+        }
+
+        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("hello"),rc);
+            result_container rc;
+            cc.send_command(new testfunc_cmd("big"),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("hello, testfunc() was here"),ret);
-            }
+            BOOST_CHECK_EQUAL(string().insert(0,100*1024,'x'),ret);
         }
     }
+}
 
+BOOST_AUTO_TEST_CASE(BigParameter)
+{
+    switch(child_pid=fork())
+    {
+        case -1:
+        {
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            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);
+        }
+
+        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);
+
+            string ret=dynamic_cast<testfunc_res*>(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()