X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=test%2Fcallback.cpp;h=257da83c8e7ee4f56028ae998b624edaf33f1931;hp=beb0c777db059f3dd9a054d8342e9eac1f04072e;hb=393e7b700efffc748e593661b365ead414a341c1;hpb=6cda58a6dad87ff6efe2277db2155be60edb8d48

diff --git a/test/callback.cpp b/test/callback.cpp
index beb0c77..257da83 100644
--- a/test/callback.cpp
+++ b/test/callback.cpp
@@ -33,15 +33,19 @@ class test_callback : public TestFixture
 {
     CPPUNIT_TEST_SUITE(test_callback);
 
-    CPPUNIT_TEST(NewConnCallback);
-    CPPUNIT_TEST(ConnClosedCallback);
-    CPPUNIT_TEST(ConnDeletedCallback);
-    CPPUNIT_TEST(CallbackOrder);
+    CPPUNIT_TEST(ServerNewConnCallback);
+    CPPUNIT_TEST(ServerConnClosedCallback);
+    CPPUNIT_TEST(ServerConnDeletedCallback);
+    CPPUNIT_TEST(ServerCallbackOrder);
+    CPPUNIT_TEST(ClientConnClosedCallback);
+    CPPUNIT_TEST(ClientConnDeletedCallback);
 
     CPPUNIT_TEST_SUITE_END();
 
     std::vector<bool> callback_done;
 
+    pid_t child_pid;
+
     public:
 
     void setUp()
@@ -52,6 +56,10 @@ class test_callback : public TestFixture
     void tearDown()
     {
         callback_done.clear();
+
+        // make sure the server-child is dead before the next test runs
+        kill(child_pid,SIGKILL);
+        sleep(1);
     }
 
     void callback_func(callback_event_type ev, int conn_id)
@@ -63,11 +71,9 @@ class test_callback : public TestFixture
         callback_done[ev]=true;
     }
 
-    void NewConnCallback()
+    void ServerNewConnCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -124,11 +130,9 @@ class test_callback : public TestFixture
         }
     }
 
-    void ConnClosedCallback()
+    void ServerConnClosedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -185,11 +189,9 @@ class test_callback : public TestFixture
         }
     }
 
-    void ConnDeletedCallback()
+    void ServerConnDeletedCallback()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -249,11 +251,9 @@ class test_callback : public TestFixture
         }
     }
 
-    void CallbackOrder()
+    void ServerCallbackOrder()
     {
-        pid_t pid;
-
-        switch(pid=fork())
+        switch(child_pid=fork())
         {
             case -1:
             {
@@ -295,7 +295,7 @@ class test_callback : public TestFixture
 
                 bool got_1=false;
 
-                for (int i=0; i < 4; i++)
+                for (int i=0; i < 5; i++)
                 {
                     ss.fill_buffer(500000);
 
@@ -312,8 +312,8 @@ class test_callback : public TestFixture
                 }
                 ss.cleanup();
 
-                CPPUNIT_ASSERT_EQUAL(true,static_cast<bool>(callback_done[connection_closed]));
-                CPPUNIT_ASSERT_EQUAL(false,static_cast<bool>(callback_done[connection_deleted]));
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("closed done",true,static_cast<bool>(callback_done[connection_closed]));
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("not deleted yet",false,static_cast<bool>(callback_done[connection_deleted]));
 
                 for (int i=0; i < 4; i++)
                 {
@@ -326,12 +326,117 @@ class test_callback : public TestFixture
                 }
                 ss.cleanup();
 
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("closed done (2)",true,static_cast<bool>(callback_done[connection_closed]));
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("deleted done",true,static_cast<bool>(callback_done[connection_deleted]));
+            }
+        }
+    }
+
+    void ClientConnClosedCallback()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_FAIL("fork error");
+                break;
+            }
+            case 0:
+            // child
+            {
+                socket_server ss("./socket");
+
+                // max 3 sec
+                for (int i=0; i < 3; i++)
+                {
+                    ss.fill_buffer(1000000);
+
+                    string data;
+                    unsigned int cid;
+                    if(ss.get_packet(data,cid))
+                        break;
+                }
+                // don't call atexit and stuff
+                _exit(0);
+            }
+
+            default:
+            // parent
+            {
+                string data;
+                // wait till server is up
+                sleep(1);
+
+                socket_client_connection sc("./socket");
+
+                sc.add_callback(connection_closed,bind(&test_callback::callback_func, boost::ref(*this), connection_closed, 0));
+
+                sc.write("ABC");
+
+                // wait half a sec
+                sc.fill_buffer(500000);
+                sc.get_packet(data);
+
+                CPPUNIT_ASSERT_EQUAL(false,static_cast<bool>(callback_done[new_connection]));
                 CPPUNIT_ASSERT_EQUAL(true,static_cast<bool>(callback_done[connection_closed]));
-                CPPUNIT_ASSERT_EQUAL(true,static_cast<bool>(callback_done[connection_deleted]));
+                CPPUNIT_ASSERT_EQUAL(false,static_cast<bool>(callback_done[connection_deleted]));
             }
         }
     }
 
+    void ClientConnDeletedCallback()
+    {
+        switch(child_pid=fork())
+        {
+            case -1:
+            {
+                CPPUNIT_FAIL("fork error");
+                break;
+            }
+            case 0:
+            // child
+            {
+                socket_server ss("./socket");
+
+                // max 3 sec
+                for (int i=0; i < 3; i++)
+                {
+                    ss.fill_buffer(1000000);
+
+                    string data;
+                    unsigned int cid;
+                    if(ss.get_packet(data,cid))
+                        break;
+                }
+                // don't call atexit and stuff
+                _exit(0);
+            }
+
+            default:
+            // parent
+            {
+                string data;
+                // wait till server is up
+                sleep(1);
+
+                {
+                    socket_client_connection sc("./socket");
+
+                    sc.add_callback(connection_deleted,bind(&test_callback::callback_func, boost::ref(*this), connection_deleted, 0));
+
+                    sc.write("ABC");
+
+                    // wait half a sec
+                    sc.fill_buffer(500000);
+                    sc.get_packet(data);
+                }
+
+                CPPUNIT_ASSERT_EQUAL(false,static_cast<bool>(callback_done[new_connection]));
+                CPPUNIT_ASSERT_EQUAL(false,static_cast<bool>(callback_done[connection_closed]));
+                CPPUNIT_ASSERT_EQUAL(true,static_cast<bool>(callback_done[connection_deleted]));
+            }
+        }
+    }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test_callback);