higgs 0.1.2 → 0.1.3

data/test/test_thread.rb

@@ -27,7 +27,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def test_start_wait
       latch = Latch.new
@@ -61,7 +61,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def test_count_down_wait
       latch = CountDownLatch.new(3)
@@ -103,7 +103,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def test_wait
       barrier = Barrier.new(COUNT_OF_THREADS)
@@ -147,7 +147,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def calc
       @s = 0                    # @s's scope is over multi-threading
@@ -221,7 +221,7 @@ module Higgs::Test
     end
 
     def test_no_work_block
-      assert_raise(RuntimeError) { SharedWork.new }
+      assert_raise(ArgumentError) { SharedWork.new }
     end
 
     def test_set_result
@@ -268,7 +268,7 @@ module Higgs::Test
     include ThreadParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def setup
       @rw_lock = ReadWriteLock.new
@@ -452,7 +452,7 @@ module Higgs::Test
     include ThreadParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     class Counter
       def initialize

data/test/test_tman.rb

@@ -1,9 +1,11 @@
 #!/usr/local/bin/ruby
 
+require 'digest'
 require 'fileutils'
 require 'higgs/storage'
 require 'higgs/thread'
 require 'higgs/tman'
+require 'logger'
 require 'test/unit'
 
 module Higgs::Test
@@ -11,14 +13,19 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 599 2007-10-01 15:54:00Z toki $'
+    CVS_ID = '$Id: test_tman.rb 663 2007-11-04 14:17:45Z 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 = Storage.new(@name)
+      @logger = proc{|path|
+        logger = Logger.new(path, 1)
+        logger.level = Logger::DEBUG
+        logger
+      }
+      @st = Storage.new(@name, :logger => @logger)
       @tman = TransactionManager.new(@st)
     end
 
@@ -419,6 +426,9 @@ module Higgs::Test
         tx[:foo] = 'apple'
         tx.set_property(:foo, 'bar', 'banana')
 
+        assert_equal(nil, tx.property(:foo, :identity))
+        assert_equal(nil, tx.property(:foo, :data_change_number))
+        assert_equal(nil, tx.property(:foo, :properties_change_number))
         assert_equal(nil, tx.property(:foo, :created_time))
         assert_equal(nil, tx.property(:foo, :changed_time))
         assert_equal(nil, tx.property(:foo, :modified_time))
@@ -428,6 +438,9 @@ module Higgs::Test
         assert_equal(nil, tx.property(:foo, 'baz'))
 
         tx.commit
+        assert_equal('foo', tx.property(:foo, :identity))
+        assert_equal(1, tx.property(:foo, :data_change_number))
+        assert_equal(1, tx.property(:foo, :properties_change_number))
         assert_instance_of(Time, tx.property(:foo, :created_time))
         assert_instance_of(Time, tx.property(:foo, :changed_time))
         assert_instance_of(Time, tx.property(:foo, :modified_time))
@@ -435,23 +448,36 @@ module Higgs::Test
         assert_equal(Digest::MD5.hexdigest('apple'), tx.property(:foo, :hash_value))
         assert_equal('banana', tx.property(:foo, 'bar'))
 
-        assert_equal(nil, tx.property(:bar, :created_time))
-        assert_equal(nil, tx.property(:bar, :changed_time))
-        assert_equal(nil, tx.property(:bar, :modified_time))
-        assert_equal(nil, tx.property(:bar, :hash_type))
-        assert_equal(nil, tx.property(:bar, :hash_value))
-        assert_equal(nil, tx.property(:bar, 'baz'))
+        assert_nil(tx.property(:bar, :identity))
+        assert_nil(tx.property(:bar, :data_change_number))
+        assert_nil(tx.property(:bar, :properties_change_number))
+        assert_nil(tx.property(:bar, :created_time))
+        assert_nil(tx.property(:bar, :changed_time))
+        assert_nil(tx.property(:bar, :modified_time))
+        assert_nil(tx.property(:bar, :hash_type))
+        assert_nil(tx.property(:bar, :hash_value))
+        assert_nil(tx.property(:bar, 'baz'))
       }
 
