eventmachine 1.0.0.beta.2-x86-mswin32-60 → 1.0.0.beta.3-x86-mswin32-60

data/tests/test_servers.rb

@@ -1,76 +1,33 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 8 April 2006
-# 
-# See EventMachine and EventMachine::Connection for documentation and
-# usage examples.
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-#
-# 
-
-$:.unshift "../lib"
-require 'eventmachine'
+require 'em_test_helper'
 require 'socket'
-require 'test/unit'
 
 class TestServers < Test::Unit::TestCase
 
-  Host = "127.0.0.1"
-  Port = 9555
-
-  module NetstatHelper
-    GlobalUdp4Rexp = /udp.*\s+(?:\*|(?:0\.){3}0)[:.](\d+)\s/i
-    GlobalTcp4Rexp = /tcp.*\s+(?:\*|(?:0\.){3}0)[:.](\d+)\s/i
-    LocalUdpRexp = /udp.*\s+(?:127\.0\.0\.1|::1)[:.](\d+)\s/i
-    LocalTcpRexp = /tcp.*\s+(?:127\.0\.0\.1|::1)[:.](\d+)\s/i
-    def grep_netstat(pattern)
-      `netstat -an`.scan(/^.*$/).grep(pattern)
-    end
+  def setup
+    @port = next_port
   end
-  include NetstatHelper
 
-  class TestStopServer < EM::Connection
-    def initialize *args
-      super
-    end
-    def post_init
-      # TODO,sucks that this isn't OOPy enough.
-      EM.stop_server @server_instance
-    end
+  def server_alive?
+    port_in_use?(@port)
   end
 
   def run_test_stop_server
     EM.run {
-      sig = EM.start_server(Host, Port)
-      assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).size >= 1, "Server didn't start")
+      sig = EM.start_server("127.0.0.1", @port)
+      assert server_alive?, "Server didn't start"
       EM.stop_server sig
       # Give the server some time to shutdown.
-      EM.add_timer(0.2) {
-        assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).empty?, "Servers didn't stop")
+      EM.add_timer(0.1) {
+        assert !server_alive?, "Server didn't stop"
         EM.stop
       }
     }
   end
+
   def test_stop_server
