tests/test_connection_count.rb in libc-eventmachine-0.12.5.42 vs tests/test_connection_count.rb in libc-eventmachine-0.12.7.42

@@ -1,35 +1,45 @@
 $:.unshift "../lib"
 require 'eventmachine'
 require 'test/unit'
 
 class TestConnectionCount < Test::Unit::TestCase
-
   def test_idle_connection_count
     EM.run {
       $count = EM.connection_count
       EM.stop_event_loop
     }
 
     assert_equal(0, $count)
   end
 
+  module Client
+    def connection_completed
+      EM.next_tick{
+        $client_connected = EM.connection_count
+        EM.stop
+      }
+    end
+  end
+
+  module Server
+    def post_init
+      $server_connected = EM.connection_count
+    end
+  end
+
   def test_with_some_connections
     EM.run {
-      EM.start_server("127.0.0.1", 9999)
-      EM.connect("127.0.0.1", 9999)
-      $first_tick = EM.connection_count
-      EM.next_tick { 
-        $second_tick = EM.connection_count
-        EM.next_tick { 
-          $third_tick = EM.connection_count
-          EM.stop_event_loop 
-        } 
+      EM.start_server("127.0.0.1", 9999, Server)
+      $initial = EM.connection_count
+      EM.next_tick{
+        $server_started = EM.connection_count
+        EM.connect("127.0.0.1", 9999, Client)
       }
     }
 
-    assert_equal(0, $first_tick)
-    assert_equal(2, $second_tick)
-    assert_equal(3, $third_tick)
+    assert_equal(0, $initial)
+    assert_equal(1, $server_started)
+    assert_equal(2, $server_connected)
+    assert_equal(3, $client_connected)
   end
-
 end
\ No newline at end of file