test/client_test.rb in whois-0.5.1 vs test/client_test.rb in whois-0.5.2

@@ -1,57 +1,74 @@
 require 'test_helper'
 
 class ClientTest < Test::Unit::TestCase
-  include Whois
   
   def setup
-    @client = Client.new
+    @client = Whois::Client.new
   end
   
+  
+  def test_initialize
+    client = Whois::Client.new
+    assert_instance_of Whois::Client, client
+  end
+  
+  def test_initialize_with_timeout
+    client = Whois::Client.new(:timeout => 100)
+    assert_equal 100, client.timeout
+  end
+  
+  def test_initialize_with_block
+    Whois::Client.new do |client|
+      assert_instance_of Whois::Client, client
+    end
+  end
+  
+  
   def test_query_with_email_address_should_raise
-    assert_raise(ServerNotSupported) { @client.query("[e-mail]") }
+    assert_raise(Whois::ServerNotSupported) { @client.query("[e-mail]") }
   end
 
   def test_query_with_domain_with_no_whois
-    error = assert_raise(NoInterfaceError) { @client.query("weppos.ad") }
+    error = assert_raise(Whois::NoInterfaceError) { @client.query("weppos.ad") }
     assert_match /no whois server/, error.message
   end
   
   def test_query_with_domain_with_web_whois
-    error = assert_raise(WebInterfaceError) { @client.query("weppos.ar") }
+    error = assert_raise(Whois::WebInterfaceError) { @client.query("weppos.ar") }
     assert_match /no whois server/, error.message
     assert_match /www\.nic\.ar/, error.message
   end
   
   def test_query_with_timeout
     server = Class.new do
       def query(*args)
         sleep(2)
       end
     end
-    Server.expects(:guess).returns(server.new)
+    Whois::Server.expects(:guess).returns(server.new)
     @client.timeout = 1
     assert_raise(Timeout::Error) { @client.query("foo.com") }
   end
   
   def test_query_with_unlimited_timeout
     server = Class.new do
       def query(*args)
         sleep(1)
       end
     end
-    Server.expects(:guess).returns(server.new)
+    Whois::Server.expects(:guess).returns(server.new)
     @client.timeout = nil
     assert_nothing_raised { @client.query("foo.com") }
   end
   
   def test_query_within_timeout
     server = Class.new do
       def query(*args)
         sleep(1)
       end
     end
-    Server.expects(:guess).returns(server.new)
+    Whois::Server.expects(:guess).returns(server.new)
     @client.timeout = 5
     assert_nothing_raised { @client.query("foo.com") }
   end
 
 
\ No newline at end of file