ruote 2.1.10 → 2.1.11

data/test/unit/storage.rb

@@ -8,24 +8,33 @@
 require File.join(File.dirname(__FILE__), %w[ .. test_helper.rb ])
 
 require_json
-require_patron
+#require_patron
 
 require File.join(File.dirname(__FILE__), %w[ .. functional storage_helper.rb ])
 
+#
+# note : using the 'errors' type, but this test is about generic storage, not
+#        about errors per se.
+#
 
 class UtStorage < Test::Unit::TestCase
 
   def setup
+
     @s = determine_storage({})
-    @s.add_type('dogfood')
+
+    #@s.add_type('errors')
+
     @s.put(
       '_id' => 'toto',
-      'type' => 'dogfood',
+      'type' => 'errors',
       'message' => 'testing')
   end
   def teardown
 
-    @s.get_many('dogfood').each { |d| @s.delete(d) }
+    @s.get_many('errors').each do |d|
+      @s.delete(d)
+    end
   end
 
   def test_get_configuration
@@ -35,24 +44,25 @@ class UtStorage < Test::Unit::TestCase
 
   def test_get
 
-    h = @s.get('dogfood', 'toto')
+    h = @s.get('errors', 'toto')
 
     assert_not_nil h['_rev']
 
-    h = @s.get('dogfood', 'nada')
+    h = @s.get('errors', 'nada')
 
     assert_nil h
   end
 
   def test_put
 
-    doc =  { '_id' => 'nada', 'type' => 'dogfood', 'message' => 'testing (2)' }
+    doc =  {
+      '_id' => 'test_put', 'type' => 'errors', 'message' => 'testing (2)' }
 
     @s.put(doc)
 
     assert_nil doc['_rev']
 
-    h = @s.get('dogfood', 'nada')
+    h = @s.get('errors', 'test_put')
 
     assert_not_nil h['_rev']
     assert_not_nil h['put_at']
@@ -60,7 +70,7 @@ class UtStorage < Test::Unit::TestCase
 
   def test_put_fail
 
-    r = @s.put('_id' => 'toto', 'type' => 'dogfood', 'message' => 'more')
+    r = @s.put('_id' => 'toto', 'type' => 'errors', 'message' => 'more')
 
     assert_equal 'toto', r['_id']
     assert_not_nil r['_rev']
@@ -68,7 +78,7 @@ class UtStorage < Test::Unit::TestCase
 
   def test_put_update_rev
 
-    doc = { '_id' => 'ouinouin', 'type' => 'dogfood', 'message' => 'more' }
+    doc = { '_id' => 'tpur', 'type' => 'errors', 'message' => 'more' }
 
     r = @s.put(doc, :update_rev => true)
 
@@ -77,15 +87,15 @@ class UtStorage < Test::Unit::TestCase
 
   def test_put_put_and_put
 
-    doc = { '_id' => 'whiskas', 'type' => 'dogfood', 'message' => 'miam' }
+    doc = { '_id' => 'whiskas', 'type' => 'errors', 'message' => 'miam' }
 
     r = @s.put(doc)
-    doc = @s.get('dogfood', 'whiskas')
+    doc = @s.get('errors', 'whiskas')
 
     r = @s.put(doc)
     assert_nil r
 
-    doc = @s.get('dogfood', 'whiskas')
+    doc = @s.get('errors', 'whiskas')
 
     assert_not_nil doc['put_at']
 
@@ -95,12 +105,12 @@ class UtStorage < Test::Unit::TestCase
 
   def test_put_update_rev_twice
 
-    doc = { '_id' => 'ouinouin', 'type' => 'dogfood', 'message' => 'more' }
+    doc = { '_id' => 'tpurt', 'type' => 'errors', 'message' => 'more' }
 
     r = @s.put(doc, :update_rev => true)
     assert_nil r
 
-    doc = { '_id' => 'ouinouin', 'type' => 'dogfood', 'message' => 'more' }
+    doc = { '_id' => 'tpurt', 'type' => 'errors', 'message' => 'more' }
 
     r = @s.put(doc, :update_rev => true)
     assert_not_nil r
@@ -108,6 +118,8 @@ class UtStorage < Test::Unit::TestCase
 
   def test_delete_fail
 
+    # missing _rev
+
     assert_raise(ArgumentError) do
       @s.delete('_id' => 'toto')
     end
@@ -115,7 +127,7 @@ class UtStorage < Test::Unit::TestCase
 
   def test_delete
 
