From bfb26b342610c46dbcd674469ef98e9f14d773db Mon Sep 17 00:00:00 2001
From: Mike Dirolf <mike@10gen.com>
Date: Wed, 2 Dec 2009 15:49:45 -0500
Subject: [PATCH] minor: update mongo-qa tests for new bson api

---
 lib/mongo/util/bson_ruby.rb |  8 ++++++--
 test/test_round_trip.rb     | 18 +++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/mongo/util/bson_ruby.rb b/lib/mongo/util/bson_ruby.rb
index 078de15..44481ac 100644
--- a/lib/mongo/util/bson_ruby.rb
+++ b/lib/mongo/util/bson_ruby.rb
@@ -76,8 +76,12 @@ class BSON_RUBY
     @buf.to_a
   end
 
+  def to_s
+    @buf.to_s
+  end
+
   # Serializes an object.
-  # Implemented to ensure an API compatible with BSON extension. 
+  # Implemented to ensure an API compatible with BSON extension.
   def self.serialize(obj, check_keys=false)
     new.serialize(obj, check_keys)
   end
@@ -108,7 +112,7 @@ class BSON_RUBY
   end
 
   # Returns the array stored in the buffer.
-  # Implemented to ensure an API compatible with BSON extension. 
+  # Implemented to ensure an API compatible with BSON extension.
   def unpack(arg)
     @buf.to_a
   end
diff --git a/test/test_round_trip.rb b/test/test_round_trip.rb
index fac9a14..8d95f7d 100644
--- a/test/test_round_trip.rb
+++ b/test/test_round_trip.rb
@@ -74,18 +74,18 @@ EOS
       # Read the BSON from the file
       bson = f.read
       bson = if RUBY_VERSION >= '1.9'
-               bson.bytes.to_a
+               bson.bytes
              else
-               bson.split(//).collect { |c| c[0] }
+               bson
              end
 
       # Turn the Ruby object into BSON bytes and compare with the BSON bytes
       # from the file.
-      bson_from_ruby = BSON.new.serialize(obj).to_a
+      bson_from_ruby = BSON.serialize(obj)
 
       begin
-        assert_equal bson.length, bson_from_ruby.length
-        assert_equal bson, bson_from_ruby
+        assert_equal bson.length, bson_from_ruby.to_s.length
+        assert_equal bson, bson_from_ruby.to_s
       rescue => ex
 #         File.open(File.join(dir, "#{name}_out_a.bson"), 'wb') { |f| # DEBUG
 #           bson_from_ruby.each { |b| f.putc(b) }
@@ -98,15 +98,15 @@ EOS
       # We're passing a nil db to the contructor here, but that's OK because
       # the BSON DBRef bytes don't contain the db object in any case, and we
       # don't care what the database is.
-      obj_from_bson = BSON.new.deserialize(ByteBuffer.new(bson_from_ruby))
+      obj_from_bson = BSON.deserialize(bson_from_ruby)
       assert_kind_of OrderedHash, obj_from_bson
 
       # Turn that Ruby object into BSON and compare it to the original BSON
       # bytes.
-      bson_from_ruby = BSON.new.serialize(obj_from_bson).to_a
+      bson_from_ruby = BSON.serialize(obj_from_bson)
       begin
-        assert_equal bson.length, bson_from_ruby.length
-        assert_equal bson, bson_from_ruby
+        assert_equal bson.length, bson_from_ruby.to_s.length
+        assert_equal bson, bson_from_ruby.to_s
       rescue => ex
 #         File.open(File.join(dir, "#{name}_out_b.bson"), 'wb') { |f| # DEBUG
 #           bson_from_ruby.each { |b| f.putc(b) }