roma 1.0.0 → 1.1.0

data/{ruby/server/test → test}/t_command_definition.rb

@@ -228,9 +228,9 @@ class DefineCommandTest < Test::Unit::TestCase
 
     # case of argument error
     res = @obj.ev_get ['get']
-    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    assert_equal "CLIENT_ERROR does not find key\r\n", res
     res = @obj.ev_get []
-    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    assert_equal "CLIENT_ERROR does not find key\r\n", res
 
     # case of exception occur
     assert_raise RuntimeError do
@@ -264,9 +264,9 @@ class DefineCommandTest < Test::Unit::TestCase
 
     # case of argument error
     res = @obj.ev_set ['set']
-    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    assert_equal "CLIENT_ERROR does not find key\r\n", res
     res = @obj.ev_set []
-    assert_equal "CLIENT_ERROR dose not find key\r\n", res
+    assert_equal "CLIENT_ERROR does not find key\r\n", res
 
     # case of exception occur
     assert_raise RuntimeError do
@@ -296,31 +296,31 @@ class DefineCommandNoHashTest < Test::Unit::TestCase
 
   def test_rcwk
     ret = @obj.ev_rget ['get',"arg1\eno_hash_name"]
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 
   def test_wcwk
     ret = @obj.ev_wget ['get',"arg1\eno_hash_name"]
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 
   def test_cwk
     ret = @obj.ev_get ['get',"arg1\eno_hash_name"]
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 
   def test_rcwkv
     ret = @obj.ev_rset ['set',"arg1\eno_hash_name", '0', '0', '5']
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 
   def test_wcwkv
     ret = @obj.ev_wset ['set',"arg1\eno_hash_name", '0', '0', '5']
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 
   def test_cwkv
     ret = @obj.ev_set ['set',"arg1\eno_hash_name", '0', '0', '5']
-    assert_equal "SERVER_ERROR no_hash_name dose not exists.\r\n", ret
+    assert_equal "SERVER_ERROR no_hash_name does not exists.\r\n", ret
   end
 end

data/{ruby/server/test → test}/t_listplugin.rb

@@ -10,7 +10,7 @@ Roma::Client::RomaClient.class_eval{
   end
 }
 
-class ListPluginTest < Test::Unit::TestCase
+module ListPluginTests
   include RomaTestUtils
 
   def setup
@@ -607,9 +607,15 @@ class ListPluginTest < Test::Unit::TestCase
   end
   private :push_a_vnode_stream
 
-end # ListPluginTest
+end # ListPluginTests
+
+class ListPluginTest < Test::Unit::TestCase
+  include ListPluginTests
+end
+
+class ListPluginTestForceForward < Test::Unit::TestCase
+  include ListPluginTests
 