+      assert_equal('foo', @st.identity(:foo))
+      assert_equal(1, @st.data_change_number(:foo))
+      assert_equal(1, @st.properties_change_number(:foo))
       assert_instance_of(Time, @st.fetch_properties(:foo)['system_properties']['created_time'])
       assert_instance_of(Time, @st.fetch_properties(:foo)['system_properties']['changed_time'])
       assert_instance_of(Time, @st.fetch_properties(:foo)['system_properties']['modified_time'])
       assert_equal('MD5', @st.fetch_properties(:foo)['system_properties']['hash_type'])
       assert_equal(Digest::MD5.hexdigest('apple'), @st.fetch_properties(:foo)['system_properties']['hash_value'])
       assert_equal('banana', @st.fetch_properties(:foo)['custom_properties']['bar'])
+
+      assert_nil(@st.identity(:bar))
+      assert_nil(@st.data_change_number(:bar))
+      assert_nil(@st.properties_change_number(:bar))
       assert_nil(@st.fetch_properties(:bar))
 
       @tman.transaction{|tx|
+        assert_equal('foo', tx.property(:foo, :identity))
+        assert_equal(1, tx.property(:foo, :data_change_number))
+        assert_equal(1, tx.property(:foo, :properties_change_number))
         assert_instance_of(Time, tx.property(:foo, :created_time))
         assert_instance_of(Time, tx.property(:foo, :changed_time))
         assert_instance_of(Time, tx.property(:foo, :modified_time))
@@ -459,12 +485,71 @@ module Higgs::Test
         assert_equal(Digest::MD5.hexdigest('apple'), tx.property(:foo, :hash_value))
         assert_equal('banana', tx.property(:foo, 'bar'))
 
-        assert_equal(nil, tx.property(:bar, :created_time))
-        assert_equal(nil, tx.property(:bar, :changed_time))
-        assert_equal(nil, tx.property(:bar, :modified_time))
-        assert_equal(nil, tx.property(:bar, :hash_type))
-        assert_equal(nil, tx.property(:bar, :hash_value))
-        assert_equal(nil, tx.property(:bar, 'baz'))
+        assert_nil(tx.property(:bar, :identity))
+        assert_nil(tx.property(:bar, :data_change_number))
+        assert_nil(tx.property(:bar, :properties_change_number))
+        assert_nil(tx.property(:bar, :created_time))
+        assert_nil(tx.property(:bar, :changed_time))
+        assert_nil(tx.property(:bar, :modified_time))
+        assert_nil(tx.property(:bar, :hash_type))
+        assert_nil(tx.property(:bar, :hash_value))
+        assert_nil(tx.property(:bar, 'baz'))
+      }
+
+      @tman.transaction{|tx|
+        tx.delete(:foo)
+        assert_equal(nil, tx.property(:foo, :identity))
+        assert_equal(nil, tx.property(:foo, :data_change_number))
+        assert_equal(nil, tx.property(:foo, :properties_change_number))
+        assert_equal(nil, tx.property(:foo, :created_time))
+        assert_equal(nil, tx.property(:foo, :changed_time))
+        assert_equal(nil, tx.property(:foo, :modified_time))
+        assert_equal(nil, tx.property(:foo, :hash_type))
+        assert_equal(nil, tx.property(:foo, :hash_value))
+        assert_equal(nil, tx.property(:foo, 'bar'))
+
+        tx.commit
+        assert_equal(nil, tx.property(:foo, :identity))
+        assert_equal(nil, tx.property(:foo, :data_change_number))
+        assert_equal(nil, tx.property(:foo, :properties_change_number))
+        assert_equal(nil, tx.property(:foo, :created_time))
+        assert_equal(nil, tx.property(:foo, :changed_time))
+        assert_equal(nil, tx.property(:foo, :modified_time))
+        assert_equal(nil, tx.property(:foo, :hash_type))
+        assert_equal(nil, tx.property(:foo, :hash_value))
+        assert_equal(nil, tx.property(:foo, 'bar'))
+
+        assert_nil(tx.property(:bar, :identity))
+        assert_nil(tx.property(:bar, :data_change_number))
+        assert_nil(tx.property(:bar, :properties_change_number))
+        assert_nil(tx.property(:bar, :created_time))
+        assert_nil(tx.property(:bar, :changed_time))
+        assert_nil(tx.property(:bar, :modified_time))
+        assert_nil(tx.property(:bar, :hash_type))
+        assert_nil(tx.property(:bar, :hash_value))
+        assert_nil(tx.property(:bar, 'baz'))
+      }
+
+      @tman.transaction{|tx|
+        assert_equal(nil, tx.property(:foo, :identity))
+        assert_equal(nil, tx.property(:foo, :data_change_number))
+        assert_equal(nil, tx.property(:foo, :properties_change_number))
+        assert_equal(nil, tx.property(:foo, :created_time))
+        assert_equal(nil, tx.property(:foo, :changed_time))
+        assert_equal(nil, tx.property(:foo, :modified_time))
+        assert_equal(nil, tx.property(:foo, :hash_type))
+        assert_equal(nil, tx.property(:foo, :hash_value))
+        assert_equal(nil, tx.property(:foo, 'bar'))
+
+        assert_nil(tx.property(:bar, :identity))
+        assert_nil(tx.property(:bar, :data_change_number))
+        assert_nil(tx.property(:bar, :properties_change_number))
+        assert_nil(tx.property(:bar, :created_time))
+        assert_nil(tx.property(:bar, :changed_time))
+        assert_nil(tx.property(:bar, :modified_time))
+        assert_nil(tx.property(:bar, :hash_type))
+        assert_nil(tx.property(:bar, :hash_value))
+        assert_nil(tx.property(:bar, 'baz'))
       }
     end
 
