higgs 0.1.6 → 0.1.7

data/test/test_cgi_session.rb

@@ -9,7 +9,7 @@ require 'test/unit'
 module Higgs::Test
   module CGISessionTest
     # for ident(1)
-    CVS_ID = '$Id: test_cgi_session.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_cgi_session.rb 562 2007-09-25 15:34:24Z toki $'
 
     def new_store(session, options={})
       options.update('tmpdir' => @tmpdir, :logger => @logger)
@@ -119,7 +119,7 @@ module Higgs::Test
     include CGISessionTest
 
     # for ident(1)
-    CVS_ID = '$Id: test_cgi_session.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_cgi_session.rb 562 2007-09-25 15:34:24Z toki $'
 
     def store_type
       CGI::Session::PStore
@@ -133,7 +133,7 @@ module Higgs::Test
     include CGISessionTest
 
     # for ident(1)
-    CVS_ID = '$Id: test_cgi_session.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_cgi_session.rb 562 2007-09-25 15:34:24Z toki $'
 
     def store_type
       CGI::Session::HiggsStore

data/test/test_dbm.rb

@@ -10,14 +10,14 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_dbm.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_dbm.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def setup
       @test_dir = 'dbm_test'
       FileUtils.rm_rf(@test_dir) # for debug
       FileUtils.mkdir_p(@test_dir)
