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

diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp
index b48fab6..eb4343c 100644
--- a/test/simplecmd.cpp
+++ b/test/simplecmd.cpp
@@ -19,29 +19,34 @@
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/HelperMacros.h>
 
+#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>
 #include <socket_server.hxx>
 #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>
-
 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 +55,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 +74,7 @@ class testfunc_res : public result
         }
 };
 
+
 class testfunc_cmd : public libt2n::command
 {
     private:
@@ -78,7 +84,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,21 +97,27 @@ 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)
 
+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();
 
@@ -134,7 +145,6 @@ class test_simplecmd : public TestFixture
             // child
             {
                 socket_server ss("./socket");
-                ss.set_logging(&cerr,debug);
                 command_server cs(ss);
 
                 // max 10 sec
@@ -151,6 +161,7 @@ class test_simplecmd : public TestFixture
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc("./socket");
+                sc.set_logging(&cerr,debug);
                 command_client cc(sc);
 
                 result_container rc;
@@ -163,6 +174,144 @@ class test_simplecmd : public TestFixture
         }
     }
 
+    void SimpleException()
+    {
+        pid_t pid;
+
+        switch(pid=fork())
+        {
+            case -1:
+            {
+                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);
+
+                // 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
+                {
+                    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);
+            }
+        }
+    }
+
+    void BigReturn()
+    {
+        pid_t pid;
+
+        switch(pid=fork())
+        {
+            case -1:
+            {
+                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);
+
+                // 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("big"),rc);
+
+                string ret=dynamic_cast<testfunc_res*>(rc.get_result())->get_data();
+
+                CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'x'),ret);
+            }
+        }
+    }
+
+    void BigParameter()
+    {
+        pid_t pid;
+
+        switch(pid=fork())
+        {
+            case -1:
+            {
+                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);
+
+                // 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();
+
+                CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret);
+            }
+        }
+    }
 
 };