@@ -507,6 +592,11 @@ module Higgs::Test
         tx[:foo] = 'apple'
         tx.commit
 
+        assert_equal('foo', tx.property(:foo, :identity))
+        assert_equal(1, tx.property(:foo, :data_change_number))
+        assert_equal(1, tx.property(:foo, :properties_change_number))
+        assert_equal(false, tx.property(:foo, :string_only))
+
         cre_time = tx.property(:foo, :created_time)
         chg_time = tx.property(:foo, :changed_time)
         mod_time = tx.property(:foo, :modified_time)
@@ -515,6 +605,11 @@ module Higgs::Test
         tx[:foo] = 'banana'
         tx.commit
 
+        assert_equal('foo', tx.property(:foo, :identity))
+        assert_equal(2, tx.property(:foo, :data_change_number))
+        assert_equal(2, tx.property(:foo, :properties_change_number))
+        assert_equal(false, tx.property(:foo, :string_only))
+
         assert_equal(cre_time, tx.property(:foo, :created_time))
         assert_equal(chg_time, tx.property(:foo, :changed_time))
         assert(tx.property(:foo, :modified_time) > mod_time)
@@ -524,6 +619,11 @@ module Higgs::Test
         tx.set_property(:foo, 'bar', 'orange')
         tx.commit
 
+        assert_equal('foo', tx.property(:foo, :identity))
+        assert_equal(2, tx.property(:foo, :data_change_number))
+        assert_equal(3, tx.property(:foo, :properties_change_number))
+        assert_equal(false, tx.property(:foo, :string_only))
+
         assert_equal(cre_time, tx.property(:foo, :created_time))
         assert(tx.property(:foo, :changed_time) > chg_time)
         assert_equal(mod_time2, tx.property(:foo, :modified_time))
@@ -562,6 +662,10 @@ module Higgs::Test
         tx[:foo] = 'apple'
         tx.set_property(:foo, 'bar', 'banana')
 
