rbbt-util 5.5.68 → 5.6.0

data/test/rbbt/test_persist.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'rbbt/persist'
+require 'rbbt/annotations'
 require 'rbbt/util/tmpfile'
 require 'test/unit'
 
@@ -11,231 +12,6 @@ end
 
 class TestPersist < Test::Unit::TestCase
 
-  def test_annotation_persist
-    TmpFile.with_file do |tmp|
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-
-      TestAnnotation.setup(entity1, :test_annotation => "1")
-      TestAnnotation.setup(entity2, :test_annotation => "2")
-
-      annotations = [entity1, entity2]
-
-      persisted_annotations = Persist.persist("Test", :annotations, :file => tmp) do
-        annotations
-      end
-
-      assert_equal "Entity 1", persisted_annotations.first
-      assert_equal "Entity 2", persisted_annotations.last
-      assert_equal "1", persisted_annotations.first.test_annotation
-      assert_equal "2", persisted_annotations.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :file => tmp) do
-        annotations
-      end
-
-      assert_equal "Entity 1", persisted_annotations.sort.first
-      assert_equal "Entity 2", persisted_annotations.sort.last
-      assert_equal "1", persisted_annotations.sort.first.test_annotation
-      assert_equal "2", persisted_annotations.sort.last.test_annotation
-    end
-  end
-
-  def test_annotation_persist_with_repeitions
-    TmpFile.with_file do |tmp|
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-      entity2bis = "Entity 2"
-
-      TestAnnotation.setup(entity1, :test_annotation => "1")
-      TestAnnotation.setup(entity2, :test_annotation => "2")
-      TestAnnotation.setup(entity2bis, :test_annotation => "2")
-
-      annotations = [entity1, entity2, entity2bis]
-
-      persisted_annotations = Persist.persist("Test", :annotations, :file => tmp) do
-        annotations
-      end
-
-      assert_equal 3, persisted_annotations.length
-
-      assert_equal "Entity 1", persisted_annotations.first
-      assert_equal "Entity 2", persisted_annotations.last
-      assert_equal "1", persisted_annotations.first.test_annotation
-      assert_equal "2", persisted_annotations.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :file => tmp) do
-        annotations
-      end
-
-      assert_equal 3, persisted_annotations.length
-
-      assert_equal "Entity 1", persisted_annotations.sort.first
-      assert_equal "Entity 2", persisted_annotations.sort.last
-      assert_equal "1", persisted_annotations.sort.first.test_annotation
-      assert_equal "2", persisted_annotations.sort.last.test_annotation
-    end
-  end
-
-
-  def test_bdb
-    TmpFile.with_file do |tmp|
-      repo = Persist.open_tokyocabinet(tmp, true, :double, TokyoCabinet::BDB)
-      repo["test:string1"] = [["STR1"]]
-      repo["test:string2"] = [["STR2"]]
-      repo["other_test:string3"] = [["STR2"]]
-
-      assert_equal ["test:string1", "test:string2"].sort, repo.range("test:" << 0.chr, false, "test:" << 255.chr, false).sort
-      assert_equal ["other_test:string3"].sort, repo.range("other_test:" << 0.chr, false, "other_test:" << 255.chr, false).sort
-    end
-  end
-
-  def test_annotation_persist_repo
-    TmpFile.with_file do |tmp|
-      repo = Persist.open_tokyocabinet(tmp, true, :list, TokyoCabinet::BDB)
-
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-
-      TestAnnotation.setup(entity1, :test_annotation => "1")
-      TestAnnotation.setup(entity2, :test_annotation => "2")
-
-      annotations = [entity1, entity2]
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      assert_equal "Entity 1", persisted_annotations.first
-      assert_equal "Entity 2", persisted_annotations.last
-      assert_equal "1", persisted_annotations.first.test_annotation
-      assert_equal "2", persisted_annotations.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      assert_equal "Entity 1", persisted_annotations.sort.first
-      assert_equal "Entity 2", persisted_annotations.sort.last
-      assert_equal "1", persisted_annotations.sort.first.test_annotation
-      assert_equal "2", persisted_annotations.sort.last.test_annotation
-    end
-  end
-
-  def test_annotation_persist_repo_annotated_array
-    TmpFile.with_file do |tmp|
-      repo = Persist.open_tokyocabinet(tmp, true, :list, TokyoCabinet::BDB)
-
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-
-      annotations = [entity1, entity2]
-      TestAnnotation.setup(annotations, :test_annotation => "1")
-      annotations.extend AnnotatedArray
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      assert_equal "Entity 1", persisted_annotations.first
-      assert_equal "Entity 2", persisted_annotations.last
-      assert_equal "1", persisted_annotations.first.test_annotation
-      assert_equal "1", persisted_annotations.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      persisted_annotations.extend AnnotatedArray
-
-      assert_equal "Entity 1", persisted_annotations.sort.first
-      assert_equal "Entity 2", persisted_annotations.sort.last
-      assert_equal "1", persisted_annotations.sort.first.test_annotation
-      assert_equal "1", persisted_annotations.sort.last.test_annotation
-    end
-  end
-
-
-  def test_annotation_persist_repo_triple_array
-    TmpFile.with_file do |tmp|
-      repo = Persist.open_tokyocabinet(tmp, true, :list, TokyoCabinet::BDB)
-
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-
-      annotations = [entity1, entity2]
-      TestAnnotation.setup(annotations, :test_annotation => "1")
-      annotations.extend AnnotatedArray
-
-      annotations_ary = [annotations]
-      TestAnnotation.setup(annotations_ary, :test_annotation => "1")
-      annotations_ary.extend AnnotatedArray
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations_ary
-      end
-      assert AnnotatedArray === persisted_annotations
-      ddd persisted_annotations.info
-      ddd persisted_annotations
-
-      assert_equal "Entity 1", persisted_annotations.first.first
-      assert_equal "Entity 2", persisted_annotations.first.last
-      assert_equal "1", persisted_annotations.first.first.test_annotation
-      assert_equal "1", persisted_annotations.first.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations_ary
-      end
-
-      assert AnnotatedArray === persisted_annotations
-
-      assert_equal "Entity 1", persisted_annotations.sort.first.first
-      assert_equal "Entity 2", persisted_annotations.sort.first.last
-      assert_equal "1", persisted_annotations.sort.first.first.test_annotation
-      assert_equal "1", persisted_annotations.sort.first.last.test_annotation
-
-    end
-  end
-
-  def test_annotation_persist_repo_with_repetitions
-    TmpFile.with_file do |tmp|
-      repo = Persist.open_tokyocabinet(tmp, true, :list, TokyoCabinet::BDB)
-
-      entity1 = "Entity 1"
-      entity2 = "Entity 2"
-      entity2bis = "Entity 2"
-
-      TestAnnotation.setup(entity1, :test_annotation => "1")
-      TestAnnotation.setup(entity2, :test_annotation => "2")
-      TestAnnotation.setup(entity2bis, :test_annotation => "2")
-
-      annotations = [entity1, entity2, entity2bis]
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      assert_equal 3, persisted_annotations.length
-
-      assert_equal "Entity 1", persisted_annotations.first
-      assert_equal "Entity 2", persisted_annotations.last
-      assert_equal "1", persisted_annotations.first.test_annotation
-      assert_equal "2", persisted_annotations.last.test_annotation
-
-      persisted_annotations = Persist.persist("Test", :annotations, :annotation_repo => repo) do
-        annotations
-      end
-
-      assert_equal 3, persisted_annotations.length
-
-      assert_equal "Entity 1", persisted_annotations.sort.first
-      assert_equal "Entity 2", persisted_annotations.sort.last
-      assert_equal "1", persisted_annotations.sort.first.test_annotation
-      assert_equal "2", persisted_annotations.sort.last.test_annotation
-    end
-  end
-
-
   def test_array_persist
     TmpFile.with_file do |tmp|
       10.times do

