mongo 1.9.2 → 1.10.0.rc0

data/test/unit/cursor_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class CursorTest < Test::Unit::TestCase
+class CursorUnitTest < Test::Unit::TestCase
   class Mongo::Cursor
     public :construct_query_spec
   end

data/test/unit/db_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ def insert_message(db, documents)
   message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
 end
 
-class DBTest < Test::Unit::TestCase
+class DBUnitTest < Test::Unit::TestCase
   context "DBTest: " do
     context "DB commands" do
       setup do
@@ -32,6 +32,7 @@ class DBTest < Test::Unit::TestCase
         @client.stubs(:read).returns(:primary)
         @client.stubs(:tag_sets)
         @client.stubs(:acceptable_latency)
+        @client.stubs(:add_auth).returns({})
         @db = DB.new("testing", @client)
         @db.stubs(:safe)
         @db.stubs(:read)
@@ -55,11 +56,18 @@ class DBTest < Test::Unit::TestCase
         end
       end
 
+      should "not include named nil opts in selector" do
+        @cursor = mock(:next_document => {"ok" => 1})
+        Cursor.expects(:new).with(@collection, :limit => -1,
+          :selector => {:ping => 1}, :socket => nil).returns(@cursor)
+        command = {:ping => 1}
+        @db.command(command, :socket => nil)
+      end
+
       should "create the proper cursor" do
         @cursor = mock(:next_document => {"ok" => 1})
         Cursor.expects(:new).with(@collection,
-          :limit => -1, :selector => {:buildinfo => 1},
-          :socket => nil, :read => nil, :comment => nil).returns(@cursor)
+          :limit => -1, :selector => {:buildinfo => 1}).returns(@cursor)
         command = {:buildinfo => 1}
         @db.command(command, :check_response => true)
       end
@@ -67,8 +75,7 @@ class DBTest < Test::Unit::TestCase
       should "raise an error when the command fails" do
         @cursor = mock(:next_document => {"ok" => 0})
         Cursor.expects(:new).with(@collection,
-          :limit => -1, :selector => {:buildinfo => 1},
-          :socket => nil, :read => nil, :comment => nil).returns(@cursor)
+          :limit => -1, :selector => {:buildinfo => 1}).returns(@cursor)
         assert_raise OperationFailure do
           command = {:buildinfo => 1}
           @db.command(command, :check_response => true)
@@ -79,21 +86,13 @@ class DBTest < Test::Unit::TestCase
         @cursor = mock(:next_document => {"ok" => 0})
         Cursor.expects(:new).with(@collection,
           :limit => -1, :selector => {:buildinfo => 1},
-          :socket => nil, :read => nil, :comment => "my comment").returns(@cursor)
+          :comment => "my comment").returns(@cursor)
         assert_raise OperationFailure do
           command = {:buildinfo => 1}
           @db.command(command, :check_response => true, :comment => 'my comment')
         end
       end
 
-      should "raise an error if logging out fails" do
-        @db.expects(:command).returns({})
-        @client.expects(:auths).returns([])
-        assert_raise Mongo::MongoDBError do
-          @db.logout
-        end
-      end
-
       should "raise an error if collection creation fails" do
         @db.expects(:command).returns({'ok' => 0})
         assert_raise Mongo::MongoDBError do
@@ -121,6 +120,11 @@ class DBTest < Test::Unit::TestCase
           @db.profiling_level = :slow_only
         end
       end
+
+      should "warn when save_auth is not nil" do
+        assert @db.expects(:warn).with(regexp_matches(/\[DEPRECATED\] Disabling the 'save_auth' option/))
+        @db.authenticate('foo', 'bar', false)
+      end
     end
   end
 end

data/test/unit/grid_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class GridTest < Test::Unit::TestCase
+class GridUnitTest < Test::Unit::TestCase
 
   context "GridFS: " do
     setup do

data/test/unit/mongo_sharded_client_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
 
 require "test_helper"
 
-class MongoShardedClientTest < Test::Unit::TestCase
+class MongoShardedClientUnitTest < Test::Unit::TestCase
   include Mongo
 
-  def setup
-    ENV["MONGODB_URI"] = nil
-  end
-
   def test_initialize_with_single_mongos_uri
-    ENV["MONGODB_URI"] = "mongodb://localhost:27017"
-    client = MongoShardedClient.new(:connect => false)
-    assert_equal [[ "localhost", 27017 ]], client.seeds
+    uri = "mongodb://localhost:27017"
+    with_preserved_env_uri(uri) do
+      client = MongoShardedClient.new(:connect => false)
+      assert_equal [[ "localhost", 27017 ]], client.seeds
+    end
   end
 
   def test_initialize_with_multiple_mongos_uris
-    ENV["MONGODB_URI"] = "mongodb://localhost:27017,localhost:27018"
-    client = MongoShardedClient.new(:connect => false)
-    assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
+    uri = "mongodb://localhost:27017,localhost:27018"
+    with_preserved_env_uri(uri) do
+      client = MongoShardedClient.new(:connect => false)
+      assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
+    end
   end
 
   def test_from_uri_with_string