+        assert_equal(false, (tx.property? :foo, :identity))
+        assert_equal(false, (tx.property? :foo, :data_change_number))
+        assert_equal(false, (tx.property? :foo, :properties_change_number))
+        assert_equal(false, (tx.property? :foo, :string_only))
         assert_equal(false, (tx.property? :foo, :created_time))
         assert_equal(false, (tx.property? :foo, :changed_time))
         assert_equal(false, (tx.property? :foo, :modified_time))
@@ -571,6 +675,10 @@ module Higgs::Test
         assert_equal(false, (tx.property? :foo, 'baz'))
 
         tx.commit
+        assert_equal(true, (tx.property? :foo, :identity))
+        assert_equal(true, (tx.property? :foo, :data_change_number))
+        assert_equal(true, (tx.property? :foo, :properties_change_number))
+        assert_equal(true, (tx.property? :foo, :string_only))
         assert_equal(true, (tx.property? :foo, :created_time))
         assert_equal(true, (tx.property? :foo, :changed_time))
         assert_equal(true, (tx.property? :foo, :modified_time))
@@ -579,6 +687,10 @@ module Higgs::Test
         assert_equal(true, (tx.property? :foo, 'bar'))
         assert_equal(false, (tx.property? :foo, 'baz'))
 
+        assert_equal(false, (tx.property? :bar, :identity))
+        assert_equal(false, (tx.property? :bar, :data_change_number))
+        assert_equal(false, (tx.property? :bar, :properties_change_number))
+        assert_equal(false, (tx.property? :bar, :string_only))
         assert_equal(false, (tx.property? :bar, :created_time))
         assert_equal(false, (tx.property? :bar, :changed_time))
         assert_equal(false, (tx.property? :bar, :modified_time))
