X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fsimplecmd.cpp;h=b2b5bbdca2f8f1c0883d469150aa508a42c62eb7;hp=9c1472b4faf8ecf535626592dfd714a560fbd6b0;hb=e453407db5951aa7f504282ea82d1ca1f19d22fb;hpb=a7170401dd90dc79cc7d7a808cfe18a06c7e983b

diff --git a/test/simplecmd.cpp b/test/simplecmd.cpp
index 9c1472b..b2b5bbd 100644
--- a/test/simplecmd.cpp
+++ b/test/simplecmd.cpp
@@ -19,9 +19,10 @@
 #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>
@@ -31,17 +32,18 @@
 #include <command_server.hxx>
 
 using namespace std;
-using namespace libt2n;
 using namespace CppUnit;
 
 string testfunc(const string& str)
 {
+    if (str=="throw")
+        throw libt2n::t2n_runtime_error("throw me around");
     string ret(str);
     ret+=", testfunc() was here";
     return ret;
 }
 
-class testfunc_res : public result
+class testfunc_res : public libt2n::result
 {
     private:
         string res;
@@ -50,7 +52,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);
         }
 
@@ -92,7 +94,7 @@ class testfunc_cmd : public libt2n::command
             param=str;
         }
 
-        result* operator()()
+        libt2n::result* operator()()
         {
             return new testfunc_res(testfunc(param));
         }
@@ -103,11 +105,14 @@ class testfunc_cmd : public libt2n::command
 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_SUITE_END();
 
@@ -164,6 +169,58 @@ 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);
+            }
+        }
+    }
 
 };