X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fhello.cpp;h=302fb482bbb90cced6518852efd44da36c3f8c98;hp=a0cc532aed892e9bb54bfaf99b7e69c30651809e;hb=276fd05261cb316a260784ec34db6da699e594de;hpb=04d86ba4ad4f14ab08f38804e772ec46a8ac92b0

diff --git a/test/hello.cpp b/test/hello.cpp
index a0cc532..302fb48 100644
--- a/test/hello.cpp
+++ b/test/hello.cpp
@@ -51,17 +51,24 @@ class test_hello : public TestFixture
     CPPUNIT_TEST(BadVersion);
     CPPUNIT_TEST(SeparatorMissing);
     CPPUNIT_TEST(WrongByteOrder);
-    CPPUNIT_TEST(OtherServer);
+    CPPUNIT_TEST(OtherServerBig);
+    CPPUNIT_TEST(OtherServerSmall);
 
     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 send_hello(string hello_string, socket_server* ss, int conn_id)
     {
@@ -80,9 +87,7 @@ class test_hello : public TestFixture
 
     void HelloOk()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -92,19 +97,26 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
 
-                ostringstream hello;
-                hello << "T2Nv" << PROTOCOL_VERSION << ';';
-                int byteordercheck=1;
-                hello.write((char*)&byteordercheck,sizeof(byteordercheck));
-                hello << ';';
+                    ostringstream hello;
+                    hello << "T2Nv" << PROTOCOL_VERSION << ';';
+                    int byteordercheck=1;
+                    hello.write((char*)&byteordercheck,sizeof(byteordercheck));
+                    hello << ';';
 
-                ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+                    ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -117,16 +129,14 @@ class test_hello : public TestFixture
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc("./socket");
-                command_client cc(sc);
+                command_client cc(&sc);
             }
         }
     }
 
     void BadTag()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -136,16 +146,23 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
 
-                ostringstream hello;
-                hello << "XYZ 123";
+                    ostringstream hello;
+                    hello << "XYZ 123";
 
-                ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+                    ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -159,16 +176,13 @@ class test_hello : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
 
-                string errormsg;
+                command_client cc(&sc);
 
-                try
-                {
-                    command_client cc(sc);
-                }
-                catch(t2n_version_mismatch &e)
-                { errormsg=e.what(); }
-                catch(...)
-                { throw; }
+                t2n_exception* ep=cc.get_constuctor_exception();
+
+                string errormsg;
+                if (ep)
+                    errormsg=ep->what();
 
                 CPPUNIT_ASSERT_EQUAL(string("illegal hello received (T2N)"),errormsg);
             }
@@ -177,9 +191,7 @@ class test_hello : public TestFixture
 
     void BadVersion()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -189,20 +201,27 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
 
-                ostringstream hello;
-                // lets hope we don't ever get near such a version number...
-                hello << "T2Nv" << 4982271 << ';';
-                int byteordercheck=1;
-                hello.write((char*)&byteordercheck,sizeof(byteordercheck));
-                hello << ';';
+                    ostringstream hello;
+                    // lets hope we don't ever get near such a version number...
+                    hello << "T2Nv" << 4982271 << ';';
+                    int byteordercheck=1;
+                    hello.write((char*)&byteordercheck,sizeof(byteordercheck));
+                    hello << ';';
 
-                ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+                    ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -216,16 +235,13 @@ class test_hello : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
 
-                string errormsg;
+                command_client cc(&sc);
 
-                try
-                {
-                    command_client cc(sc);
-                }
-                catch(t2n_version_mismatch &e)
-                { errormsg=e.what(); }
-                catch(...)
-                { throw; }
+                t2n_exception* ep=cc.get_constuctor_exception();
+
+                string errormsg;
+                if (ep)
+                    errormsg=ep->what();
 
                 CPPUNIT_ASSERT_EQUAL(string("not compatible with the server protocol version"),errormsg);
             }
@@ -234,9 +250,7 @@ class test_hello : public TestFixture
 
     void SeparatorMissing()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -246,19 +260,26 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
 
-                ostringstream hello;
-                hello << "T2Nv" << PROTOCOL_VERSION;
-                int byteordercheck=1;
-                hello.write((char*)&byteordercheck,sizeof(byteordercheck));
-                hello << ';';
+                    ostringstream hello;
+                    hello << "T2Nv" << PROTOCOL_VERSION;
+                    int byteordercheck=1;
+                    hello.write((char*)&byteordercheck,sizeof(byteordercheck));
+                    hello << ';';
 
-                ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+                    ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -272,16 +293,13 @@ class test_hello : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
 
-                string errormsg;
+                command_client cc(&sc);
 
-                try
-                {
-                    command_client cc(sc);
-                }
-                catch(t2n_version_mismatch &e)
-                { errormsg=e.what(); }
-                catch(...)
-                { throw; }
+                t2n_exception* ep=cc.get_constuctor_exception();
+
+                string errormsg;
+                if (ep)
+                    errormsg=ep->what();
 
                 CPPUNIT_ASSERT_EQUAL(string("illegal hello received (1. ;)"),errormsg);
             }
