test/test_errors.rb in couchbase-jruby-client-0.1.2 vs test/test_errors.rb in couchbase-jruby-client-0.1.3

@@ -18,65 +18,56 @@
 require File.join(File.dirname(__FILE__), 'setup')
 require 'digest/md5'
 
 class TestErrors < MiniTest::Test
 
-  def setup
-    @mock = start_mock
-  end
-
-  def teardown
-    stop_mock(@mock)
-  end
-
   def genkey(item)
     tuple = [item["author"], item["message"]]
     Digest::MD5.hexdigest(tuple.join('-'))
   end
 
   def test_graceful_add_with_collision
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     msg1 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:29:09"}
     key1 = uniq_id(genkey(msg1))
     msg2 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:29:30"}
     key2 = uniq_id(genkey(msg2))
 
-    connection.add(key1, msg1)
+    cb.add(key1, msg1)
     begin
-      connection.add(key2, msg2)
+      cb.add(key2, msg2)
     rescue Couchbase::Error::KeyExists => ex
       # using info from exception
       # it could be done with cas operation, but we can save one request
       # here (in real world cas operation will be more consistent because it
       # fetch fresh version from the cluster)
       #
-      # connection.cas(key2) do |msg|
+      # cb.cas(key2) do |msg|
       #   msg.merge("time" => [msg["time"], msg2["time"]])
       # end
       msg2 = msg1.merge("time" => [msg1["time"], msg2["time"]])
-      connection.set(key2, msg2, :cas => ex.cas)
+      cb.set(key2, msg2, :cas => ex.cas)
     end
 
     msg3 = {"author" => "foo", "message" => "hi all",
                 "time" => ["2012-01-12 11:29:09", "2012-01-12 11:29:30"]}
     key3 = uniq_id(genkey(msg3))
-    assert_equal msg3, connection.get(key3)
+    assert_equal msg3, cb.get(key3)
 
-    connection.run do |conn|
+    cb.run do |conn|
       msg4 = {"author" => "foo", "message" => "hi all", "time" => "2012-01-12 11:45:34"}
       key4 = uniq_id(genkey(msg4))
 
-      connection.add(key4, msg4) do |ret|
+      cb.add(key4, msg4) do |ret|
         assert_equal :add, ret.operation
         assert_equal key4, ret.key
         msg4 = msg3.merge("time" => msg3["time"] + [msg4["time"]])
-        connection.set(ret.key, msg4, :cas => ret.cas)
+        cb.set(ret.key, msg4, :cas => ret.cas)
       end
     end
 
     msg5 = {"author" => "foo", "message" => "hi all",
                 "time" => ["2012-01-12 11:29:09", "2012-01-12 11:29:30", "2012-01-12 11:45:34"]}
     key5 = uniq_id(genkey(msg5))
-    assert_equal msg5, connection.get(key5)
+    assert_equal msg5, cb.get(key5)
   end
 
 end