X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fcomm.cpp;h=7b301a6bd2e67f7d981d365b9a8063d137930e1a;hp=5bba916297461a5d437473453f882398f78d85c4;hb=0f8ddc6cbdbd213e3bb00c41567e514fdeeed79d;hpb=517d1214577af263bb4d6821e4e7ad9ba8c94901

diff --git a/test/comm.cpp b/test/comm.cpp
index 5bba916..7b301a6 100644
--- a/test/comm.cpp
+++ b/test/comm.cpp
@@ -1,113 +1,119 @@
-/***************************************************************************
- *   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>
 #include <signal.h>
 #include <stdio.h>
+#include <time.h>
 
 #include <iostream>
 #include <string>
 #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 <socket_client.hxx>
 #include <socket_server.hxx>
 
+#include "test_fixtures.hxx"
+
 using namespace std;
 using namespace libt2n;
-using namespace CppUnit;
 
+BOOST_FIXTURE_TEST_SUITE(test_comm, KillChildOnShutdownFixture)
 
-class test_comm : public TestFixture
+BOOST_AUTO_TEST_CASE(UnixCommToServer)
 {
-    CPPUNIT_TEST_SUITE(test_comm);
-
-    CPPUNIT_TEST(UnixCommToServer);
-    CPPUNIT_TEST(UnixCommToServerAndBack);
-    CPPUNIT_TEST(UnixCommToServerAndBackBig);
-    CPPUNIT_TEST(IPCommToServer);
-    CPPUNIT_TEST(IPCommToServerAndBack);
-    CPPUNIT_TEST(IPCommToServerAndBackBig);
-
-    CPPUNIT_TEST_SUITE_END();
-
-    public:
+    string data;
 
-    void setUp()
-    { }
-
-    void tearDown()
-    { }
-
-    void UnixCommToServer()
+    switch(child_pid=fork())
     {
-        pid_t pid;
-        string data;
-
-        switch(pid=fork())
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc("./socket");
                 sc.write("hello");
-                // don't call atexit and stuff
-                _exit(0);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
 
-            default:
-            // parent
-            {
-                socket_server ss("./socket");
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                {
-                    ss.fill_buffer(1000000);
+        default:
+        // parent
+        {
+            socket_server ss("./socket");
 
-                    if(ss.get_packet(data))
-                        break;
-                }
+            time_t t0 = time(NULL);
+
+            // max 10 sec
+            while (time(NULL) < t0 + 10 )
+            {
+                ss.fill_buffer(1000000);
+
+                if(ss.get_packet(data))
+                    break;
             }
         }
-        CPPUNIT_ASSERT_EQUAL(string("hello"),data);
     }
+    BOOST_CHECK_EQUAL(string("hello"),data);
+}
 
-    void UnixCommToServerAndBack()
+BOOST_AUTO_TEST_CASE(UnixCommToServerAndBack)
+{
+    switch(child_pid=fork())
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 socket_server ss("./socket");
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -127,57 +133,64 @@ class test_comm : public TestFixture
                             con->write("xyz");
                     }
                 }
-                // don't call atexit and stuff
-                _exit(0);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
 
-            default:
-            // parent
-            {
-                string data;
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-                // wait till server is up
-                sleep(1);
-                socket_client_connection sc("./socket");
+        default:
+        // parent
+        {
+            string data;
 
-                sc.write("ABC");
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc("./socket");
 
-                sc.fill_buffer(1000000);
-                sc.get_packet(data);
+            sc.write("ABC");
 
-                CPPUNIT_ASSERT_EQUAL(string("DEF"),data);
+            sc.fill_buffer(1000000);
+            sc.get_packet(data);
 
-                sc.write("HAHA");
+            BOOST_CHECK_EQUAL(string("DEF"),data);
 
-                sc.fill_buffer(1000000);
-                sc.get_packet(data);
+            sc.write("HAHA");
 
-                CPPUNIT_ASSERT_EQUAL(string("xyz"),data);
+            sc.fill_buffer(1000000);
+            sc.get_packet(data);
 
-                sc.write("QUIT");
-            }
+            BOOST_CHECK_EQUAL(string("xyz"),data);
+
+            sc.write("QUIT");
         }
     }
+}
 
-    void UnixCommToServerAndBackBig()
+BOOST_AUTO_TEST_CASE(UnixCommToServerAndBackBig)
+{
+    switch(child_pid=fork())
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 socket_server ss("./socket");
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -194,91 +207,107 @@ class test_comm : public TestFixture
                         con->write(string().insert(0,100*1024,'y'));
                     }
                 }
-                // don't call atexit and stuff
-                _exit(0);
+                std::cerr << "child: OVER" << std::endl;
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
 
-            default:
-            // parent
-            {
-                string data;
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-                // wait till server is up
-                sleep(1);
-                socket_client_connection sc("./socket");
+        default:
+        // parent
+        {
+            string data;
 
-                sc.write(string().insert(0,100*1024,'x'));
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc("./socket");
 
-                while (!sc.get_packet(data))
-                    sc.fill_buffer(1000000);
+            sc.write(string().insert(0,100*1024,'x'));
 
-                CPPUNIT_ASSERT_EQUAL(string().insert(0,100*1024,'y'),data);
+            while (!sc.get_packet(data))
+                sc.fill_buffer(1000000);
 
-                sc.write("QUIT");
-            }
+            BOOST_CHECK_EQUAL(string().insert(0,100*1024,'y'),data);
+
+            sc.write("QUIT");
         }
     }
+}
 
-    void IPCommToServer()
-    {
-        pid_t pid;
-        string data;
+BOOST_AUTO_TEST_CASE(IPCommToServer)
+{
+    string data;
 
-        switch(pid=fork())
+    switch(child_pid=fork())
+    {
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 // wait till server is up
                 sleep(1);
                 socket_client_connection sc(6666);
                 sc.write("hello");
-                // don't call atexit and stuff
-                _exit(0);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
 
-            default:
-            // parent
-            {
-                socket_server ss(6666);
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-                // max 10 sec
-                for (int i=0; i < 10; i++)
-                {
-                    ss.fill_buffer(1000000);
+        default:
+        // parent
+        {
+            socket_server ss(6666);
 
-                    if(ss.get_packet(data))
-                        break;
-                }
+            time_t t0 = time(NULL);
+
+            // max 10 sec
+            while (time(NULL) < t0 + 10 )
+            {
+                ss.fill_buffer(1000000);
+
+                if(ss.get_packet(data))
+                    break;
             }
         }
-        CPPUNIT_ASSERT_EQUAL(string("hello"),data);
     }
+    BOOST_CHECK_EQUAL(string("hello"),data);
+}
 
-    void IPCommToServerAndBack()
+BOOST_AUTO_TEST_CASE(IPCommToServerAndBack)
+{
+    switch(child_pid=fork())
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 socket_server ss(6666);
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -298,57 +327,63 @@ class test_comm : public TestFixture
                             con->write("xyz");
                     }
                 }
-                // don't call atexit and stuff
-                _exit(0);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-            default:
-            // parent
-            {
-                string data;
+        default:
+        // parent
+        {
+            string data;
 
-                // wait till server is up
-                sleep(1);
-                socket_client_connection sc(6666);
-                sc.write("ABC");
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc(6666);
+            sc.write("ABC");
 
-                sc.fill_buffer(1000000);
-                sc.get_packet(data);
+            sc.fill_buffer(1000000);
+            sc.get_packet(data);
 
-                CPPUNIT_ASSERT_EQUAL(string("DEF"),data);
+            BOOST_CHECK_EQUAL(string("DEF"),data);
 
-                sc.write("HAHA");
+            sc.write("HAHA");
 
-                sc.fill_buffer(1000000);
-                sc.get_packet(data);
+            sc.fill_buffer(1000000);
+            sc.get_packet(data);
 
-                CPPUNIT_ASSERT_EQUAL(string("xyz"),data);
+            BOOST_CHECK_EQUAL(string("xyz"),data);
 
-                sc.write("QUIT");
-            }
+            sc.write("QUIT");
         }
     }
+}
 
 
-    void IPCommToServerAndBackBig()
+BOOST_AUTO_TEST_CASE(IPCommToServerAndBackBig)
+{
+    switch(child_pid=fork())
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        case -1:
         {
-            case -1:
-            {
-                CPPUNIT_FAIL("fork error");
-                break;
-            }
-            case 0:
-            // child
+            BOOST_FAIL("fork error");
+            break;
+        }
+        case 0:
+        // child
+        {
+            try
             {
                 socket_server ss(6666);
                 ss.set_logging(&cerr,debug);
 
+                time_t t0 = time(NULL);
+
                 // max 10 sec
-                for (int i=0; i < 10; i++)
+                while (time(NULL) < t0 + 10 )
                 {
                     ss.fill_buffer(1000000);
 
@@ -368,33 +403,33 @@ class test_comm : public TestFixture
                         con->write(string().insert(0,2048*1024,'y'));
                     }
                 }
-                // don't call atexit and stuff
-                _exit(0);
+            } catch(...)
+            {
+                std::cerr << "exception in child. ignoring\n";
             }
+            // don't call atexit and stuff
+            _exit(0);
+        }
 
-            default:
-            // parent
-            {
-                string data;
+        default:
+        // parent
+        {
+            string data;
 
-                // wait till server is up
-                sleep(1);
-                socket_client_connection sc(6666);
+            // wait till server is up
+            sleep(1);
+            socket_client_connection sc(6666);
 
-                sc.write(string().insert(0,100*1024,'x'));
+            sc.write(string().insert(0,100*1024,'x'));
 
-                while (!sc.get_packet(data))
-                    sc.fill_buffer(1000000);
+            while (!sc.get_packet(data))
+                sc.fill_buffer(1000000);
 
-                CPPUNIT_ASSERT_EQUAL(string().insert(0,2048*1024,'y'),data);
+            BOOST_CHECK_EQUAL(string().insert(0,2048*1024,'y'),data);
 
-                sc.write("QUIT");
-            }
+            sc.write("QUIT");
         }
-    } // eo IPCommToServerAndBackBig()
-
-
-
-};
+    }
+} // eo IPCommToServerAndBackBig()
 
-CPPUNIT_TEST_SUITE_REGISTRATION(test_comm);
+BOOST_AUTO_TEST_SUITE_END()