-    assert(grep_netstat(LocalTcpRexp).grep(Port).empty?, "Port already in use")
-    5.times {run_test_stop_server}
-    assert(grep_netstat(LocalTcpRexp).grep(%r(#{Port})).empty?, "Servers didn't stop")
+    assert !server_alive?, "Port already in use"
+    2.times { run_test_stop_server }
+    assert !server_alive?, "Servers didn't stop"
   end
 
 end

data/tests/test_smtpclient.rb

@@ -1,32 +1,4 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 8 April 2006
-# 
-# See EventMachine and EventMachine::Connection for documentation and
-# usage examples.
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-#
-#
-
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+require 'em_test_helper'
 
 class TestSmtpClient < Test::Unit::TestCase
 

data/tests/test_smtpserver.rb

@@ -1,32 +1,4 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 8 April 2006
-# 
-# See EventMachine and EventMachine::Connection for documentation and
-# usage examples.
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-#
-#
-
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+require 'em_test_helper'
 
 class TestSmtpServer < Test::Unit::TestCase
 

data/tests/test_spawn.rb

@@ -1,34 +1,5 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 25 Aug 2007
-# 
-# See EventMachine and EventMachine::Connection for documentation and
-# usage examples.
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-#
-#
-#
-
-
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+
+require 'em_test_helper'
 
 
 

data/tests/test_ssl_args.rb

@@ -1,10 +1,9 @@
 require "test/unit"
 require 'tempfile'
 
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require "eventmachine"
+require 'em_test_helper'
 
-module EventMachine
+module EM
   def self._set_mocks
     class <<self
       alias set_tls_parms_old set_tls_parms
@@ -36,11 +35,11 @@ end
 
 class TestSslArgs < Test::Unit::TestCase
   def setup
-    EventMachine._set_mocks
+    EM._set_mocks
   end
   
   def teardown
-    EventMachine._clear_mocks
+    EM._clear_mocks
   end
   
   def test_tls_params_file_doesnt_exist
@@ -50,15 +49,15 @@ class TestSslArgs < Test::Unit::TestCase
     end
     
     # associate_callback_target is a pain! (build!)
-    conn = EventMachine::Connection.new('foo')
+    conn = EM::Connection.new('foo')
     
-    assert_raises(EventMachine::FileNotFoundException) do
+    assert_raises(EM::FileNotFoundException) do
       conn.start_tls(:private_key_file => priv_file)
     end
-    assert_raises(EventMachine::FileNotFoundException) do
+    assert_raises(EM::FileNotFoundException) do
       conn.start_tls(:cert_chain_file => cert_file)
     end
-    assert_raises(EventMachine::FileNotFoundException) do
+    assert_raises(EM::FileNotFoundException) do
       conn.start_tls(:private_key_file => priv_file, :cert_chain_file => cert_file)
     end
   end
@@ -68,7 +67,7 @@ class TestSslArgs < Test::Unit::TestCase
     cert_file = Tempfile.new('em_test')
     priv_file_path = priv_file.path
     cert_file_path = cert_file.path
-    conn = EventMachine::Connection.new('foo')
+    conn = EM::Connection.new('foo')
     params = {:private_key_file => priv_file_path, :cert_chain_file => cert_file_path}
     begin
       conn.start_tls params

data/tests/test_ssl_methods.rb

@@ -1,6 +1,4 @@
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+require 'em_test_helper'
 
 class TestSSLMethods < Test::Unit::TestCase
 

data/tests/test_ssl_verify.rb

@@ -1,82 +1,82 @@
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+require 'em_test_helper'
 
-class TestSslVerify < Test::Unit::TestCase
-
-  def setup
-    $dir = File.dirname(File.expand_path(__FILE__)) + '/'
-    $cert_from_file = File.read($dir+'client.crt')
-  end
-
-  module Client
-    def connection_completed
-      start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
+if EM.ssl?
+  class TestSslVerify < Test::Unit::TestCase
+    def setup
+      $dir = File.dirname(File.expand_path(__FILE__)) + '/'
+      $cert_from_file = File.read($dir+'client.crt')
     end
 
-    def ssl_handshake_completed
-      $client_handshake_completed = true
-      close_connection
-    end
+    module Client
+      def connection_completed
+        start_tls(:private_key_file => $dir+'client.key', :cert_chain_file => $dir+'client.crt')
+      end
 
-    def unbind
-      EM.stop_event_loop
-    end
-  end
+      def ssl_handshake_completed
+        $client_handshake_completed = true
+        close_connection
+      end
 
-  module AcceptServer
-    def post_init
-      start_tls(:verify_peer => true)
+      def unbind
+        EM.stop_event_loop
+      end
     end
 
-    def ssl_verify_peer(cert)
-      $cert_from_server = cert
-      true
-    end
+    module AcceptServer
+      def post_init
+        start_tls(:verify_peer => true)
+      end
 
-    def ssl_handshake_completed
-      $server_handshake_completed = true
-    end
-  end
+      def ssl_verify_peer(cert)
+        $cert_from_server = cert
+        true
+      end
 
-  module DenyServer
-    def post_init
-      start_tls(:verify_peer => true)
+      def ssl_handshake_completed
+        $server_handshake_completed = true
+      end
     end
 
-    def ssl_verify_peer(cert)
-      $cert_from_server = cert
-      # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
-      false
-    end
+    module DenyServer
+      def post_init
+        start_tls(:verify_peer => true)
+      end
 
-    def ssl_handshake_completed
-      $server_handshake_completed = true
+      def ssl_verify_peer(cert)
+        $cert_from_server = cert
+        # Do not accept the peer. This should now cause the connection to shut down without the SSL handshake being completed.
+        false
+      end
+
+      def ssl_handshake_completed
+        $server_handshake_completed = true
+      end
     end
-  end
 
-  def test_accept_server
-    $client_handshake_completed, $server_handshake_completed = false, false
-    EM.run {
-      EM.start_server("127.0.0.1", 16784, AcceptServer)
-      EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
-    }
+    def test_accept_server
+      $client_handshake_completed, $server_handshake_completed = false, false
+      EM.run {
+        EM.start_server("127.0.0.1", 16784, AcceptServer)
+        EM.connect("127.0.0.1", 16784, Client).instance_variable_get("@signature")
+      }
 
-    assert_equal($cert_from_file, $cert_from_server)
-    assert($client_handshake_completed)
-    assert($server_handshake_completed)
-  end
+      assert_equal($cert_from_file, $cert_from_server)
+      assert($client_handshake_completed)
+      assert($server_handshake_completed)
+    end
 
-  def test_deny_server
-    $client_handshake_completed, $server_handshake_completed = false, false
-    EM.run {
-      EM.start_server("127.0.0.1", 16784, DenyServer)
-      EM.connect("127.0.0.1", 16784, Client)
-    }
+    def test_deny_server
+      $client_handshake_completed, $server_handshake_completed = false, false
+      EM.run {
+        EM.start_server("127.0.0.1", 16784, DenyServer)
+        EM.connect("127.0.0.1", 16784, Client)
+      }
 
-    assert_equal($cert_from_file, $cert_from_server)
-    assert(!$client_handshake_completed)
-    assert(!$server_handshake_completed)
+      assert_equal($cert_from_file, $cert_from_server)
+      assert(!$client_handshake_completed)
+      assert(!$server_handshake_completed)
+    end
   end
-
+else
+  warn "EM built without SSL support, skipping tests in #{__FILE__}"
 end

data/tests/test_tick_loop.rb

@@ -1,5 +1,5 @@
 require "test/unit"
-require "eventmachine"
+require 'em_test_helper'
 
 class TestEmTickLoop < Test::Unit::TestCase
   def test_em_tick_loop

data/tests/test_timers.rb

@@ -1,42 +1,13 @@
-# $Id$
-#
-# Author:: Francis Cianfrocca (gmail: blackhedd)
-# Homepage::  http://rubyeventmachine.com
-# Date:: 8 April 2006
-# 
-# See EventMachine and EventMachine::Connection for documentation and
-# usage examples.
-#
-#----------------------------------------------------------------------------
-#
-# Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-# Gmail: blackhedd
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#
-#---------------------------------------------------------------------------
-#
-#
-#
-#
-
-$:.unshift "../lib"
-require 'eventmachine'
-require 'test/unit'
+require 'em_test_helper'
 
 class TestTimers < Test::Unit::TestCase
 
   def test_timer_with_block
     x = false
-    EventMachine.run {
-      EventMachine::Timer.new(0.25) {
+    EM.run {
+      EM::Timer.new(0) {
         x = true
-        EventMachine.stop
+        EM.stop
       }
     }
     assert x
@@ -44,117 +15,109 @@ class TestTimers < Test::Unit::TestCase
 
   def test_timer_with_proc
     x = false
-    EventMachine.run {
-      EventMachine::Timer.new(0.25, proc {
+    EM.run {
+      EM::Timer.new(0, proc {
         x = true
-        EventMachine.stop
+        EM.stop
       })
     }
     assert x
   end
 
   def test_timer_cancel
-    x = true
-    EventMachine.run {
-      timer = EventMachine::Timer.new(0.25, proc { x = false })
-      timer.cancel
-      EventMachine::Timer.new(0.5, proc {EventMachine.stop})
-    }
-    assert x
+    assert_nothing_raised do
+      EM.run {
+        timer = EM::Timer.new(0.01) { flunk "Timer was not cancelled." }
+        timer.cancel
+
+        EM.add_timer(0.02) { EM.stop }
+      }
+    end
   end
 
   def test_periodic_timer
     x = 0
-    EventMachine.run {
-      EventMachine::PeriodicTimer.new(0.1) do
+    EM.run {
+      EM::PeriodicTimer.new(0.01) do
         x += 1
-        EventMachine.stop if x == 4
+        EM.stop if x == 4
       end
     }
-    assert( x == 4 )
+
+    assert_equal 4, x
   end
 
   def test_add_periodic_timer
     x = 0
     EM.run {
-      t = EM.add_periodic_timer(0.1) do
+      t = EM.add_periodic_timer(0.01) do
         x += 1
         EM.stop  if x == 4
       end
       assert t.respond_to?(:cancel)
     }
+    assert_equal 4, x
   end
 
   def test_periodic_timer_cancel
     x = 0
-    EventMachine.run {
-      pt = EventMachine::PeriodicTimer.new(0.25, proc { x += 1 })
+    EM.run {
+      pt = EM::PeriodicTimer.new(0.01) { x += 1 }
       pt.cancel
-      EventMachine::Timer.new(0.5) {EventMachine.stop}
+      EM::Timer.new(0.02) { EM.stop }
     }
-    assert( x == 0 )
+    assert_equal 0, x
   end
 
   def test_add_periodic_timer_cancel
     x = 0
-    EventMachine.run {
-      pt = EM.add_periodic_timer(0.1) { x += 1 }
+    EM.run {
+      pt = EM.add_periodic_timer(0.01) { x += 1 }
       EM.cancel_timer(pt)
-      EM.add_timer(0.2) { EM.stop }
+      EM.add_timer(0.02) { EM.stop }
     }
-    assert( x == 0 )
+    assert_equal 0, x
   end
 
   def test_periodic_timer_self_cancel
     x = 0
-    EventMachine.run {
-      pt = EventMachine::PeriodicTimer.new(0.1) {
+    EM.run {
+      pt = EM::PeriodicTimer.new(0) {
         x += 1
         if x == 4
           pt.cancel
-          EventMachine.stop
+          EM.stop
         end
       }
     }
-    assert( x == 4 )
+    assert_equal 4, x
   end
 
 
   # This test is only applicable to compiled versions of the reactor.
   # Pure ruby and java versions have no built-in limit on the number of outstanding timers.
-  #
-  def test_timer_change_max_outstanding
-    defaults = EM.get_max_timers
-    EM.set_max_timers(100)
-
-    one_hundred_one_timers = proc { 101.times { EM.add_timer(5) {} } }
+  unless [:pure_ruby, :java].include? EM.library_type
+    def test_timer_change_max_outstanding
+      defaults = EM.get_max_timers
+      EM.set_max_timers(100)
+
+      one_hundred_one_timers = lambda do
+        101.times { EM.add_timer(0.01) {} }
+        EM.stop
+      end
 
-    EM.run {
-      if EM.library_type == :pure_ruby
-        one_hundred_one_timers.call
-      elsif EM.library_type == :java
-        one_hundred_one_timers.call
-      else
-        begin
-          assert_raises( RuntimeError ) {
-            one_hundred_one_timers.call
-          }
-        rescue Object
-          p $!
-          assert(false, $!.message)
-        end
+      assert_raises(RuntimeError) do
+        EM.run( &one_hundred_one_timers )
       end
-      EM.stop
-    }
 
-    EM.set_max_timers( 101 )
+      EM.set_max_timers( 101 )
 
-    EM.run {
-      one_hundred_one_timers.call
-      EM.stop
-    }
-  ensure
-    EM.set_max_timers(defaults)
+      assert_nothing_raised do
+        EM.run( &one_hundred_one_timers )
+      end
+    ensure
+      EM.set_max_timers(defaults)
+    end
   end
 
 end