-      @name = File.join(@test_dir, 'foo')
-      @db = DBM.new(@name,
+      @st_name = File.join(@test_dir, 'foo')
+      @db = DBM.new(@st_name,
                     :logger => proc{|path|
                       logger = Logger.new(path, 1)
                       logger.level = Logger::DEBUG
@@ -137,13 +137,13 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_dbm.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_dbm.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def setup
       @test_dir = 'dbm_test'
       FileUtils.rm_rf(@test_dir) # for debug
       FileUtils.mkdir_p(@test_dir)
-      @name = File.join(@test_dir, 'foo')
+      @st_name = File.join(@test_dir, 'foo')
     end
 
     def teardown
@@ -151,13 +151,13 @@ module Higgs::Test
     end
 
     def test_open
-      DBM.open(@name) {|db|
+      DBM.open(@st_name) {|db|
         db.transaction{|tx|
           tx['foo'] = 'apple'
         }
       }
 
-      DBM.open(@name, :read_only => true) {|db|
+      DBM.open(@st_name, :read_only => true) {|db|
         db.transaction{|tx|
           assert_equal('apple', tx['foo'])
         }

data/test/test_flock.rb

@@ -9,7 +9,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_flock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_flock.rb 561 2007-09-25 15:20:20Z toki $'
 
     def setup
       @test_dir = 'flock_test'

data/test/test_index.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_index.rb 770 2008-02-13 11:26:09Z toki $'
 
     def setup
       @idx = Index.new
@@ -45,7 +45,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_index.rb 770 2008-02-13 11:26:09Z toki $'
 
     def setup
       @idx = Index.new
@@ -91,7 +91,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_index.rb 770 2008-02-13 11:26:09Z toki $'
 
     def setup
       @idx = Index.new
@@ -164,7 +164,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_index.rb 770 2008-02-13 11:26:09Z toki $'
 
     def setup
       @idx = Index.new
@@ -203,7 +203,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_index.rb 770 2008-02-13 11:26:09Z toki $'
 
     def setup
       @path = 'test.idx'

data/test/test_jlog.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_jlog.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_jlog.rb 659 2007-10-28 14:35:37Z toki $'
 
     def setup
       @path = 't.jlog'

data/test/test_lock.rb

@@ -11,7 +11,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_lock.rb 752 2008-01-23 16:46:25Z toki $'
 
     WORK_COUNT = 1000
     THREAD_COUNT = 10
@@ -306,7 +306,7 @@ module Higgs::Test
     include LockManagerTest
 
     # for ident(1)
-    CVS_ID = '$Id: test_lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_lock.rb 752 2008-01-23 16:46:25Z toki $'
 
     def setup
       @lock_manager = GiantLockManager.new
@@ -324,7 +324,7 @@ module Higgs::Test
     include LockManagerTest
 
     # for ident(1)
-    CVS_ID = '$Id: test_lock.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_lock.rb 752 2008-01-23 16:46:25Z toki $'
 
     def setup
       @lock_manager = OptimisticLockManager.new

data/test/test_online_backup.rb

@@ -31,7 +31,7 @@ module Higgs::Test
     include OnlineBackupParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_online_backup.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_online_backup.rb 657 2007-10-23 16:32:59Z toki $'
 
     def setup
       srand(0)

data/test/test_replication.rb

@@ -26,15 +26,15 @@ module Higgs::Test
     def setup
       srand(0)
 
-      @name = 'foo'
+      @st_name = 'foo'
 
       @src_dir = 'rep_src'
-      @src_name = File.join(@src_dir, @name)
+      @src_name = File.join(@src_dir, @st_name)
       FileUtils.rm_rf(@src_dir)
       FileUtils.mkdir_p(@src_dir)
 
       @dst_dir = 'rep_dst'
-      @dst_name = File.join(@dst_dir, @name)
+      @dst_name = File.join(@dst_dir, @st_name)
       FileUtils.rm_rf(@dst_dir)
       FileUtils.mkdir_p(@dst_dir)
 

data/test/test_services.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_services.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_services.rb 678 2007-11-08 16:09:51Z toki $'
 
     STORAGE_DIR = 'remote_storage'
     REMOTE_SERVICES_URI = 'druby://localhost:31415'

data/test/test_storage.rb

@@ -11,14 +11,14 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def setup
       srand(0)                  # preset for rand
       @test_dir = 'st_test'
       FileUtils.rm_rf(@test_dir) # for debug
       FileUtils.mkdir_p(@test_dir)
-      @name = File.join(@test_dir, 'foo')
+      @st_name = File.join(@test_dir, 'foo')
       @logger = proc{|path|
         logger = Logger.new(path, 1)
         logger.level = Logger::DEBUG
@@ -37,10 +37,10 @@ module Higgs::Test
     include StorageTestCase
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def new_storage
-      Storage.new(@name, :logger => @logger)
+      Storage.new(@st_name, :logger => @logger)
     end
 
     def test_raw_write_and_commit
@@ -132,7 +132,7 @@ module Higgs::Test
     def test_write_and_commit_read_only_NotWritableError
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => true, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => true, :logger => @logger)
       assert_raise(Storage::NotWritableError) {
         @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
       }
@@ -141,7 +141,7 @@ module Higgs::Test
     def test_write_and_commit_standby_NotWritableError
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => :standby, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => :standby, :logger => @logger)
       assert_raise(Storage::NotWritableError) {
         @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
       }
@@ -268,7 +268,7 @@ module Higgs::Test
       @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => true, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => true, :logger => @logger)
 
       assert_equal(true, (@st.key? 'foo'))
       assert_equal(false, (@st.key? 'bar'))
@@ -278,7 +278,7 @@ module Higgs::Test
       @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => :standby, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => :standby, :logger => @logger)
 
       assert_equal(true, (@st.key? 'foo'))
       assert_equal(false, (@st.key? 'bar'))
@@ -316,7 +316,7 @@ module Higgs::Test
                            ])
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => true, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => true, :logger => @logger)
 
       expected_keys = %w[ foo bar baz ]
       @st.each_key do |key|
@@ -332,7 +332,7 @@ module Higgs::Test
                            ])
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => :standby, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => :standby, :logger => @logger)
 
       expected_keys = %w[ foo bar baz ]
       @st.each_key do |key|
@@ -348,7 +348,7 @@ module Higgs::Test
 
     def test_verify_BrokenError_mismatch_content_hash
       @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
