X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=99c720fd8eaf95e396c7b28ac18626b9750e3927;hp=462a03ffe6e7cdf9de0bfafa16e4d5e43e0d200c;hb=441d41fe583765902aa2f9641c0977e295e62be3;hpb=d535333ffe637c9e547e68b792f334c229641520

diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp
index 462a03f..99c720f 100644
--- a/test/simplecmd.cpp
+++ b/test/simplecmd.cpp
@@ -36,8 +36,13 @@ 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;
 }
 
@@ -110,23 +115,29 @@ 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();
 
+    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);
+    }
 
     void SimpleCmd()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -136,12 +147,18 @@ class test_simplecmd : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
-                command_server cs(ss);
-
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    cs.handle(1000000);
+                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);
@@ -154,7 +171,7 @@ class test_simplecmd : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
                 sc.set_logging(&cerr,debug);
-                command_client cc(sc);
+                command_client cc(&sc);
 
                 result_container rc;
                 cc.send_command(new testfunc_cmd("hello"),rc);
@@ -166,6 +183,157 @@ class test_simplecmd : public TestFixture
         }
     }
 
+    void SimpleException()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                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);
+            }
+
+            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()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                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);
+            }
+
+            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()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_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();
+
+                CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'y')+", testfunc() was here",ret);
+            }
+        }
+    }
 
 };