-    doc = @s.get('dogfood', 'toto')
+    doc = @s.get('errors', 'toto')
 
     r = @s.delete(doc)
 
@@ -124,18 +136,18 @@ class UtStorage < Test::Unit::TestCase
 
   def test_delete_missing
 
-    r = @s.delete('_id' => 'x', '_rev' => '12-13231123132', 'type' => 'dogfood')
+    r = @s.delete('_id' => 'x', '_rev' => '12-13231123132', 'type' => 'errors')
 
     assert_equal true, r
   end
 
   def test_keys_should_be_string
 
-    doc = { '_id' => 'h0', 'type' => 'dogfood', :m0 => :z, :m1 => [ :a, :b ] }
+    doc = { '_id' => 'h0', 'type' => 'errors', :m0 => :z, :m1 => [ :a, :b ] }
 
     @s.put(doc)
 
-    doc = @s.get('dogfood', 'h0')
+    doc = @s.get('errors', 'h0')
 
     assert_equal 'z', doc['m0']
     assert_equal %w[ a b ], doc['m1']
@@ -145,7 +157,7 @@ class UtStorage < Test::Unit::TestCase
   #
   def test_put_gone
 
-    h = @s.get('dogfood', 'toto')
+    h = @s.get('errors', 'toto')
 
     assert_nil @s.delete(h)
 
@@ -156,31 +168,92 @@ class UtStorage < Test::Unit::TestCase
 
   def test_purge_type
 
-    @s.purge_type!('dogfood')
+    @s.purge_type!('errors')
 
-    assert_equal 0, @s.get_many('dogfood').size
+    assert_equal 0, @s.get_many('errors').size
   end
 
+  def test_clear
+
+    @s.clear
+
+    assert_equal 0, @s.get_many('errors').size
+  end
+
+  #def test_purge
+  #  @s.purge!
+  #  assert_equal 0, @s.get_many('errors').size
+  #end
+
   def test_ids
 
-    @s.put('_id' => 'ouinouin', 'type' => 'dogfood', 'message' => 'testing')
-    @s.put('_id' => 'nada', 'type' => 'dogfood', 'message' => 'testing')
-    @s.put('_id' => 'estereo', 'type' => 'dogfood', 'message' => 'testing')
+    @s.put('_id' => 't_ids0', 'type' => 'errors', 'message' => 'testing')
+    @s.put('_id' => 't_ids1', 'type' => 'errors', 'message' => 'testing')
+    @s.put('_id' => 't_ids2', 'type' => 'errors', 'message' => 'testing')
 
-    assert_equal %w[ estereo nada ouinouin toto ], @s.ids('dogfood').sort
+    assert_equal %w[ t_ids0 t_ids1 t_ids2 toto ], @s.ids('errors').sort
   end
 
   def test_get_many
 
     30.times do |i|
-      @s.put('_id' => "xx!#{i}", 'type' => 'dogfood', 'msg' => "whatever #{i}")
+      @s.put(
+        '_id' => "xx!#{i}",
+        'type' => 'errors',
+        'wfid' => i.to_s,
+        'msg' => "whatever #{i}")
     end
 
-    assert_equal 31, @s.get_many('dogfood').size
-    assert_equal 10, @s.get_many('dogfood', nil, :limit => 10).size
-    assert_equal 1, @s.get_many('dogfood', /!7$/).size
-    assert_equal 30, @s.get_many('dogfood', /^xx!/).size
-    assert_equal 30, @s.get_many('dogfood', /x/).size
+    assert_equal 31, @s.get_many('errors').size
+    assert_equal 1, @s.get_many('errors', '7').size
+    assert_equal 1, @s.get_many('errors', /!7$/).size
+    assert_equal 30, @s.get_many('errors', /^xx!/).size
+    assert_equal 30, @s.get_many('errors', /x/).size
+    assert_equal 10, @s.get_many('errors', nil, :limit => 10).size
+  end
+
+  def test_get_many_options
+
+    30.times do |i|
+      @s.put(
+        '_id' => sprintf("yy!%0.2d", i),
+        'type' => 'errors',
+        'msg' => "whatever #{i}")
+    end
+
+    # limit
+
+    assert_equal 10, @s.get_many('errors', nil, :limit => 10).size
+
+    # count
+
+    assert_equal 31, @s.get_many('errors', nil, :count => true)
+
+    # skip and limit
+
+    assert_equal(
+      %w[ toto yy!00 yy!01 yy!02 ],
+      @s.get_many(
+        'errors', nil, :skip => 0, :limit => 4
+      ).collect { |d| d['_id'] })
+    assert_equal(
+      %w[ yy!02 yy!03 yy!04 ],
+      @s.get_many(
+        'errors', nil, :skip => 3, :limit => 3
+      ).collect { |d| d['_id'] })
+
+    # skip, limit and reverse
+
+    assert_equal(
+      %w[ yy!29 yy!28 yy!27 ],
+      @s.get_many(
+        'errors', nil, :skip => 0, :limit => 3, :descending => true
+      ).collect { |d| d['_id'] })
+    assert_equal(
+      %w[ yy!29 yy!28 yy!27 ],
+      @s.get_many(
+        'errors', nil, :skip => 0, :limit => 3, :descending => true
+      ).collect { |d| d['_id'] })
   end
 end
 

