couchbase-jruby-client 0.1.7-java → 0.1.8-java

data/test/test_format.rb

@@ -30,7 +30,6 @@ class TestFormat < MiniTest::Test
     assert_equal :document, cb.default_format
     cb.set(uniq_id, orig_doc)
     doc, flags, cas = cb.get(uniq_id, :extended => true)
-    # assert_equal 0x00, flags & 0x11
     assert doc.is_a?(Hash)
     assert_equal 'Twoflower', doc['name']
     assert_equal 'The tourist', doc['role']
@@ -67,15 +66,13 @@ class TestFormat < MiniTest::Test
     orig_doc = ArbitraryClass.new("Twoflower", "The tourist")
     cb.set(uniq_id, orig_doc, :format => :marshal)
     doc, flags, cas = cb.get(uniq_id, :extended => true)
-    # assert_equal Couchbase::Bucket::FMT_MARSHAL, flags & Couchbase::Bucket::FMT_MASK
     assert doc.is_a?(ArbitraryClass)
     assert_equal 'Twoflower', doc.name
     assert_equal 'The tourist', doc.role
   end
 
   def test_it_accepts_only_string_in_plain_mode
-    skip
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
+    cb.default_format = :plain
     cb.set(uniq_id, "1")
 
     assert_raises(Couchbase::Error::ValueFormat) do
@@ -85,25 +82,19 @@ class TestFormat < MiniTest::Test
     assert_raises(Couchbase::Error::ValueFormat) do
       cb.set(uniq_id, {:foo => "bar"})
     end
+  ensure
+    cb.default_format = :document
   end
 
   def test_bignum_conversion
-    skip
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
+    cb.default_format = :plain
     cas = 0xffff_ffff_ffff_ffff
     assert cas.is_a?(Bignum)
     assert_raises(Couchbase::Error::NotFound) do
       cb.delete(uniq_id => cas)
     end
-  end
-
-  def test_it_allows_to_turn_off_transcoder
-    skip
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :transcoder => nil)
-    cb.set(uniq_id, "value", :flags => 0xffff_ffff)
-    doc, flags, _ = cb.get(uniq_id, :extended => true)
-    assert_equal "value", doc
-    assert_equal 0xffff_ffff, flags
+  ensure
+    cb.default_format = :document
   end
 
   require 'zlib'

data/test/test_get.rb

@@ -152,31 +152,23 @@ class TestGet < MiniTest::Test
 
   def test_asynchronous_get
     cas = cb.set(uniq_id, "foo")
-    res = []
+    ret = nil
 
-    suite = lambda do |conn|
-      res.clear
-      conn.get(uniq_id) # ignore result
-      conn.get(uniq_id) {|ret| res << ret}
-      handler = lambda {|ret| res << ret}
-      conn.get(uniq_id, &handler)
-    end
+    future = cb.async_get(uniq_id) { |res| ret = res }
+    future.get
+    sleep 0.1
 
-    checks = lambda do
-      res.each do |r|
-        assert r.is_a?(Couchbase::Result)
-        assert r.success?
-        assert_equal uniq_id, r.key
-        assert_equal "foo", r.value
-        # assert_equal cas, r.cas TODO: GetFuture does not hold CAS
-      end
-    end
-
-    cb.run(&suite)
-    checks.call
+    assert ret.is_a?(Couchbase::Result)
+    assert ret.success?
+    assert_equal uniq_id, ret.key
+    assert_equal :get, ret.operation
+    assert_equal "foo", ret.value
+  end
 
-    cb.run{ suite.call(cb) }
-    checks.call
+  def test_asynchronous_get_without_block
+    assert_raises ArgumentError do
+      cb.async_get(uniq_id)
+    end
   end
 
   def test_asynchronous_multi_get

data/test/test_stats.rb

@@ -30,6 +30,8 @@ class TestStats < MiniTest::Test
   end
 
   def test_stats_with_argument
+    skip unless $mock.real?
+
     stats = cb.stats("memory")
     assert stats.is_a?(Hash)
     assert stats.has_key?("mem_used")

data/test/test_store.rb

@@ -92,20 +92,26 @@ class TestStore < MiniTest::Test
 
   def test_asynchronous_set
     ret = nil
-    cb.run do |conn|
-      conn.set(uniq_id("1"), "foo1") {|res| ret = res}
-      conn.set(uniq_id("2"), "foo2") # ignore result
-    end
+    future = cb.async_set(uniq_id, "foo1") { |res| ret = res }
+    future.get
+    sleep 0.1
 
     assert ret.is_a?(Couchbase::Result)
     assert ret.success?
-    assert_equal uniq_id("1"), ret.key
+    assert_equal uniq_id, ret.key
     assert_equal :set, ret.operation
     assert ret.cas.is_a?(Numeric)
   end
 
-  def test_it_raises_error_when_appending_or_prepending_to_missing_key
+    def test_asynchronous_set_wtihout_block
+    future = cb.async_set(uniq_id, 'fu')
+    future.get
+    sleep 0.1
 
+    assert_equal 'fu', cb.get(uniq_id)
+  end
+
+  def test_it_raises_error_when_appending_or_prepending_to_missing_key
     assert_raises(Couchbase::Error::NotStored) do
       cb.append(uniq_id(:missing), "foo")
     end

