mongo 1.7.1 → 1.8.0

data/test/bson/byte_buffer_test.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class ByteBufferTest < Test::Unit::TestCase
   include BSON

data/test/bson/hash_with_indifferent_access_test.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
-require File.expand_path("../test_helper", __FILE__)
-require './test/support/hash_with_indifferent_access'
+require 'test_helper'
+require 'support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase
   include BSON

data/test/bson/json_test.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
-require 'rubygems'
+require 'test_helper'
 require 'json'
 
 class JSONTest < Test::Unit::TestCase

data/test/bson/object_id_test.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
-require 'rubygems'
+require 'test_helper'
 require 'json'
 
 class ObjectIdTest < Test::Unit::TestCase

data/test/bson/ordered_hash_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class OrderedHashTest < Test::Unit::TestCase
 

data/test/bson/timestamp_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class TimestampTest < Test::Unit::TestCase
 

data/test/{collection_test.rb → functional/collection_test.rb}

@@ -1,11 +1,11 @@
-require File.expand_path("../test_helper", __FILE__)
 require 'rbconfig'
+require 'test_helper'
 
 class TestCollection < Test::Unit::TestCase
-  @@connection ||= standard_connection(:op_timeout => 10)
-  @@db   = @@connection.db(MONGO_TEST_DB)
-  @@test = @@db.collection("test")
-  @@version = @@connection.server_version
+  @@client       ||= standard_connection(:op_timeout => 10)
+  @@db           = @@client.db(MONGO_TEST_DB)
+  @@test         = @@db.collection("test")
+  @@version      = @@client.server_version
 
   def setup
     @@test.remove
@@ -28,8 +28,8 @@ class TestCollection < Test::Unit::TestCase
     assert_equal BSON::ObjectId, @coll_default_pk.pk_factory
 
     # Create a db with a pk_factory.
-    @db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB, :pk => Object.new)
+    @db = MongoClient.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                         ENV['MONGO_RUBY_DRIVER_PORT'] || MongoClient::DEFAULT_PORT).db(MONGO_TEST_DB, :pk => Object.new)
     @coll = @db.collection('coll-with-pk')
     assert @coll.pk_factory.is_a?(Object)
 
@@ -92,23 +92,23 @@ class TestCollection < Test::Unit::TestCase
   end
 
   def test_nil_id
-    assert_equal 5, @@test.insert({"_id" => 5, "foo" => "bar"}, {:safe => true})
-    assert_equal 5, @@test.save({"_id" => 5, "foo" => "baz"}, {:safe => true})
+    assert_equal 5, @@test.insert({"_id" => 5, "foo" => "bar"})
+    assert_equal 5, @@test.save({"_id" => 5, "foo" => "baz"})
     assert_equal nil, @@test.find_one("foo" => "bar")
     assert_equal "baz", @@test.find_one(:_id => 5)["foo"]
     assert_raise OperationFailure do
-      @@test.insert({"_id" => 5, "foo" => "bar"}, {:safe => true})
+      @@test.insert({"_id" => 5, "foo" => "bar"})
     end
 
-    assert_equal nil, @@test.insert({"_id" => nil, "foo" => "bar"}, {:safe => true})
-    assert_equal nil, @@test.save({"_id" => nil, "foo" => "baz"}, {:safe => true})
+    assert_equal nil, @@test.insert({"_id" => nil, "foo" => "bar"})
+    assert_equal nil, @@test.save({"_id" => nil, "foo" => "baz"})
     assert_equal nil, @@test.find_one("foo" => "bar")
     assert_equal "baz", @@test.find_one(:_id => nil)["foo"]
     assert_raise OperationFailure do
-      @@test.insert({"_id" => nil, "foo" => "bar"}, {:safe => true})
+      @@test.insert({"_id" => nil, "foo" => "bar"})
     end
     assert_raise OperationFailure do
-      @@test.insert({:_id => nil, "foo" => "bar"}, {:safe => true})
+      @@test.insert({:_id => nil, "foo" => "bar"})
     end
   end
 
@@ -146,11 +146,11 @@ class TestCollection < Test::Unit::TestCase
     @@test.create_index("hello", :unique => true)
     a = {"hello" => "world"}
     @@test.insert(a)
-    @@test.insert(a)
+    @@test.insert(a, :w => 0)
     assert(@@db.get_last_error['err'].include?("11000"))
 
     assert_raise OperationFailure do