data/test/unit/ut_0_ruby_parser.rb

@@ -7,7 +7,8 @@
 
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-require 'ruote/parser/ruby_dsl'
+require 'ruote/parser'
+#require 'ruote/parser/ruby_dsl'
 
 
 class UtRubyParserTest < Test::Unit::TestCase
@@ -123,5 +124,34 @@ class UtRubyParserTest < Test::Unit::TestCase
       [ 'sequence', {}, [ [ 'alpha', {}, [] ], [ 'bravo', {}, [] ] ] ],
       Ruote.to_tree { sequence { alpha; bravo } })
   end
+
+  def test_raise
+
+    #assert_raise Nada do
+      Ruote::Parser.parse %{ Ruote.define { alpha } }
+    #end
+
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { abort } }
+    end
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { exit } }
+    end
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { exit! } }
+    end
+
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { x = Kernel } }
+    end
+
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { module Nada; end } }
+    end
+
+    assert_raise ArgumentError do
+      Ruote::Parser.parse %{ Ruote.define { File.read('stuff') } }
+    end
+  end
 end
 

data/test/unit/ut_16_parser.rb

@@ -139,5 +139,25 @@ end
 
     FileUtils.rm(fn)
   end
+
+  # Make sure that ruby method names like 'freeze' or 'clone' can be used
+  # in process definitions.
+  #
+  def test_ruby_blank_slate
+
+    t = Ruote::Parser.parse(%{
+      Ruote.define do
+        freeze
+        clone
+        untrust
+      end
+    })
+
+    assert_equal(
+      [ 'define', {}, [
+        [ 'freeze', {}, [] ], [ 'clone', {}, [] ], [ 'untrust', {}, [] ]
+      ] ],
+      t)
+  end
 end
 

data/test/unit/ut_19_part_template.rb

@@ -8,19 +8,29 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
 require_json
+require 'ruote/context'
 require 'ruote/part/template'
+require 'ruote/storage/hash_storage'
 
 
 class UtPartTemplateTest < Test::Unit::TestCase
 
   class MyParticipant
     include ::Ruote::TemplateMixin
+
+    def initialize
+
+      @context = ::Ruote::Context.new(::Ruote::HashStorage.new)
+    end
   end
 
   DEFAULT = %{
 workitem for gonzalo
 
-{"wfid":"20100304-bidehachina","expid":"0_0_1"}
+{
+  "wfid": "20100304-bidehachina",
+  "expid": "0_0_1"
+}
 
  - 'car'  ==>  "BMW"
  - 'model'  ==>  "BMW 328 Mille Miglia"

data/test/unit/ut_20_composite_storage.rb

@@ -20,7 +20,7 @@ class UtCompositeStorageTest < Test::Unit::TestCase
 
     cs = Ruote::CompositeStorage.new(default, 'msgs' => msgs)
 
-    cs.put('action' => 'terminate', 'type' => 'msgs', 'id' => 'xxx')
+    cs.put('action' => 'terminate', 'type' => 'msgs', '_id' => 'xxx')
     cs.put_msg('terminate', 'type' => 'msgs')
     cs.put_schedule('at', {}, Time.now + 10, 'action' => 'reply')
 

data/test/unit/ut_4_expmap.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-require 'ruote/exp/expression_map'
+require 'ruote/svc/expression_map'
 
 
 class UtExpMapTest < Test::Unit::TestCase

data/test/unit/ut_6_condition.rb

@@ -7,8 +7,8 @@
 
 require File.join(File.dirname(__FILE__), '..', 'test_helper.rb')
 
-require 'ruote/exp/expression_map'
-require 'ruote/util/treechecker'
+require 'ruote/svc/treechecker'
+require 'ruote/svc/expression_map'
 
 
 class ConditionTest < Test::Unit::TestCase