data/test/rbbt/test_workflow.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'rbbt/workflow'
-require 'rbbt/workflow/soap'
 require 'rbbt/util/tmpfile'
 require 'test/unit'
 

data/test/rbbt/workflow/test_step.rb

@@ -6,7 +6,7 @@ require 'rbbt'
 
 class TestStep < Test::Unit::TestCase
 
-  def _test_step
+  def test_step
     task  = Task.setup do "TEST" end
     task2  = Task.setup do raise "Persistence ignored" end
     TmpFile.with_file do |tmp|
@@ -18,7 +18,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_dependency
+  def test_dependency
     str = "TEST"
     str2 = "TEST2"
     TmpFile.with_file do |tmpfile|
@@ -47,7 +47,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_dependency_log_relay
+  def test_dependency_log_relay
     str = "TEST"
     TmpFile.with_file do |tmpfile|
       task1  = Task.setup :result_type => nil, :name => :task1 do 
@@ -66,7 +66,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_log_relay_step
+  def test_log_relay_step
     str = "TEST"
     TmpFile.with_file do |tmpfile|
       task1  = Task.setup :result_type => nil, :name => :task1 do 
@@ -88,7 +88,7 @@ class TestStep < Test::Unit::TestCase
   end
 
 
-  def _test_exec
+  def test_exec
     TmpFile.with_file do |lock|
       task  = Task.setup do "TEST" end
       TmpFile.with_file do |tmp|
@@ -99,7 +99,7 @@ class TestStep < Test::Unit::TestCase
   end
 
 
-  def _test_fork
+  def test_fork
     TmpFile.with_file do |lock|
       task  = Task.setup do while not File.exists?(lock) do sleep 1; end; "TEST" end
       TmpFile.with_file do |tmp|
@@ -115,7 +115,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_abort
+  def test_abort
     TmpFile.with_file do |lock|
       task  = Task.setup do while not File.exists?(lock) do sleep 1; end; "TEST" end
       TmpFile.with_file do |tmp|
