From d0e97a286325637da71a2dc92c3e4b2adf9b0d28 Mon Sep 17 00:00:00 2001 From: Kyle Banker Date: Thu, 9 Sep 2010 14:27:34 -0400 Subject: [PATCH] minor: remove deprecated ObjectID references in tests --- test/cursor_test.rb | 4 +- test/mongo_bson/bson_test.rb | 10 +-- test/mongo_bson/json_test.rb | 2 +- test/mongo_bson/objectid_test.rb | 132 ------------------------------- 4 files changed, 8 insertions(+), 140 deletions(-) delete mode 100644 test/mongo_bson/objectid_test.rb diff --git a/test/cursor_test.rb b/test/cursor_test.rb index cff3dce..e74e2d9 100644 --- a/test/cursor_test.rb +++ b/test/cursor_test.rb @@ -126,13 +126,13 @@ class CursorTest < Test::Unit::TestCase @@coll.remove t1 = Time.now - t1_id = ObjectID.from_time(t1) + t1_id = ObjectId.from_time(t1) @@coll.save({:t => 't1'}) @@coll.save({:t => 't1'}) @@coll.save({:t => 't1'}) sleep(2) t2 = Time.now - t2_id = ObjectID.from_time(t2) + t2_id = ObjectId.from_time(t2) @@coll.save({:t => 't2'}) @@coll.save({:t => 't2'}) @@coll.save({:t => 't2'}) diff --git a/test/mongo_bson/bson_test.rb b/test/mongo_bson/bson_test.rb index 05ec73a..6b5dab5 100644 --- a/test/mongo_bson/bson_test.rb +++ b/test/mongo_bson/bson_test.rb @@ -191,7 +191,7 @@ class BSONTest < Test::Unit::TestCase end def test_oid - doc = {'doc' => ObjectID.new} + doc = {'doc' => ObjectId.new} bson = BSON::BSON_CODER.serialize(doc) assert_equal doc, BSON::BSON_CODER.deserialize(bson) end @@ -270,7 +270,7 @@ class BSONTest < Test::Unit::TestCase end def test_dbref - oid = ObjectID.new + oid = ObjectId.new doc = {} doc['dbref'] = DBRef.new('namespace', oid) bson = BSON::BSON_CODER.serialize(doc) @@ -528,14 +528,14 @@ class BSONTest < Test::Unit::TestCase def test_keep_id_with_hash_with_indifferent_access doc = HashWithIndifferentAccess.new embedded = HashWithIndifferentAccess.new - embedded['_id'] = ObjectID.new - doc['_id'] = ObjectID.new + embedded['_id'] = ObjectId.new + doc['_id'] = ObjectId.new doc['embedded'] = [embedded] BSON::BSON_CODER.serialize(doc, false, true).to_a assert doc.has_key?("_id") assert doc['embedded'][0].has_key?("_id") - doc['_id'] = ObjectID.new + doc['_id'] = ObjectId.new BSON::BSON_CODER.serialize(doc, false, true).to_a assert doc.has_key?("_id") end diff --git a/test/mongo_bson/json_test.rb b/test/mongo_bson/json_test.rb index 441064b..1100aeb 100644 --- a/test/mongo_bson/json_test.rb +++ b/test/mongo_bson/json_test.rb @@ -8,7 +8,7 @@ class JSONTest < Test::Unit::TestCase include BSON def test_object_id_as_json - id = ObjectID.new + id = ObjectId.new obj = {'_id' => id} assert_equal "{\"_id\":{\"$oid\": \"#{id.to_s}\"}}", obj.to_json end diff --git a/test/mongo_bson/objectid_test.rb b/test/mongo_bson/objectid_test.rb deleted file mode 100644 index 307c3ab..0000000 --- a/test/mongo_bson/objectid_test.rb +++ /dev/null @@ -1,132 +0,0 @@ -require 'test/test_helper' -require 'rubygems' -require 'json' - -class ObjectIDTest < Test::Unit::TestCase - - include Mongo - include BSON - - def setup - @o = ObjectID.new - end - - def test_hashcode - assert_equal @o.instance_variable_get(:@data).hash, @o.hash - end - - def test_array_uniq_for_equilavent_ids - a = ObjectID.new('123') - b = ObjectID.new('123') - assert_equal a, b - assert_equal 1, [a, b].uniq.size - end - - def test_create_pk_method - doc = {:name => 'Mongo'} - doc = ObjectID.create_pk(doc) - assert doc[:_id] - - doc = {:name => 'Mongo', :_id => '12345'} - doc = ObjectID.create_pk(doc) - assert_equal '12345', doc[:_id] - end - - def test_different - a = ObjectID.new - b = ObjectID.new - assert_not_equal a.to_a, b.to_a - assert_not_equal a, b - end - - def test_eql? - o2 = ObjectID.new(@o.to_a) - assert_equal @o, o2 - end - - def test_to_s - s = @o.to_s - assert_equal 24, s.length - s =~ /^([0-9a-f]+)$/ - assert_equal 24, $1.length - end - - def test_method - assert_equal ObjectID.from_string(@o.to_s), BSON::ObjectID(@o.to_s) - end - - def test_inspect - assert_equal "BSON::ObjectID('#{@o.to_s}')", @o.inspect - end - - def test_save_and_restore - host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' - port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT - db = Connection.new(host, port).db(MONGO_TEST_DB) - coll = db.collection('test') - - coll.remove - coll << {'a' => 1, '_id' => @o} - - row = coll.find().collect.first - assert_equal 1, row['a'] - assert_equal @o, row['_id'] - end - - def test_from_string - hex_str = @o.to_s - o2 = ObjectID.from_string(hex_str) - assert_equal hex_str, o2.to_s - assert_equal @o, o2 - assert_equal @o.to_s, o2.to_s - end - - def test_illegal_from_string - assert_raise InvalidObjectID do - ObjectID.from_string("") - end - end - - def test_legal - assert !ObjectID.legal?(nil) - assert !ObjectID.legal?("fred") - assert !ObjectID.legal?("0000") - assert !ObjectID.legal?('000102030405060708090A0') - assert ObjectID.legal?('000102030405060708090A0B') - assert ObjectID.legal?('abcdefABCDEF123456789012') - assert !ObjectID.legal?('abcdefABCDEF12345678901x') - end - - def test_from_string_leading_zeroes - hex_str = '000000000000000000000000' - o = ObjectID.from_string(hex_str) - assert_equal hex_str, o.to_s - end - - def test_byte_order - hex_str = '000102030405060708090A0B' - o = ObjectID.from_string(hex_str) - assert_equal [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b], o.to_a - end - - def test_generation_time - time = Time.now - id = ObjectID.new - generated_time = id.generation_time - - assert_in_delta time.to_i, generated_time.to_i, 2 - assert_equal "UTC", generated_time.zone - end - - def test_from_time - time = Time.now.utc - id = ObjectID.from_time(time) - - assert_equal time.to_i, id.generation_time.to_i - end - - def test_json - id = ObjectID.new - assert_equal "{\"$oid\": \"#{id}\"}", id.to_json - end -end