@@ -290,9 +308,7 @@ class test_hello : public TestFixture
 
     void WrongByteOrder()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -302,28 +318,35 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
+
+                    ostringstream hello;
+                    hello << "T2Nv" << PROTOCOL_VERSION << ';';
+                    int byteordercheck=1;
+                    int dst;
+                    char* si=(char*)&byteordercheck;
+                    char* di=(char*)&dst;
 
-                ostringstream hello;
-                hello << "T2Nv" << PROTOCOL_VERSION << ';';
-                int byteordercheck=1;
-                int dst;
-                char* si=(char*)&byteordercheck;
-                char* di=(char*)&dst;
+                    di[0]=si[3];
+                    di[1]=si[2];
+                    di[2]=si[1];
+                    di[3]=si[0];
 
-                di[0]=si[3];
-                di[1]=si[2];
-                di[2]=si[1];
-                di[3]=si[0];
+                    hello.write((char*)&dst,sizeof(dst));
+                    hello << ';';
 
-                hello.write((char*)&dst,sizeof(dst));
-                hello << ';';
+                    ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
 
-                ss.add_callback(new_connection,bind(&test_hello::send_hello, boost::ref(*this), hello.str(),&ss, _1));
+                    // max 10 sec
+                    for (int i=0; i < 10; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -337,27 +360,22 @@ class test_hello : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
 
-                string errormsg;
+                command_client cc(&sc);
 
-                try
-                {
-                    command_client cc(sc);
-                }
-                catch(t2n_version_mismatch &e)
-                { errormsg=e.what(); }
-                catch(...)
-                { throw; }
+                t2n_exception* ep=cc.get_constuctor_exception();
+
+                string errormsg;
+                if (ep)
+                    errormsg=ep->what();
 
                 CPPUNIT_ASSERT_EQUAL(string("host byte order not matching"),errormsg);
             }
         }
     }
 
-    void OtherServer()
+    void OtherServerBig()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -367,17 +385,24 @@ class test_hello : public TestFixture
             case 0:
             // child
             {
-                socket_server ss("./socket");
+                try
+                {
+                    socket_server ss("./socket");
 
-                ostringstream hello;
-                // hmm, we got the wrong socket
-                hello << "* OK intradev.net.lan Cyrus IMAP4 v2.2.13 server ready";
+                    ostringstream hello;
+                    // hmm, we got the wrong socket
+                    hello << "* OK intradev.net.lan Cyrus IMAP4 v2.2.13 server ready";
 
-                ss.add_callback(new_connection,bind(&test_hello::send_raw_socket, boost::ref(*this), hello.str(),&ss, _1));
+                    ss.add_callback(new_connection,bind(&test_hello::send_raw_socket, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 3 sec
+                    for (int i=0; i < 3; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
+                }
 
-                // max 3 sec
-                for (int i=0; i < 3; i++)
-                    ss.fill_buffer(1000000);
                 // don't call atexit and stuff
                 _exit(0);
             }
@@ -391,16 +416,69 @@ class test_hello : public TestFixture
                 sleep(1);
                 socket_client_connection sc("./socket");
 
+                command_client cc(&sc);
+
+                t2n_exception* ep=cc.get_constuctor_exception();
+
                 string errormsg;
+                if (ep)
+                    errormsg=ep->what();
+
+                CPPUNIT_ASSERT_EQUAL(string("illegal hello received (T2N)"),errormsg);
+            }
+        }
+    }
 
+    void OtherServerSmall()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_FAIL("fork error");
+                break;
+            }
+            case 0:
+            // child
+            {
                 try
                 {
-                    command_client cc(sc);
+                    socket_server ss("./socket");
+
+                    ostringstream hello;
+                    // hmm, we got the wrong socket
+                    hello << "READY";
+
+                    ss.add_callback(new_connection,bind(&test_hello::send_raw_socket, boost::ref(*this), hello.str(),&ss, _1));
+
+                    // max 3 sec
+                    for (int i=0; i < 3; i++)
+                        ss.fill_buffer(1000000);
+                } catch(...)
+                {
+                    std::cerr << "exception in child. ignoring\n";
                 }
-                catch(t2n_version_mismatch &e)
-                { errormsg=e.what(); }
-                catch(...)
-                { throw; }
+
+                // don't call atexit and stuff
+                _exit(0);
+            }
+
+            default:
+            // parent
+            {
+                string data;
+
+                // wait till server is up
+                sleep(1);
+                socket_client_connection sc("./socket");
+
+                command_client cc(&sc);
+
+                t2n_exception* ep=cc.get_constuctor_exception();
+
+                string errormsg;
+                if (ep)
+                    errormsg=ep->what();
 
                 CPPUNIT_ASSERT_EQUAL(string("illegal hello received (T2N)"),errormsg);
             }