@@ -132,7 +132,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_files
+  def test_files
     TmpFile.with_file do |lock|
       task  = Task.setup do 
         Open.write(file("test"),"TEST")
@@ -146,15 +146,17 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_messages
+  def test_messages
     TmpFile.with_file do |lock|
       task  = Task.setup do 
         message "WRITE"
         Open.write(file("test"),"TEST")
       end
+      
       TmpFile.with_file do |tmp|
         step = Step.new tmp, task
-        job = step.fork
+        job = step
+        step.run
         while not job.done? do sleep 1 end
         assert_equal "TEST", Open.read(job.file("test"))
         assert_equal "WRITE", job.messages.last
@@ -162,7 +164,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_subdir
+  def test_subdir
     TmpFile.with_file do |lock|
       task  = Task.setup do 
         message "WRITE"
@@ -179,7 +181,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def _test_semaphore
+  def test_semaphore
     TmpFile.with_file do |semaphore|
       begin
         semaphore = "/" << semaphore.gsub('/','_')

data/test/test_helper.rb

@@ -8,10 +8,12 @@ require 'rubygems'
 require 'rbbt'
 require 'rbbt/resource/path'
 
+
 class Test::Unit::TestCase
   include FileUtils
 
   def setup
+    Random.new
     if defined? Persist
       Persist.cachedir = Rbbt.tmp.test.persistence.find :user
     end
@@ -20,8 +22,8 @@ class Test::Unit::TestCase
   def teardown
     if defined? Persist
       FileUtils.rm_rf Path.setup("", 'rbbt').tmp.test.find :user
-      Persist::TC_CONNECTIONS.values.each do |c| c.close end
-      Persist::TC_CONNECTIONS.clear
+      Persist::CONNECTIONS.values.each do |c| c.close end
+      Persist::CONNECTIONS.clear
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.68
+  version: 5.6.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,6 +160,11 @@ files:
 - lib/rbbt/knowledge_base.rb
 - lib/rbbt/persist.rb
 - lib/rbbt/persist/tsv.rb
+- lib/rbbt/persist/tsv/cdb.rb
+- lib/rbbt/persist/tsv/kyotocabinet.rb
+- lib/rbbt/persist/tsv/leveldb.rb
+- lib/rbbt/persist/tsv/lmdb.rb
+- lib/rbbt/persist/tsv/tokyocabinet.rb
 - lib/rbbt/resource.rb
 - lib/rbbt/resource/path.rb
 - lib/rbbt/resource/rake.rb
@@ -225,6 +230,7 @@ files:
 - share/rbbt_commands/tsv/change_id
 - share/rbbt_commands/tsv/get
 - share/rbbt_commands/tsv/info
+- share/rbbt_commands/tsv/json
 - share/rbbt_commands/workflow/cmd
 - share/rbbt_commands/workflow/install
 - share/rbbt_commands/workflow/monitor
@@ -236,6 +242,12 @@ files:
 - share/unicorn.rb
 - test/rbbt/association/test_index.rb
 - test/rbbt/association/test_item.rb
+- test/rbbt/persist/test_tsv.rb
+- test/rbbt/persist/tsv/test_cdb.rb
+- test/rbbt/persist/tsv/test_kyotocabinet.rb
+- test/rbbt/persist/tsv/test_leveldb.rb
+- test/rbbt/persist/tsv/test_lmdb.rb
+- test/rbbt/persist/tsv/test_tokyocabinet.rb
 - test/rbbt/resource/test_path.rb
 - test/rbbt/test_annotations.rb
 - test/rbbt/test_association.rb
@@ -264,7 +276,6 @@ files:
 - test/rbbt/util/test_simpleDSL.rb
 - test/rbbt/util/test_simpleopt.rb
 - test/rbbt/util/test_tmpfile.rb
-- test/rbbt/workflow/test_soap.rb
 - test/rbbt/workflow/test_step.rb
 - test/rbbt/workflow/test_task.rb
 - test/test_helper.rb
@@ -313,11 +324,16 @@ test_files:
 - test/rbbt/association/test_index.rb
 - test/rbbt/association/test_item.rb
 - test/rbbt/test_tsv.rb
-- test/rbbt/workflow/test_soap.rb
 - test/rbbt/workflow/test_task.rb
 - test/rbbt/workflow/test_step.rb
 - test/rbbt/test_persist.rb
 - test/rbbt/test_annotations.rb
+- test/rbbt/persist/test_tsv.rb
+- test/rbbt/persist/tsv/test_lmdb.rb
+- test/rbbt/persist/tsv/test_kyotocabinet.rb
+- test/rbbt/persist/tsv/test_cdb.rb
+- test/rbbt/persist/tsv/test_tokyocabinet.rb
+- test/rbbt/persist/tsv/test_leveldb.rb
 - test/rbbt/tsv/test_index.rb
 - test/rbbt/tsv/test_change_id.rb
 - test/rbbt/tsv/test_util.rb