@@ -39,8 +39,10 @@ class MongoShardedClientTest < Test::Unit::TestCase
   end
 
   def test_from_uri_with_env_variable
-    ENV["MONGODB_URI"] = "mongodb://localhost:27017,localhost:27018"
-    client = MongoShardedClient.from_uri(nil, :connect => false)
-    assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
+    uri = "mongodb://localhost:27017,localhost:27018"
+    with_preserved_env_uri(uri) do
+      client = MongoShardedClient.from_uri(nil, :connect => false)
+      assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
+    end
   end
 end

data/test/unit/node_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class NodeTest < Test::Unit::TestCase
+class NodeUnitTest < Test::Unit::TestCase
 
   def setup
     @client = stub()

data/test/unit/pool_manager_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 require 'test_helper'
 include Mongo
 
-class PoolManagerTest < Test::Unit::TestCase
+class PoolManagerUnitTest < Test::Unit::TestCase
 
   context "Initialization: " do
 
@@ -47,8 +47,10 @@ class PoolManagerTest < Test::Unit::TestCase
       @ismaster = {
         'hosts' => @hosts,
         'arbiters' => @arbiters,
+        'maxBsonObjectSize' => 1024,
         'maxMessageSizeBytes' => 1024 * 2.5,
-        'maxBsonObjectSize' => 1024
+        'maxWireVersion' => 1,
+        'minWireVersion' => 0
       }
     end
 
@@ -60,8 +62,8 @@ class PoolManagerTest < Test::Unit::TestCase
 
         # Subsequent calls to configure pools.
         @ismaster.merge({'ismaster' => true}),
-        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
         @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 500}),
+        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
         @ismaster.merge({'arbiterOnly' => true})
       )
 
@@ -76,7 +78,7 @@ class PoolManagerTest < Test::Unit::TestCase
       assert_equal [27018, 27019], manager.secondary_pools.map(&:port).sort
       assert_equal [['localhost', 27020]], manager.arbiters
       assert_equal 500, manager.max_bson_size
-      assert_equal 700 , manager.max_message_size
+      assert_equal 700, manager.max_message_size
     end
 
     should "populate pools with single unqueryable seed" do

data/test/unit/read_pref_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
 
 require 'test_helper'
 
-class ReadPrefTest < Test::Unit::TestCase
+class ReadPreferenceUnitTest < Test::Unit::TestCase
+
   include ReadPreference
 
   def setup
@@ -32,4 +33,83 @@ class ReadPrefTest < Test::Unit::TestCase
     end
   end
 
+  def test_sok_mapreduce_out_string_returns_false
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', 'new-test-collection']
+    assert_equal false, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_mapreduce_replace_collection_returns_false
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', BSON::OrderedHash['replace', 'new-test-collection']]
+    assert_equal false, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_mapreduce_inline_collection_returns_false
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', 'inline']
+    assert_equal false, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_inline_symbol_mapreduce_returns_true
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', BSON::OrderedHash[:inline, 'true']]
+    assert_equal true, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_inline_string_mapreduce_returns_true
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', BSON::OrderedHash['inline', 'true']]
+    assert_equal true, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_count_true
+    command = BSON::OrderedHash['count', 'test-collection',
+                                'query', BSON::OrderedHash['a', 'b']]
+    assert_equal true, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_sok_server_status_returns_false
+    command = BSON::OrderedHash['serverStatus', 1]
+    assert_equal false, ReadPreference::secondary_ok?(command)
+  end
+
+  def test_cmd_reroute_with_secondary
+    ReadPreference::expects(:warn).with(regexp_matches(/rerouted to primary/))
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', 'new-test-collection']
+    assert_equal :primary, ReadPreference::cmd_read_pref(:secondary, command)
+  end
+
+  def test_find_and_modify_reroute_with_secondary
+    ReadPreference::expects(:warn).with(regexp_matches(/rerouted to primary/))
+    command = BSON::OrderedHash['findAndModify', 'test-collection',
+                                'query', {}]
+    assert_equal :primary, ReadPreference::cmd_read_pref(:secondary, command)
+  end
+
+  def test_cmd_no_reroute_with_secondary
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', BSON::OrderedHash['inline', 'true']]
+    assert_equal :secondary, ReadPreference::cmd_read_pref(:secondary, command)
+  end
+
+  def test_cmd_no_reroute_with_primary
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', 'new-test-collection']
+    assert_equal :primary, ReadPreference::cmd_read_pref(:primary, command)
+  end
+
+  def test_cmd_no_reroute_with_primary_secondary_ok
+    command = BSON::OrderedHash['mapreduce', 'test-collection',
+                                'out', BSON::OrderedHash['inline', 'true']]
+    assert_equal :primary, ReadPreference::cmd_read_pref(:primary, command)
+  end
+
+  def test_parallel_scan_secondary_ok
+    command = BSON::OrderedHash['parallelCollectionScan', 'test-collection',
+                                'numCursors', 3]
+    assert_equal true, ReadPreference::secondary_ok?(command)
+  end
+
 end