-      @@test.insert(a, :safe => true)
+      @@test.insert(a)
     end
   end
 
@@ -174,7 +174,7 @@ class TestCollection < Test::Unit::TestCase
       docs << {:foo => 2}
       docs << {:foo => 3}
       assert_raise OperationFailure do
-        @@test.insert(docs, :safe => true)
+        @@test.insert(docs)
       end
       assert_equal 1, @@test.count
       @@test.remove
@@ -185,7 +185,7 @@ class TestCollection < Test::Unit::TestCase
       docs << {:foo => 2}
       docs << {:foo => 3}
       assert_raise OperationFailure do
-        @@test.insert(docs, :safe => true, :continue_on_error => true)
+        @@test.insert(docs, :continue_on_error => true)
       end
       assert_equal 3, @@test.count
 
@@ -255,26 +255,26 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
-  if @@version >= "1.5.1"
-    def test_safe_mode_with_advanced_safe_with_invalid_options
-      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
-        @@test.insert({:foo => 1}, :safe => {:w => 2, :wtime => 1, :fsync => true})
-      end
-      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
-        @@test.update({:foo => 1}, {:foo => 2}, :safe => {:w => 2, :wtime => 1, :fsync => true})
-      end
-
-      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
-        @@test.remove({:foo => 2}, :safe => {:w => 2, :wtime => 1, :fsync => true})
-      end
-    end
-  end
+  #if @@version >= "1.5.1"
+  #  def test_safe_mode_with_advanced_safe_with_invalid_options
+  #    assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+  #      @@test.insert({:foo => 1}, :w => 2, :wtime => 1, :fsync => true)
+  #    end
+  #    assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+  #      @@test.update({:foo => 1}, {:foo => 2}, :w => 2, :wtime => 1, :fsync => true)
+  #    end
+  #
+  #    assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+  #      @@test.remove({:foo => 2}, :w => 2, :wtime => 1, :fsync => true)
+  #    end
+  #  end
+  #end
 
   if @@version >= "2.0.0"
     def test_safe_mode_with_journal_commit_option
-      @@test.insert({:foo => 1}, :safe => {:j => true})
-      @@test.update({:foo => 1}, {:foo => 2}, :safe => {:j => true})
-      @@test.remove({:foo => 2}, :safe => {:j => true})
+      @@test.insert({:foo => 1}, :j => true)
+      @@test.update({:foo => 1}, {:foo => 2}, :j => true)
+      @@test.remove({:foo => 2}, :j => true)
     end
   end
 
@@ -332,7 +332,7 @@ class TestCollection < Test::Unit::TestCase
 
       # Can't change an index.
       assert_raise OperationFailure do
-        @@test.update({}, {"$inc" => {"x" => 1}}, :safe => true)
+        @@test.update({}, {"$inc" => {"x" => 1}})
       end
       @@test.drop
     end
@@ -348,7 +348,7 @@ class TestCollection < Test::Unit::TestCase
 
       # Can't duplicate an index.
       assert_raise OperationFailure do
-        @@test.update({}, {"x" => 10}, :safe => true)
+        @@test.update({}, {"x" => 10})
       end
       @@test.drop
     end
@@ -358,39 +358,39 @@ class TestCollection < Test::Unit::TestCase
     @@test.create_index("hello", :unique => true)
 
     @@test.save("hello" => "world")
-    @@test.save("hello" => "world")
+    @@test.save({"hello" => "world"}, :w => 0)
 
     assert_raise OperationFailure do
-      @@test.save({"hello" => "world"}, :safe => true)
+      @@test.save({"hello" => "world"})
     end
     @@test.drop
   end
 
   def test_mocked_safe_remove
-    @conn = standard_connection
-    @db   = @conn[MONGO_TEST_DB]
+    @client = standard_connection
+    @db   = @client[MONGO_TEST_DB]
     @test = @db['test-safe-remove']
     @test.save({:a => 20})
-    @conn.stubs(:receive).returns([[{'ok' => 0, 'err' => 'failed'}], 1, 0])
+    @client.stubs(:receive).returns([[{'ok' => 0, 'err' => 'failed'}], 1, 0])
 
     assert_raise OperationFailure do
-      @test.remove({}, :safe => true)
+      @test.remove({})
     end
     @test.drop
   end
 
   def test_safe_remove