-      File.open(@name + '.tar', File::WRONLY) {|w|
+      File.open(@st_name + '.tar', File::WRONLY) {|w|
         size = w.stat.size
 
         data_body_offset = size - Tar::Block::BLKSIZ * 5
@@ -368,7 +368,7 @@ module Higgs::Test
 
     def test_verify_BrokenError_failed_to_read_data
       @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
-      File.open(@name + '.tar', File::WRONLY) {|w|
+      File.open(@st_name + '.tar', File::WRONLY) {|w|
         size = w.stat.size
 
         data_head_offset = size - Tar::Block::BLKSIZ * 6
@@ -391,7 +391,7 @@ module Higgs::Test
 
     def test_verify_BrokenError_failed_to_read_properties
       @st.write_and_commit([ [ :write, 'foo', "Hello world.\n" ] ])
-      File.open(@name + '.tar', File::WRONLY) {|w|
+      File.open(@st_name + '.tar', File::WRONLY) {|w|
         size = w.stat.size
 
         props_head_offset = size - Tar::Block::BLKSIZ * 4
@@ -439,7 +439,7 @@ module Higgs::Test
     def test_switch_to_write_RuntimeError_not_standby_mode_on_read_only_mode
       @st.shutdown
       @st = nil
-      @st = Storage.new(@name, :read_only => true, :logger => @logger)
+      @st = Storage.new(@st_name, :read_only => true, :logger => @logger)
 
       assert_equal(true, @st.read_only)
       assert_raise(RuntimeError) {
@@ -450,7 +450,7 @@ module Higgs::Test
 
   class StorageSwitchToWriteTest < StorageTest
     def new_storage
-      st = Storage.new(@name, :logger => @logger, :read_only => :standby)
+      st = Storage.new(@st_name, :logger => @logger, :read_only => :standby)
       assert_equal(:standby, st.read_only)
       st.switch_to_write
       assert_equal(false, st.read_only)
@@ -469,10 +469,10 @@ module Higgs::Test
     include StorageTestCase
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def new_storage
-      Storage.new(@name,
+      Storage.new(@st_name,
                   :jlog_rotate_max => 0, # unlimited rotation
                   :logger => @logger)
     end
@@ -500,8 +500,8 @@ module Higgs::Test
 
     def test_manual_recovery
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       write_data
 
@@ -514,14 +514,14 @@ module Higgs::Test
 
       @st.shutdown
 
-      for name in Storage.rotated_entries("#{@name}.jlog")
+      for name in Storage.rotated_entries("#{@st_name}.jlog")
         name =~ /\.jlog.*$/ or raise 'mismatch'
         FileUtils.cp(name, other_name + $&, :preserve => true)
       end
       Storage.recover(other_name)
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
     end
 
@@ -541,7 +541,7 @@ module Higgs::Test
 
       @st.shutdown
 
-      for name in Storage.rotated_entries("#{@name}.jlog")
+      for name in Storage.rotated_entries("#{@st_name}.jlog")
         name =~ /\.jlog.*$/ or raise 'mismatch'
         FileUtils.cp(name, other_name + $&, :preserve => true)
       end
@@ -556,14 +556,14 @@ module Higgs::Test
       @st.rotate_journal_log(true)
 
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       # write_data(10 * 10 * 256) < jlog_rotate_size(256 * 1024)
       write_data(10, 10, 256)
 
       # not closed journal log for other storage.
-      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+      FileUtils.cp("#{@st_name}.jlog", "#{other_name}.jlog", :preserve => true)
 
       @st.shutdown
 
@@ -571,10 +571,10 @@ module Higgs::Test
       st2 = Storage.new(other_name, :logger => @logger)
       st2.shutdown
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
-      assert(FileUtils.cmp("#{@name}.jlog", "#{other_name}.jlog"), 'JOURNAL LOG should be same.')
+      assert(FileUtils.cmp("#{@st_name}.jlog", "#{other_name}.jlog"), 'JOURNAL LOG should be same.')
     end
 
     def test_auto_recovery_on_standby_mode
@@ -582,14 +582,14 @@ module Higgs::Test
       @st.rotate_journal_log(true)
 
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       # write_data(10 * 10 * 256) < jlog_rotate_size(256 * 1024)
       write_data(10, 10, 256)
 
       # not closed journal log for other storage.
-      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+      FileUtils.cp("#{@st_name}.jlog", "#{other_name}.jlog", :preserve => true)
 
       @st.shutdown
 
@@ -597,10 +597,10 @@ module Higgs::Test
       st2 = Storage.new(other_name, :logger => @logger, :read_only => :standby)
       st2.shutdown
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
-      assert(FileUtils.cmp("#{@name}.jlog", "#{other_name}.jlog"), 'JOURNAL LOG should be same.')
+      assert(FileUtils.cmp("#{@st_name}.jlog", "#{other_name}.jlog"), 'JOURNAL LOG should be same.')
     end
 
     def test_auto_recovery_NotWritableError
@@ -608,14 +608,14 @@ module Higgs::Test
       @st.rotate_journal_log(true)
 
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       # write_data(10 * 10 * 256) < jlog_rotate_size(256 * 1024)
       write_data(10, 10, 256)
 
       # not closed journal log for other storage.
-      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+      FileUtils.cp("#{@st_name}.jlog", "#{other_name}.jlog", :preserve => true)
 
       @st.shutdown
 
@@ -632,14 +632,14 @@ module Higgs::Test
       @st.rotate_journal_log(true)
 
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       write_data
       @st.rotate_journal_log(true)
       write_data
 
-      FileUtils.cp("#{@name}.jlog", "#{other_name}.jlog", :preserve => true)
+      FileUtils.cp("#{@st_name}.jlog", "#{other_name}.jlog", :preserve => true)
 
       assert_raise(Storage::PanicError) {
         st2 = Storage.new(other_name, :logger => @logger)
@@ -648,8 +648,8 @@ module Higgs::Test
 
     def test_apply_journal_log
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       write_data
       @st.rotate_journal_log(true)
@@ -657,22 +657,22 @@ module Higgs::Test
 
       st2 = Storage.new(other_name, :jlog_rotate_size => 1024 * 8)
       begin
-        for path in Storage.rotated_entries("#{@name}.jlog")
+        for path in Storage.rotated_entries("#{@st_name}.jlog")
           st2.apply_journal_log(path)
         end
       ensure
         st2.shutdown
       end
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
     end
 
     def test_apply_journal_log_on_standby_mode
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       write_data
       @st.rotate_journal_log(true)
@@ -680,15 +680,15 @@ module Higgs::Test
 
       st2 = Storage.new(other_name, :jlog_rotate_size => 1024 * 8, :read_only => :standby)
       begin
-        for path in Storage.rotated_entries("#{@name}.jlog")
+        for path in Storage.rotated_entries("#{@st_name}.jlog")
           st2.apply_journal_log(path)
         end
       ensure
         st2.shutdown
       end
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
     end
 
@@ -703,7 +703,7 @@ module Higgs::Test
       assert_equal(false, st2.shutdown?)
 
       begin
-        for path in Storage.rotated_entries("#{@name}.jlog")
+        for path in Storage.rotated_entries("#{@st_name}.jlog")
           assert_raise(Storage::PanicError) {
             st2.apply_journal_log(path)
           }
@@ -720,8 +720,8 @@ module Higgs::Test
 
     def test_apply_journal_log_PanicError_lost_journal_log
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       write_data
       write_data
@@ -734,7 +734,7 @@ module Higgs::Test
       assert_equal(false, st2.shutdown?)
 
       begin
-        entries = Storage.rotated_entries("#{@name}.jlog")
+        entries = Storage.rotated_entries("#{@st_name}.jlog")
         entries.shift           # skip first journal log
         for path in entries
           assert_raise(Storage::PanicError) {
@@ -756,11 +756,11 @@ module Higgs::Test
       @st.rotate_journal_log(true)
 
       other_name = File.join(@test_dir, 'bar')
-      FileUtils.cp("#{@name}.tar", "#{other_name}.tar", :preserve => true)
-      FileUtils.cp("#{@name}.idx", "#{other_name}.idx", :preserve => true)
+      FileUtils.cp("#{@st_name}.tar", "#{other_name}.tar", :preserve => true)
+      FileUtils.cp("#{@st_name}.idx", "#{other_name}.idx", :preserve => true)
 
       other_name = File.join(@test_dir, 'bar')
-      for name in Storage.rotated_entries("#{@name}.jlog")
+      for name in Storage.rotated_entries("#{@st_name}.jlog")
         name =~ /\.jlog.*$/ or raise 'mismatch'
         FileUtils.cp(name, other_name + $&, :preserve => true)
         FileUtils.rm(name)
@@ -774,15 +774,15 @@ module Higgs::Test
       other_name = File.join(@test_dir, 'bar')
       st2 = Storage.new(other_name, :jlog_rotate_size => 1024 * 8)
       begin
-        for path in Storage.rotated_entries("#{@name}.jlog")
+        for path in Storage.rotated_entries("#{@st_name}.jlog")
           st2.apply_journal_log(path)
         end
       ensure
         st2.shutdown
       end
 
-      assert(FileUtils.cmp("#{@name}.tar", "#{other_name}.tar"), 'DATA should be same.')
-      assert(Index.new.load("#{@name}.idx").to_h ==
+      assert(FileUtils.cmp("#{@st_name}.tar", "#{other_name}.tar"), 'DATA should be same.')
+      assert(Index.new.load("#{@st_name}.idx").to_h ==
              Index.new.load("#{other_name}.idx").to_h, 'INDEX should be same.')
     end
   end
@@ -791,13 +791,13 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_storage.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage.rb 1609 2009-05-09 11:39:26Z toki $'
 
     def setup
       @test_dir = 'st_test'
       FileUtils.rm_rf(@test_dir) # for debug
       FileUtils.mkdir_p(@test_dir)
-      @name = File.join(@test_dir, 'foo')
+      @st_name = File.join(@test_dir, 'foo')
       @logger = proc{|path|
         logger = Logger.new(path, 1)
         logger.level = Logger::DEBUG
@@ -810,9 +810,21 @@ module Higgs::Test
     end
 
     def test_read_only_first_open_error
-      assert_raise(Errno::ENOENT) {
-        Storage.new(@name, :read_only => true, :logger => @logger)
-      }
+      begin
+        Storage.new(@st_name, :read_only => true, :logger => @logger)
+      rescue Errno::ENOENT
+        return
+      rescue java.io.FileNotFoundException
+        return
+      ensure
+        error = $!
+      end
+
+      if (error) then
+        flunk("unexpected error: #{error}")
+      else
+        flunk('no raise!')
+      end
     end
   end
 end

data/test/test_storage_conf.rb

@@ -7,7 +7,7 @@ require 'test/unit'
 module Higgs::Test
   class StorageConfTest < Test::Unit::TestCase
     # for ident(1)
-    CVS_ID = '$Id: test_storage_conf.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage_conf.rb 638 2007-10-14 09:43:23Z toki $'
 
     include Higgs
 

data/test/test_storage_init_opts.rb

@@ -6,7 +6,7 @@ require 'test/unit'
 module Higgs::Test
   class StorageInitOptionsTest < Test::Unit::TestCase
     # for ident(1)
-    CVS_ID = '$Id: test_storage_init_opts.rb 781 2008-07-28 15:13:27Z toki $'
+    CVS_ID = '$Id: test_storage_init_opts.rb 638 2007-10-14 09:43:23Z toki $'
 
     include Higgs::Storage::InitOptions