data/test/test_unlock.rb

@@ -75,6 +75,7 @@ class TestUnlock < MiniTest::Test
   end
 
   def test_tmp_failure
+    skip unless $mock.real?
     cas1 = cb.set(uniq_id(1), "foo")
     cas2 = cb.set(uniq_id(2), "foo")
     cb.get(uniq_id(1), :lock => true) # get with lock will update CAS

data/test/test_view.rb

@@ -20,27 +20,38 @@ require File.join(File.dirname(__FILE__), 'setup')
 class TestView < MiniTest::Test
 
   def setup
-    @path = '_design/users/_view/by_age'
+    return unless $mock.real?
+
     cb.save_design_doc(design_doc)
     { bob: 32, frank: 25, sam: 42, fred: 21 }.each_pair do |name, age|
       cb.set(name, { type: 'user', name: name, age: age })
     end
-    @view = Couchbase::View.new(cb, @path)
+  end
+
+  def view
+    @view ||= Couchbase::View.new(cb, '_design/users/_view/by_age')
+  end
+
+  def reduce_view
+    @reduce_view ||= Couchbase::View.new(cb, '_design/users/_view/all')
   end
 
   def test_initialize
-    assert_equal 'users',  @view.design_doc
-    assert_equal 'by_age', @view.name
+    skip unless $mock.real?
+    assert_equal 'users',  view.design_doc
+    assert_equal 'by_age', view.name
   end
 
   def test_simple_fetch
-    assert results = @view.fetch
+    skip unless $mock.real?
+    assert results = view.fetch
     assert results.is_a?(Couchbase::View::ArrayWithTotalRows)
   end
 
   def test_fetch_without_stale
-    assert results = @view.fetch(stale: false)
-    assert results.first.is_a?(Couchbase::ViewRow)
+    skip unless $mock.real?
+    assert results = view.fetch(stale: false)
+    assert_instance_of Couchbase::ViewRow, results.first
     assert results.first.doc.nil?
     assert_equal 4, results.total_rows
     results.each do |result|
@@ -49,22 +60,44 @@ class TestView < MiniTest::Test
   end
 
   def test_fetch_with_docs
-    assert results = @view.fetch(stale: false, include_docs: true)
-    assert results.is_a?(Array)
-    assert results.first.doc.is_a?(Hash)
+    skip unless $mock.real?
+    assert results = view.fetch(stale: false, include_docs: true)
+    assert_instance_of Couchbase::View::ArrayWithTotalRows, results
+    assert_instance_of Hash, results.first.doc
   end
 
   def test_fetch_with_block
-    refute @view.fetch(stale: false, include_docs: true) { |row|
-      assert row.is_a?(Couchbase::ViewRow)
+    skip unless $mock.real?
+    refute view.fetch(stale: false, include_docs: true) { |row|
+      assert_instance_of Couchbase::ViewRow, row
       assert row.doc['name'].is_a?(String)
       assert row.doc['age'].is_a?(Fixnum)
     }
   end
 
+  def test_fetch_reduce
+    skip unless $mock.real?
+    assert results = reduce_view.fetch(stale: false, include_docs: false)
+    assert_instance_of Couchbase::ViewRow, results.first
+    assert_equal 4, results.first.value
+  end
+
+  def test_fetch_without_reduce
+    skip unless $mock.real?
+    assert results = reduce_view.fetch(stale: false, reduce: false)
+    assert_instance_of Couchbase::ViewRow, results.first
+    assert results.first.doc.nil?
+    assert_equal 4, results.total_rows
+    results.each do |result|
+      %w(bob frank sam fred).include?(result.key)
+    end
+  end
+
   def test_design_doc_access
+    skip unless $mock.real?
+    view.fetch(stale: false, include_docs: true)
     assert results = cb.design_docs['users'].by_age.to_a
-    assert results.first.is_a?(Couchbase::ViewRow)
+    assert_instance_of Couchbase::ViewRow, results.first
   end
 
   def design_doc
@@ -79,9 +112,17 @@ class TestView < MiniTest::Test
                 emit(meta.id, doc.age);
             }
           JS
+        },
+        'all' => {
+          'reduce' => '_count',
+          'map' => <<-JS
+            function (doc, meta) {
+              if (doc.type && doc.type == 'user')
+                emit(meta.id, null);
+            }
+          JS
         }
       }
     }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: java
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -115,7 +115,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
 - .gitignore
 - .jrubyrc
 - .ruby-version
@@ -163,6 +162,10 @@ files:
 - lib/jars/spymemcached-2.10.3-javadoc.jar
 - lib/jars/spymemcached-2.10.3-sources.jar
 - lib/jars/spymemcached-2.10.3.jar
+- tasks/benchmark.rake
+- tasks/test.rake
+- tasks/util.rake
+- test/mock.rb
 - test/profile/.gitignore
 - test/profile/.jrubyrc
 - test/profile/Gemfile
@@ -216,6 +219,7 @@ signing_key:
 specification_version: 4
 summary: The unofficial jruby client library for use with Couchbase Server.
 test_files:
+- test/mock.rb
 - test/profile/.gitignore
 - test/profile/.jrubyrc
 - test/profile/Gemfile

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-pro
-repo_token: YXFMm3Og960X2Ndrj3eome2KFIjlAlJ77