-    @conn = standard_connection
-    @db   = @conn[MONGO_TEST_DB]
+    @client = standard_connection
+    @db   = @client[MONGO_TEST_DB]
     @test = @db['test-safe-remove']
     @test.remove
     @test.save({:a => 50})
-    assert_equal 1, @test.remove({}, :safe => true)["n"]
+    assert_equal 1, @test.remove({})["n"]
     @test.drop
   end
 
   def test_remove_return_value
-    assert_equal true, @@test.remove({})
+    assert_equal true, @@test.remove({}, :w => 0)
   end
 
   def test_count
@@ -542,7 +542,7 @@ class TestCollection < Test::Unit::TestCase
         "_id" => 1,
         "title" => "this is my title", 
         "author" => "bob", 
-        "posted" => Time.utc(1500), 
+        "posted" => Time.utc(2000),
         "pageViews" => 5 , 
         "tags" => [ "fun" , "good" , "fun" ],
         "comments" => [ 
@@ -556,7 +556,7 @@ class TestCollection < Test::Unit::TestCase
          "_id" => 2,
          "title" => "this is your title", 
          "author" => "dave", 
-         "posted" => Time.utc(1600), 
+         "posted" => Time.utc(2001),
          "pageViews" => 7, 
          "tags" => [ "fun" , "nasty" ],
          "comments" => [ 
@@ -570,7 +570,7 @@ class TestCollection < Test::Unit::TestCase
             "_id" => 3,
             "title" => "this is some other title", 
             "author" => "jane", 
-            "posted" => Time.utc(1700), 
+            "posted" => Time.utc(2002),
             "pageViews" => 6 , 
             "tags" => [ "nasty", "filthy" ],
             "comments" => [ 
@@ -631,25 +631,25 @@ class TestCollection < Test::Unit::TestCase
 
     def test_aggregate_pipeline_unwind                    
       setup_aggregate_data
-      desired_results = [ {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(1500), 
+      desired_results = [ {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
                           "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
                             {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
-                          {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(1500), 
+                          {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
                             "pageViews"=>5, "tags"=>"good", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
                             {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
-                          {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(1500), 
+                          {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
                             "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
                               {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
-                          {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(1600), 
+                          {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(2001),
                             "pageViews"=>7, "tags"=>"fun", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"}, 
                               {"author"=>"jenny", "text"=>"i like to play pinball", "votes"=>10 }], "other"=>{"bar"=>14 } },
-                          {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(1600), 
+                          {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(2001),
                             "pageViews"=>7, "tags"=>"nasty", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"}, 
                               {"author"=>"jenny", "text"=>"i like to play pinball", "votes"=>10 }], "other"=>{"bar"=>14 } },
-                          {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(1700), 
+                          {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(2002),
                             "pageViews"=>6, "tags"=>"nasty", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"}, 
                               {"author"=>"jenny", "text"=>"can i get that in green?"}], "other"=>{"bar"=>14 } },
-                          {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(1700), 
+                          {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(2002),
                             "pageViews"=>6, "tags"=>"filthy", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"}, 
                               {"author"=>"jenny", "text"=>"can i get that in green?"}], "other"=>{"bar"=>14 } }
                           ]

data/test/{connection_test.rb → functional/connection_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'logger'
 require 'stringio'
 require 'thread'
@@ -9,66 +9,52 @@ class TestConnection < Test::Unit::TestCase
   include BSON
 
   def setup
-    @conn = standard_connection
+    @client = standard_connection
   end
 
   def teardown
-    @conn.close
+    @client.close
   end
 
   def test_connection_failure
     assert_raise Mongo::ConnectionFailure do
-      Mongo::Connection.new('localhost', 27347)
+      MongoClient.new('localhost', 27347)
     end
   end
 
- # def test_connection_timeout
- #   passed = false
- #   begin
- #     t0 = Time.now
- #     Mongo::Connection.new('foo.bar', 27017, :connect_timeout => 3)
- #   rescue OperationTimeout
- #     passed = true
- #     t1 = Time.now
- #   end
-
- #   assert passed
- #   assert t1 - t0 < 4
- # end
-
   def test_host_port_accessors
-    assert_equal @conn.host, TEST_HOST
-    assert_equal @conn.port, TEST_PORT
+    assert_equal @client.host, TEST_HOST
+    assert_equal @client.port, TEST_PORT
   end
 
   def test_server_info
-    server_info = @conn.server_info
+    server_info = @client.server_info
     assert server_info.keys.include?("version")
     assert Mongo::Support.ok?(server_info)
   end
 
   def test_ping
-    ping = @conn.ping
+    ping = @client.ping
     assert ping['ok']
   end
 
   def test_connection_uri
-    con = Connection.from_uri("mongodb://#{host_port}")
+    con = MongoClient.from_uri("mongodb://#{host_port}")
     assert_equal mongo_host, con.primary_pool.host
     assert_equal mongo_port, con.primary_pool.port
   end
 
   def test_uri_with_extra_opts
-    con = Connection.from_uri("mongodb://#{host_port}", :pool_size => 10, :slave_ok => true)
+    con = MongoClient.from_uri("mongodb://#{host_port}", :pool_size => 10, :slave_ok => true)
     assert_equal 10, con.pool_size
-    assert_true con.slave_ok?
+    assert con.slave_ok?
   end
 
   def test_env_mongodb_uri
     begin
       old_mongodb_uri = ENV['MONGODB_URI']
       ENV['MONGODB_URI'] = "mongodb://#{host_port}"
-      con = Connection.new
+      con = MongoClient.new
       assert_equal mongo_host, con.primary_pool.host
       assert_equal mongo_port, con.primary_pool.port
     ensure
@@ -80,7 +66,7 @@ class TestConnection < Test::Unit::TestCase
     begin
       old_mongodb_uri = ENV['MONGODB_URI']
       ENV['MONGODB_URI'] = "mongodb://#{host_port}"
-      con = Connection.from_uri
+      con = MongoClient.from_uri
       assert_equal mongo_host, con.primary_pool.host
       assert_equal mongo_port, con.primary_pool.port
     ensure
@@ -94,7 +80,7 @@ class TestConnection < Test::Unit::TestCase
 
       old_mongodb_uri = ENV['MONGODB_URI']
       ENV['MONGODB_URI'] = "mongodb://#{host_port}/#{db_name}"
-      con = Connection.from_uri
+      con = MongoClient.from_uri
       db = con.db
       assert_equal db.name, db_name
     ensure
@@ -108,7 +94,7 @@ class TestConnection < Test::Unit::TestCase
 
       old_mongodb_uri = ENV['MONGODB_URI']
       ENV['MONGODB_URI'] = "mongodb://#{host_port}/#{db_name}?"
-      con = Connection.from_uri
+      con = MongoClient.from_uri
       db = con.db
       assert_equal db.name, db_name
     ensure
@@ -120,79 +106,79 @@ class TestConnection < Test::Unit::TestCase
     begin
       old_mongodb_uri = ENV['MONGODB_URI']
       ENV['MONGODB_URI'] = "mongodb://#{host_port}/"
-      con = Connection.from_uri
+      con = MongoClient.from_uri
       db = con.db
-      assert_equal db.name, Mongo::Connection::DEFAULT_DB_NAME
+      assert_equal db.name, Mongo::MongoClient::DEFAULT_DB_NAME
     ensure
       ENV['MONGODB_URI'] = old_mongodb_uri
     end
   end
 
   def test_server_version
-    assert_match(/\d\.\d+(\.\d+)?/, @conn.server_version.to_s)
+    assert_match(/\d\.\d+(\.\d+)?/, @client.server_version.to_s)
   end
 
   def test_invalid_database_names
-    assert_raise TypeError do @conn.db(4) end
+    assert_raise TypeError do @client.db(4) end
 
-    assert_raise Mongo::InvalidNSName do @conn.db('') end
-    assert_raise Mongo::InvalidNSName do @conn.db('te$t') end
-    assert_raise Mongo::InvalidNSName do @conn.db('te.t') end
-    assert_raise Mongo::InvalidNSName do @conn.db('te\\t') end
-    assert_raise Mongo::InvalidNSName do @conn.db('te/t') end
-    assert_raise Mongo::InvalidNSName do @conn.db('te st') end
+    assert_raise Mongo::InvalidNSName do @client.db('') end
+    assert_raise Mongo::InvalidNSName do @client.db('te$t') end
+    assert_raise Mongo::InvalidNSName do @client.db('te.t') end
+    assert_raise Mongo::InvalidNSName do @client.db('te\\t') end
+    assert_raise Mongo::InvalidNSName do @client.db('te/t') end
+    assert_raise Mongo::InvalidNSName do @client.db('te st') end
   end
 
   def test_options_passed_to_db
     @pk_mock = Object.new
-    db = @conn.db('test', :pk => @pk_mock, :strict => true)
+    db = @client.db('test', :pk => @pk_mock, :strict => true)
     assert_equal @pk_mock, db.pk_factory
     assert db.strict?
   end
 
   def test_database_info
-    @conn.drop_database(MONGO_TEST_DB)
-    @conn.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
+    @client.drop_database(MONGO_TEST_DB)
+    @client.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
 
-    info = @conn.database_info
+    info = @client.database_info
     assert_not_nil info
     assert_kind_of Hash, info
     assert_not_nil info[MONGO_TEST_DB]
     assert info[MONGO_TEST_DB] > 0
 
-    @conn.drop_database(MONGO_TEST_DB)
+    @client.drop_database(MONGO_TEST_DB)
   end
 
   def test_copy_database
-    @conn.db('old').collection('copy-test').insert('a' => 1)
-    @conn.copy_database('old', 'new', host_port)
-    old_object = @conn.db('old').collection('copy-test').find.next_document
-    new_object = @conn.db('new').collection('copy-test').find.next_document
+    @client.db('old').collection('copy-test').insert('a' => 1)
+    @client.copy_database('old', 'new', host_port)
+    old_object = @client.db('old').collection('copy-test').find.next_document
+    new_object = @client.db('new').collection('copy-test').find.next_document
     assert_equal old_object, new_object
-    @conn.drop_database('old')
-    @conn.drop_database('new')
+    @client.drop_database('old')
+    @client.drop_database('new')
   end
 
   def test_copy_database_with_auth
-    @conn.db('old').collection('copy-test').insert('a' => 1)
-    @conn.db('old').add_user('bob', 'secret')
+    @client.db('old').collection('copy-test').insert('a' => 1)
+    @client.db('old').add_user('bob', 'secret')
 
     assert_raise Mongo::OperationFailure do
-      @conn.copy_database('old', 'new', host_port, 'bob', 'badpassword')
+      @client.copy_database('old', 'new', host_port, 'bob', 'badpassword')
     end
 
-    result = @conn.copy_database('old', 'new', host_port, 'bob', 'secret')
+    result = @client.copy_database('old', 'new', host_port, 'bob', 'secret')
     assert Mongo::Support.ok?(result)
 
-    @conn.drop_database('old')
-    @conn.drop_database('new')
+    @client.drop_database('old')
+    @client.drop_database('new')
   end
 
   def test_database_names
-    @conn.drop_database(MONGO_TEST_DB)
-    @conn.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
+    @client.drop_database(MONGO_TEST_DB)
+    @client.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
 
-    names = @conn.database_names
+    names = @client.database_names
     assert_not_nil names
     assert_kind_of Array, names
     assert names.length >= 1
@@ -212,7 +198,7 @@ class TestConnection < Test::Unit::TestCase
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
     standard_connection(:logger => logger).db(MONGO_TEST_DB)
-    assert_match(/\(\d+ms\)/, output.string)
+    assert_match(/\(\d+.\d{1}ms\)/, output.string)
     assert output.string.include?("admin['$cmd'].find")
   end
 
@@ -228,37 +214,37 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_drop_database
-    db = @conn.db('ruby-mongo-will-be-deleted')
+    db = @client.db('ruby-mongo-will-be-deleted')
     coll = db.collection('temp')
     coll.remove
     coll.insert(:name => 'temp')
     assert_equal 1, coll.count()
-    assert @conn.database_names.include?('ruby-mongo-will-be-deleted')
+    assert @client.database_names.include?('ruby-mongo-will-be-deleted')
 
-    @conn.drop_database('ruby-mongo-will-be-deleted')
-    assert !@conn.database_names.include?('ruby-mongo-will-be-deleted')
+    @client.drop_database('ruby-mongo-will-be-deleted')
+    assert !@client.database_names.include?('ruby-mongo-will-be-deleted')
   end
 
   def test_nodes
     silently do
-      @conn = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false)
+      @client = MongoClient.multi([['foo', 27017], ['bar', 27018]], :connect => false)
     end
-    seeds = @conn.seeds
+    seeds = @client.seeds
     assert_equal 2, seeds.length
     assert_equal ['foo', 27017], seeds[0]
     assert_equal ['bar', 27018], seeds[1]
   end
 
   def test_fsync_lock
-    assert !@conn.locked?
-    @conn.lock!
-    assert @conn.locked?
-    assert [1, true].include?(@conn['admin']['$cmd.sys.inprog'].find_one['fsyncLock'])
-    assert_match(/unlock/, @conn.unlock!['info'])
+    assert !@client.locked?
+    @client.lock!
+    assert @client.locked?
+    assert [1, true].include?(@client['admin']['$cmd.sys.inprog'].find_one['fsyncLock'])
+    assert_match(/unlock/, @client.unlock!['info'])
     unlocked = false
     counter  = 0
     while counter < 5
-      if @conn['admin']['$cmd.sys.inprog'].find_one['fsyncLock'].nil?
+      if @client['admin']['$cmd.sys.inprog'].find_one['fsyncLock'].nil?
         unlocked = true
         break
       else
@@ -266,7 +252,7 @@ class TestConnection < Test::Unit::TestCase
         counter += 1
       end
     end
-    assert !@conn.locked?
+    assert !@client.locked?
     assert unlocked, "mongod failed to unlock"
   end
 
@@ -287,7 +273,7 @@ class TestConnection < Test::Unit::TestCase
     conn.connect
     doc = {'n' => 'a' * (conn.max_bson_size)}
     assert_raise InvalidDocument do
-      assert BSON::BSON_CODER.serialize(doc, false, true, @conn.max_bson_size)
+      assert BSON::BSON_CODER.serialize(doc, false, true, @client.max_bson_size)
     end
   end
 
@@ -316,7 +302,7 @@ class TestConnection < Test::Unit::TestCase
     dropped_socket.stub_everything
 
     conn.primary_pool.host = 'localhost'
-    conn.primary_pool.port = Mongo::Connection::DEFAULT_PORT
+    conn.primary_pool.port = Mongo::MongoClient::DEFAULT_PORT
     conn.primary_pool.instance_variable_set("@pids", {dropped_socket => Process.pid})
     conn.primary_pool.instance_variable_set("@sockets", [dropped_socket])
 
@@ -325,37 +311,37 @@ class TestConnection < Test::Unit::TestCase
 
   context "Saved authentications" do
     setup do
-      @conn = standard_connection
+      @client = standard_connection
       @auth = {'db_name' => 'test', 'username' => 'bob', 'password' => 'secret'}
-      @conn.add_auth(@auth['db_name'], @auth['username'], @auth['password'])
+      @client.add_auth(@auth['db_name'], @auth['username'], @auth['password'])
     end
 
     teardown do
-      @conn.clear_auths
+      @client.clear_auths
     end
 
     should "save the authentication" do
-      assert_equal @auth, @conn.auths[0]
+      assert_equal @auth, @client.auths[0]
     end
 
     should "replace the auth if given a new auth for the same db" do
       auth = {'db_name' => 'test', 'username' => 'mickey', 'password' => 'm0u53'}
-      @conn.add_auth(auth['db_name'], auth['username'], auth['password'])
-      assert_equal 1, @conn.auths.length
-      assert_equal auth, @conn.auths[0]
+      @client.add_auth(auth['db_name'], auth['username'], auth['password'])
+      assert_equal 1, @client.auths.length
+      assert_equal auth, @client.auths[0]
     end
 
     should "remove auths by database" do
-      @conn.remove_auth('non-existent database')
-      assert_equal 1, @conn.auths.length
+      @client.remove_auth('non-existent database')
+      assert_equal 1, @client.auths.length
 
-      @conn.remove_auth('test')
-      assert_equal 0, @conn.auths.length
+      @client.remove_auth('test')
+      assert_equal 0, @client.auths.length
     end
 
     should "remove all auths" do
-      @conn.clear_auths
-      assert_equal 0, @conn.auths.length
+      @client.clear_auths
+      assert_equal 0, @client.auths.length
     end
   end
 
@@ -375,7 +361,7 @@ class TestConnection < Test::Unit::TestCase
         end
       end
 
-      should "close the connection on send_message_with_safe_check for major exceptions" do
+      should "close the connection on send_message_with_gle for major exceptions" do
         @con.expects(:checkout_writer).raises(SystemStackError)
         @con.expects(:close)
         begin