data/test/unit/read_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class ReadTest < Test::Unit::TestCase
+class ReadUnitTest < Test::Unit::TestCase
 
   context "Read mode on standard connection: " do
     setup do
@@ -46,29 +46,29 @@ class ReadTest < Test::Unit::TestCase
     end
 
     should "propogate to DB" do
-      db = @client['foo']
+      db = @client[TEST_DB]
       assert_equal @read, db.read
       assert_equal @tags, db.tag_sets
       assert_equal @acceptable_latency, db.acceptable_latency
 
-      db = @client.db('foo')
+      db = @client.db(TEST_DB)
       assert_equal @read, db.read
       assert_equal @tags, db.tag_sets
       assert_equal @acceptable_latency, db.acceptable_latency
 
-      db = DB.new('foo', @client)
+      db = DB.new(TEST_DB, @client)
       assert_equal @read, db.read
       assert_equal @tags, db.tag_sets
       assert_equal @acceptable_latency, db.acceptable_latency
     end
 
     should "allow db override" do
-      db = DB.new('foo', @client, :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
+      db = DB.new(TEST_DB, @client, :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
       assert_equal :primary, db.read
       assert_equal @bad_tags, db.tag_sets
       assert_equal 25, db.acceptable_latency
 
-      db = @client.db('foo', :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
+      db = @client.db(TEST_DB, :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
       assert_equal :primary, db.read
       assert_equal @bad_tags, db.tag_sets
       assert_equal 25, db.acceptable_latency
@@ -76,33 +76,33 @@ class ReadTest < Test::Unit::TestCase
 
     context "on DB: " do
       setup do
-        @db = @client['foo']
+        @db = @client[TEST_DB]
       end
 
       should "propogate to collection" do
-        col = @db.collection('bar')
+        col = @db.collection('read-unit-test')
         assert_equal @read, col.read
         assert_equal @tags, col.tag_sets
         assert_equal @acceptable_latency, col.acceptable_latency
 
-        col = @db['bar']
+        col = @db['read-unit-test']
         assert_equal @read, col.read
         assert_equal @tags, col.tag_sets
         assert_equal @acceptable_latency, col.acceptable_latency
 
-        col = Collection.new('bar', @db)
+        col = Collection.new('read-unit-test', @db)
         assert_equal @read, col.read
         assert_equal @tags, col.tag_sets
         assert_equal @acceptable_latency, col.acceptable_latency
       end
 
       should "allow override on collection" do
-        col = @db.collection('bar', :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
+        col = @db.collection('read-unit-test', :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
         assert_equal :primary, col.read
         assert_equal @bad_tags, col.tag_sets
         assert_equal 25, col.acceptable_latency
 
-        col = Collection.new('bar', @db, :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
+        col = Collection.new('read-unit-test', @db, :read => :primary, :tag_sets => @bad_tags, :acceptable_latency => 25)
         assert_equal :primary, col.read
         assert_equal @bad_tags, col.tag_sets
         assert_equal 25, col.acceptable_latency
@@ -111,7 +111,7 @@ class ReadTest < Test::Unit::TestCase
 
     context "on read mode ops" do
       setup do
-        @col = @client['foo']['bar']
+        @col = @client[TEST_DB]['read-unit-test']
         @mock_socket = new_mock_socket
       end
 

data/test/unit/safe_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class SafeTest < Test::Unit::TestCase
+class SafeUnitTest < Test::Unit::TestCase
 
   context "Write-Concern modes on Mongo::Connection " do
     setup do
@@ -23,28 +23,28 @@ class SafeTest < Test::Unit::TestCase
     end
 
     should "propogate to DB" do
-      db = @connection['foo']
+      db = @connection[TEST_DB]
       assert_equal @safe_value[:w], db.write_concern[:w]
 
 
-      db = @connection.db('foo')
+      db = @connection.db(TEST_DB)
       assert_equal @safe_value[:w], db.write_concern[:w]
 
-      db = DB.new('foo', @connection)
+      db = DB.new(TEST_DB, @connection)
       assert_equal @safe_value[:w], db.write_concern[:w]
     end
 
     should "allow db override" do
-      db = DB.new('foo', @connection, :safe => false)
+      db = DB.new(TEST_DB, @connection, :safe => false)
       assert_equal 0, db.write_concern[:w]
 
-      db = @connection.db('foo', :safe => false)
+      db = @connection.db(TEST_DB, :safe => false)
       assert_equal 0, db.write_concern[:w]
     end
 
     context "on DB: " do
       setup do
-        @db = @connection['foo']
+        @db = @connection[TEST_DB]
       end
 
       should "propogate to collection" do
@@ -69,7 +69,7 @@ class SafeTest < Test::Unit::TestCase
 
     context "on operations supporting safe mode" do
       setup do
-        @col = @connection['foo']['bar']
+        @col = @connection[TEST_DB]['bar']
       end
 
       should "use default value on insert" do