-class ListPluginTestForceForward < ListPluginTest
   def setup
     super
     @rc.rttable.instance_eval{

data/{ruby/server/test → test}/t_mapplugin.rb

@@ -8,7 +8,7 @@ Roma::Client::RomaClient.class_eval{
   end
 }
 
-class MapPluginTest < Test::Unit::TestCase
+module MapPluginTests
   include RomaTestUtils
 
   def setup
@@ -110,9 +110,15 @@ class MapPluginTest < Test::Unit::TestCase
     assert_equal h, eval(@rc.map_to_s('key1'))
   end
 
-end # MapPluginTest
+end # MapPluginTests
+
+class MapPluginTest < Test::Unit::TestCase
+  include MapPluginTests
+end
+
+class MapPluginTestForceForward < Test::Unit::TestCase
+  include MapPluginTests
 
-class MapPluginTestForceForward < MapPluginTest
   def setup
     super
     @rc.rttable.instance_eval{

data/{ruby/server/test → test}/t_mhash.rb

@@ -55,13 +55,13 @@ class MHashTest < Test::Unit::TestCase
 
     @rc.default_hash_name='not_exist_hash'
     [:get, :delete, :incr, :decr].each do |m|
-      assert_raise(RuntimeError,'SERVER_ERROR not_exist_hash dose not exists.') do
+      assert_raise(RuntimeError,'SERVER_ERROR not_exist_hash does not exists.') do
         @rc.send m, "key"
       end
     end
 
     [:set, :add, :replace, :append, :prepend].each do |m|
-      assert_raise(RuntimeError,'SERVER_ERROR not_exist_hash dose not exists.') do
+      assert_raise(RuntimeError,'SERVER_ERROR not_exist_hash does not exists.') do
         @rc.send m, "key","value"
       end
     end
@@ -127,8 +127,8 @@ class MHashTest < Test::Unit::TestCase
     con.write("deletehash test\r\n")
     ret = eval con.gets.chomp
     assert_equal 2, ret.length
-    assert_equal 'SERVER_ERROR test dose not exists.', ret['localhost_11211']
-    assert_equal 'SERVER_ERROR test dose not exists.', ret['localhost_11212']
+    assert_equal 'SERVER_ERROR test does not exists.', ret['localhost_11211']
+    assert_equal 'SERVER_ERROR test does not exists.', ret['localhost_11212']
     
     # delete hash to default
     con.write("deletehash roma\r\n")
@@ -148,7 +148,7 @@ class MHashTest < Test::Unit::TestCase
     
     con.write("rdefhash not_exist_hash\r\n")
     ret = con.gets.chomp
-    assert_equal("CLIENT_ERROR not_exist_hash dose not find.", ret)
+    assert_equal("CLIENT_ERROR not_exist_hash does not find.", ret)
 
     con.write("createhash test\r\n")
     con.gets
@@ -168,7 +168,7 @@ class MHashTest < Test::Unit::TestCase
     # umount
     con.write("umounthash test\r\n")
     ret = con.gets.chomp
-    assert_equal("SERVER_ERROR test dose not find.", ret)
+    assert_equal("SERVER_ERROR test does not find.", ret)
 
     # add 'test' hash
     con.write("createhash test\r\n")
@@ -189,7 +189,7 @@ class MHashTest < Test::Unit::TestCase
     assert_equal 'UNMOUNTED', ret['localhost_11212']
 
     @rc.default_hash_name='test'
-    assert_raise(RuntimeError,'SERVER_ERROR test dose not exists.') do
+    assert_raise(RuntimeError,'SERVER_ERROR test does not exists.') do
       @rc.set "key", "value"
     end
 

data/{ruby/server/test → test}/t_rclient.rb

@@ -9,7 +9,7 @@ Roma::Client::RomaClient.class_eval{
   end
 }
 
-class RClientTest < Test::Unit::TestCase
+module RClientTests
   include RomaTestUtils
 
   def setup
@@ -180,7 +180,13 @@ class RClientTest < Test::Unit::TestCase
   end
 end
 
-class RClientTestForceForward < RClientTest
+class RClientTest < Test::Unit::TestCase
+  include RClientTests
+end
+
+class RClientTestForceForward < Test::Unit::TestCase
+  include RClientTests
+
   def setup
     super
     @rc.rttable.instance_eval{

data/{ruby/server/test → test}/t_storage.rb

@@ -4,22 +4,11 @@ require 'roma/storage/tc_storage'
 require 'roma/storage/dbm_storage'
 require 'roma/storage/rh_storage'
 require 'roma/storage/sqlite3_storage'
+require 'roma/storage/groonga_storage'
 
-class TCStorageTest < Test::Unit::TestCase
-  
-  def initialize(arg)
-    super(arg)
-    @ndat=1000
-  end
-
-  def setup
-    rmtestdir('storage_test')
-    @st=Roma::Storage::TCStorage.new
-    @st.vn_list = [0,1,2,3,4,5,6,7,8,9]
-    @st.storage_path = 'storage_test'
-    @st.opendb
-  rescue =>e
-    p e
+module StorageTests
+  def ndat
+    1000
   end
 
   def rmtestdir(dirname)
@@ -29,11 +18,6 @@ class TCStorageTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    @st.closedb
-    rmtestdir('storage_test')
-  end
-
   def test_set_get
     assert_equal( 'abc_data',@st.set(0,'abc',0,0xffffffff,'abc_data')[4])
     assert_equal( 'abc_data', @st.get(0,'abc',0) )
@@ -200,7 +184,7 @@ class TCStorageTest < Test::Unit::TestCase
     assert_equal(2, Marshal.load(@st.dump(0)).length )
     assert_nil( @st.dump(1) ) # another vnode is empty
 
-    n=@ndat
+    n=ndat
     n.times{|i|
       @st.set(2,i.to_s,0,0xffffffff,'abc_data')
     }
@@ -208,7 +192,7 @@ class TCStorageTest < Test::Unit::TestCase
   end
 
   def test_volume
-    n=@ndat
+    n=ndat
     n.times{|i|
       @st.set(0,i.to_s,0,0xffffffff,'abc_data')
     }
@@ -706,7 +690,9 @@ class TCStorageTest < Test::Unit::TestCase
   end
 end
 
-class DbmStorageTest < TCStorageTest
+class DbmStorageTest < Test::Unit::TestCase
+  include StorageTests
+
   def setup
     rmtestdir('storage_test')
     @st=Roma::Storage::DbmStorage.new
@@ -731,7 +717,28 @@ class DbmStorageTest < TCStorageTest
   end
 end
 
-class RubyHashStorageTest < TCStorageTest
+class TCStorageTest < Test::Unit::TestCase
+  include StorageTests
+
+  def setup
+    rmtestdir('storage_test')
+    @st=Roma::Storage::TCStorage.new
+    @st.vn_list = [0,1,2,3,4,5,6,7,8,9]
+    @st.storage_path = 'storage_test'
+    @st.opendb
+  rescue =>e
+    p e
+  end
+
+  def teardown
+    @st.closedb
+    rmtestdir('storage_test')
+  end
+end
+
+class RubyHashStorageTest < Test::Unit::TestCase
+  include StorageTests
+
   def setup
     @st=Roma::Storage::RubyHashStorage.new
     @st.vn_list = [0,1,2,3,4,5,6,7,8,9]
@@ -793,7 +800,9 @@ class RubyHashStorageTest < TCStorageTest
 
 end
 
-class SQLite3StorageTest < TCStorageTest
+class SQLite3StorageTest < Test::Unit::TestCase
+  include StorageTests
+
   def setup
     rmtestdir('storage_test')
     @st=Roma::Storage::SQLite3Storage.new
@@ -818,7 +827,9 @@ class SQLite3StorageTest < TCStorageTest
   end
 end
 
-class TCMemStorageTest < TCStorageTest
+class TCMemStorageTest < Test::Unit::TestCase
+  include StorageTests
+
   def setup
     rmtestdir('storage_test')
     @st=Roma::Storage::TCMemStorage.new
@@ -827,3 +838,24 @@ class TCMemStorageTest < TCStorageTest
     @st.opendb
   end
 end
+
+class GroongaStorageTest < Test::Unit::TestCase
+  include StorageTests
+
+  def storage_path
+    'groonga_storage_test'
+  end
+
+  def setup
+    rmtestdir(storage_path)
+    @st = Roma::Storage::GroongaStorage.new
+    @st.vn_list = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    @st.storage_path = storage_path
+    @st.opendb
+  end
+
+  def teardown
+    @st.closedb
+    rmtestdir(storage_path)
+  end
+end

data/{ruby/server/test → test}/t_storage_error.rb

@@ -2,6 +2,7 @@
 require 'roma/client/rclient'
 require 'roma/messaging/con_pool'
 require 'roma/config'
+require 'pathname'
 
 Roma::Client::RomaClient.class_eval{
   def init_sync_routing_proc
@@ -12,14 +13,15 @@ class StorageErrorTest < Test::Unit::TestCase
   include RomaTestUtils
 
   def setup
-    path = File.expand_path('test/storage_error_storage.rb')
-    `ln -s #{path} lib/roma/storage`
+    base_path = Pathname(__FILE__).dirname.parent.expand_path
+    `ln -s #{base_path}/test/storage_error_storage.rb #{base_path}/lib/roma/storage`
     start_roma 'config4storage_error.rb'
     @rc=Roma::Client::RomaClient.new(["localhost_11211","localhost_11212"])
   end
 
   def teardown
-    `rm -f lib/roma/storage/storage_error_storage.rb`
+    base_path = Pathname(__FILE__).dirname.parent.expand_path
+    `rm -f #{base_path}/lib/roma/storage/storage_error_storage.rb`
     stop_roma
     Roma::Messaging::ConPool::instance.close_all
    rescue => e

data/{ruby/server/test → test}/t_writebehind.rb

@@ -7,21 +7,7 @@ require 'roma/messaging/con_pool'
 require 'roma/client/plugin/alist'
 require 'roma/client/plugin/map'
 
-class FileWriterTest < Test::Unit::TestCase
-
-  def initialize(arg)
-    super(arg)
-  end
-
-  def setup
-    @stats = Roma::Stats.instance
-    @stats.address = 'roma0'
-    @stats.port = 11211
-  end
-
-  def teardown
-    system('rm -rf wb_test')
-  end
+module FileWriterTests
 
   # making and writing test
   def test_wb_write
@@ -197,8 +183,22 @@ class FileWriterTest < Test::Unit::TestCase
 
 end
 
+class FileWriterTest < Test::Unit::TestCase
+  include FileWriterTests
+
+  def setup
+    @stats = Roma::Stats.instance
+    @stats.address = 'roma0'
+    @stats.port = 11211
+  end
+
+  def teardown
+    system('rm -rf wb_test')
+  end
+end
 
-class WriteBehindTest < FileWriterTest
+class WriteBehindTest < Test::Unit::TestCase
+  include FileWriterTests
   include RomaTestUtils
 
   def setup
@@ -458,7 +458,7 @@ class WriteBehindTest < FileWriterTest
       rescue
       end
       #puts "#{cmd} #{key} #{val.inspect}"
-      assert_equal(res[cnt][0], cmd)
+       assert_equal(res[cnt][0], cmd)
       assert_equal(res[cnt][1], val)
       cnt += 1
     end