@@ -588,6 +700,10 @@ module Higgs::Test
       }
 
       @tman.transaction{|tx|
+        assert_equal(true, (tx.property? :foo, :identity))
+        assert_equal(true, (tx.property? :foo, :data_change_number))
+        assert_equal(true, (tx.property? :foo, :properties_change_number))
+        assert_equal(true, (tx.property? :foo, :string_only))
         assert_equal(true, (tx.property? :foo, :created_time))
         assert_equal(true, (tx.property? :foo, :changed_time))
         assert_equal(true, (tx.property? :foo, :modified_time))
@@ -596,6 +712,71 @@ module Higgs::Test
         assert_equal(true, (tx.property? :foo, 'bar'))
         assert_equal(false, (tx.property? :foo, 'baz'))
 
+        assert_equal(false, (tx.property? :bar, :identity))
+        assert_equal(false, (tx.property? :bar, :data_change_number))
+        assert_equal(false, (tx.property? :bar, :properties_change_number))
+        assert_equal(false, (tx.property? :bar, :string_only))
+        assert_equal(false, (tx.property? :bar, :created_time))
+        assert_equal(false, (tx.property? :bar, :changed_time))
+        assert_equal(false, (tx.property? :bar, :modified_time))
+        assert_equal(false, (tx.property? :bar, :hash_type))
+        assert_equal(false, (tx.property? :bar, :hash_value))
+        assert_equal(false, (tx.property? :bar, 'baz'))
+      }
+
+      @tman.transaction{|tx|
+        tx.delete(:foo)
+        assert_equal(false, (tx.property? :foo, :identity))
+        assert_equal(false, (tx.property? :foo, :data_change_number))
+        assert_equal(false, (tx.property? :foo, :properties_change_number))
+        assert_equal(false, (tx.property? :foo, :string_only))
+        assert_equal(false, (tx.property? :foo, :created_time))
+        assert_equal(false, (tx.property? :foo, :changed_time))
+        assert_equal(false, (tx.property? :foo, :modified_time))
+        assert_equal(false, (tx.property? :foo, :hash_type))
+        assert_equal(false, (tx.property? :foo, :hash_value))
+        assert_equal(false, (tx.property? :foo, 'bar'))
+
+        tx.commit
+        assert_equal(false, (tx.property? :foo, :identity))
+        assert_equal(false, (tx.property? :foo, :data_change_number))
+        assert_equal(false, (tx.property? :foo, :properties_change_number))
+        assert_equal(false, (tx.property? :foo, :string_only))
+        assert_equal(false, (tx.property? :foo, :created_time))
+        assert_equal(false, (tx.property? :foo, :changed_time))
+        assert_equal(false, (tx.property? :foo, :modified_time))
+        assert_equal(false, (tx.property? :foo, :hash_type))
+        assert_equal(false, (tx.property? :foo, :hash_value))
+        assert_equal(false, (tx.property? :foo, 'bar'))
+
+        assert_equal(false, (tx.property? :bar, :identity))
+        assert_equal(false, (tx.property? :bar, :data_change_number))
+        assert_equal(false, (tx.property? :bar, :properties_change_number))
+        assert_equal(false, (tx.property? :bar, :string_only))
+        assert_equal(false, (tx.property? :bar, :created_time))
+        assert_equal(false, (tx.property? :bar, :changed_time))
+        assert_equal(false, (tx.property? :bar, :modified_time))
+        assert_equal(false, (tx.property? :bar, :hash_type))
+        assert_equal(false, (tx.property? :bar, :hash_value))
+        assert_equal(false, (tx.property? :bar, 'baz'))
+      }
+
+      @tman.transaction{|tx|
+        assert_equal(false, (tx.property? :foo, :identity))
+        assert_equal(false, (tx.property? :foo, :data_change_number))
+        assert_equal(false, (tx.property? :foo, :properties_change_number))
+        assert_equal(false, (tx.property? :foo, :string_only))
+        assert_equal(false, (tx.property? :foo, :created_time))
+        assert_equal(false, (tx.property? :foo, :changed_time))
+        assert_equal(false, (tx.property? :foo, :modified_time))
+        assert_equal(false, (tx.property? :foo, :hash_type))
+        assert_equal(false, (tx.property? :foo, :hash_value))
+        assert_equal(false, (tx.property? :foo, 'bar'))
+
+        assert_equal(false, (tx.property? :bar, :identity))
+        assert_equal(false, (tx.property? :bar, :data_change_number))
+        assert_equal(false, (tx.property? :bar, :properties_change_number))
+        assert_equal(false, (tx.property? :bar, :string_only))
         assert_equal(false, (tx.property? :bar, :created_time))
         assert_equal(false, (tx.property? :bar, :changed_time))
         assert_equal(false, (tx.property? :bar, :modified_time))
@@ -664,6 +845,9 @@ module Higgs::Test
 
       @tman.transaction{|tx|
         assert_alist = [
+          [ :identity,      proc{|n, v| assert_instance_of(String, v, "name: #{n}") } ],
+          [ :data_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
+          [ :properties_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
           [ :created_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :changed_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :modified_time, proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
@@ -737,6 +921,9 @@ module Higgs::Test
         assert_equal(true, (tx.property? :foo, 'bar'))
 
         assert_alist = [
+          [ :identity,      proc{|n, v| assert_instance_of(String, v, "name: #{n}") } ],
+          [ :data_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
+          [ :properties_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
           [ :created_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :changed_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :modified_time, proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
@@ -795,6 +982,9 @@ module Higgs::Test
         assert_equal(true, (tx.property? :foo, 'bar'))
 
         assert_alist = [
+          [ :identity,      proc{|n, v| assert_instance_of(String, v, "name: #{n}") } ],
+          [ :data_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
+          [ :properties_change_number, proc{|n, v| assert((v.kind_of? Integer), "name: #{n}") } ],
           [ :created_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :changed_time,  proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
           [ :modified_time, proc{|n, v| assert_instance_of(Time, v, "name: #{n}") } ],
@@ -914,7 +1104,7 @@ module Higgs::Test
 
   class TransactionManagerTest_with_SecondaryCache < TransactionManagerTest
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 599 2007-10-01 15:54:00Z toki $'
+    CVS_ID = '$Id: test_tman.rb 663 2007-11-04 14:17:45Z toki $'
 
     def setup
       super