weel 1.99.118 → 1.99.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5bc42f10a93d8960c022e4b48fe7eaeee25912bb7b9245b2ed4fd20159ed89f
-  data.tar.gz: c55e8d55c288a759a10eee35dfb84d93e414c9e534c8a9c1df47b5ad03a58d3f
+  metadata.gz: e3dc94f3d9dc7b182dc017f529211878cdbffa2504d1f863220d0820b786e28b
+  data.tar.gz: 816645f85946983a86ba373e4e5e660b2688fc32c57e0f72e44a4d71a774b9b0
 SHA512:
-  metadata.gz: 4a67a6c207b00bb5e124391f41b83d6ad98d4c8de3e986c9376e1d78772e9ef157e4c642c5739b0b49daa29c108ebd903e3914a06344e12893bbad55ffedcc82
-  data.tar.gz: ef5ed955f4ce61abe1a4be7924a2faf66a9c296bb11e7cb1fcc3e5b8fce05b0246950bd8fea7f21f4c57c3ccb775928184b74c86b6cde9a4afe4d45cdc034926
+  metadata.gz: a22047ce8e533de6326a7cccbdb25a7dfabc5b137880b111ff2032cdb1d32bd45f0f3fccb421e72f4d823a8d84a6fd3ec67d81ee3e1bef0b61c755621e28bee2
+  data.tar.gz: 5ebc7c1d4a819a23ee2399be8818f80b7de71fb6753351750d3dbabe2ad122f6be6fe783f30d3d5acd00e1ff927c57f90b0c5052b8195d889420b217625cf37d

data/lib/weel.rb

@@ -86,6 +86,17 @@ class WEEL
         end
       end
     end
+    def update(d,e,s)
+      d.each do |k,v|
+        data.send(k+'=',v)
+      end if d
+      e.each do |k,v|
+        endpoints.send(k+'=',v)
+      end if e
+      if s
+        status.update(s['id'],s['message'])
+      end
+    end
     def data
       ReadHash.new(@__weel_data)
     end
@@ -139,6 +150,18 @@ class WEEL
       end
     end
 
+    def update(d,e,s)
+      d.each do |k,v|
+        data.send(k+'=',v)
+      end if d
+      e.each do |k,v|
+        endpoints.send(k+'=',v)
+      end if e
+      if s
+        status.update(s['id'],s['message'])
+      end
+    end
+
     def changed_data
       @touched_data.each do |e|
         td = Marshal.dump(@__weel_data[e]) rescue nil
@@ -146,10 +169,10 @@ class WEEL
           @changed_data << e
         end
       end
-      @changed_data
+      @changed_data.uniq
     end
     def changed_endpoints
-      @changed_endpoints
+      @changed_endpoints.uniq
     end
 
     def original_data
@@ -236,6 +259,12 @@ class WEEL
     def wait_until_nudged!
       @nudge.pop
     end
+    def to_json(*a)
+      {
+        'id' => @id,
+        'message' => @message
+      }.to_json(*a)
+    end
     attr_reader :id, :message
   end #}}}
 
@@ -354,9 +383,19 @@ class WEEL
     def callback(result=nil,options={}); end
     def mem_guard; end
 
-    def test_condition(mr,code,args={}); mr.instance_eval(code); end
+    def test_condition(dataelements,endpoints,local,additional,code,args={}); ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code); end
+    def eval_expression(dataelements,endpoints,local,additional,code); ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code); end
+    def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
+      lock.synchronize do
+        if readonly
+          ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code,where,1)
+        else
+          ManipulateStructure.new(dataelements,endpoints,local,additional).instance_eval(code,where,1)
+        end
+      end
+    end
+
     def join_branches(branches); end
-    def manipulate(mr,code,where,result=nil,options=nil); mr.instance_eval(code,where,1); end
   end  # }}}
 
   class Position # {{{
@@ -461,9 +500,13 @@ class WEEL
       @__weel_state = :ready
       @__weel_status = Status.new(0,"undefined")
       @__weel_sim = -1
+      @__weel_lock = Mutex.new
     end #}}}
     attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_connectionwrapper, :__weel_connectionwrapper_args
-    attr_reader :__weel_state, :__weel_status
+    attr_reader :__weel_state, :__weel_status, :__weel_status
+
+    # DSL-Construct for translating expressions into static parameters
+    def 🠊(code); __weel_eval_expression(code); end
 
     # DSL-Constructs for atomic calls to external services (calls) and pure context manipulations (manipulate).
     # Calls can also manipulate context (after the invoking the external services)
@@ -515,11 +558,12 @@ class WEEL
         thread[:start_event]&.continue # sometimes start event might not even exist yet (i.e. race condition)
       end
 
-      Thread.current[:branch_event].wait unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
+      Thread.current[:branch_event].wait unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:branches].length == 0
 
       __weel_sim_stop(:parallel,hw,pos) if __weel_sim
 
       cw = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+
       cw.join_branches(Thread.current[:branch_traces])
 
       unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
@@ -635,11 +679,11 @@ class WEEL
     # searchmode is active (to find the starting position)
     def alternative(condition,args={},&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
-      hw, pos = __weel_sim_start(:alternative,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => ((condition.is_a?(String) || condition.is_a?(Proc)) ? condition : nil))) if __weel_sim
+      hw, pos = __weel_sim_start(:alternative,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => (condition.is_a?(String) ? condition : nil))) if __weel_sim
       Thread.current[:mutex] ||= Mutex.new
       Thread.current[:mutex].synchronize do
         return if Thread.current[:alternative_mode][-1] == :exclusive && Thread.current[:alternative_executed][-1] == true
-        if (condition.is_a?(String) || condition.is_a?(Proc)) && !__weel_sim
+        if condition.is_a?(String) && !__weel_sim
           condition = __weel_eval_condition(condition, args)
         end
         Thread.current[:alternative_executed][-1] = true if condition
@@ -647,7 +691,7 @@ class WEEL
       searchmode = __weel_is_in_search_mode
       __weel_protect_yield(&block) if searchmode || __weel_sim || condition
       Thread.current[:alternative_executed][-1] = true if __weel_is_in_search_mode != searchmode # we swiched from searchmode true to false, thus branch has been executed which is as good as evaling the condition to true
-      __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => ((condition.is_a?(String) || condition.is_a?(Proc)) ? condition : nil))) if __weel_sim
+      __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => (condition.is_a?(String) ? condition : nil))) if __weel_sim
     end # }}}
     def otherwise(args={},&block) # {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
@@ -673,7 +717,7 @@ class WEEL
 
     # Defines a Cycle (loop/iteration)
     def loop(condition,args={},&block)# {{{
-      unless condition.is_a?(Array) && (condition[0].is_a?(Proc) || condition[0].is_a?(String)) && [:pre_test,:post_test].include?(condition[1]) && args.is_a?(Hash)
+      unless condition[0].is_a?(String) && [:pre_test,:post_test].include?(condition[1]) && args.is_a?(Hash)
         raise "condition must be called pre_test{} or post_test{}"
       end
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
@@ -690,7 +734,7 @@ class WEEL
         end
       end
       if __weel_sim
-        cond = condition[0].is_a?(Proc) ? true : condition[0]
+        cond = condition[0]
         hw, pos = __weel_sim_start(:loop,args.merge(:testing=>condition[1],:condition=>cond))
         catch :escape do
           __weel_protect_yield(&block)
@@ -781,8 +825,8 @@ class WEEL
 
     def __weel_eval_condition(condition,args={}) #{{{
       begin
-        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args unless condition.is_a?(Proc)
-        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional),condition,args)
+        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+        connectionwrapper.test_condition(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,condition,args)
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
@@ -795,6 +839,22 @@ class WEEL
       end
     end #}}}
 
+    def __weel_eval_expression(expression) #{{{
+      begin
+        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+        connectionwrapper.eval_expression(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,expression)
+      rescue NameError => err # don't look into it, or it will explode
+        # if you access $! here, BOOOM
+        self.__weel_state = :stopping
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("eval_expression: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
+        nil
+      rescue => err
+        self.__weel_state = :stopping
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new(err.message),nil)
+        nil
+      end
+    end #}}}
+
     def __weel_progress(position, uuid, skip=false) #{{{
       ipc = {}
       branch = Thread.current
@@ -855,28 +915,19 @@ class WEEL
 
         wp = __weel_progress position, connectionwrapper.activity_uuid
 
-        # searchmode position is after, jump directly to vote_sync_after
-        raise Signal::Proceed if searchmode == :after
-
         case type
           when :manipulate
             raise Signal::Stop unless connectionwrapper.vote_sync_before
             raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
-            if finalize.is_a?(Proc) || finalize.is_a?(String)
+            if finalize.is_a?(String)
               connectionwrapper.activity_manipulate_handle(parameters)
               connectionwrapper.inform_activity_manipulate
-              if finalize.is_a?(Proc)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
-                mr.instance_eval(&finalize)
-              elsif finalize.is_a?(String)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
-                connectionwrapper.manipulate(mr,finalize,'Activity ' + position.to_s)
-              end
+              struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,finalize,'Activity ' + position.to_s)
               connectionwrapper.inform_manipulate_change(
-                ((mr && mr.changed_status) ? @__weel_status : nil),
-                ((mr && mr.changed_data.any?) ? mr.changed_data.uniq : nil),
-                ((mr && mr.changed_endpoints.any?) ? mr.changed_endpoints.uniq : nil),
+                ((struct && struct.changed_status) ? @__weel_status : nil),
+                ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
+                ((struct && struct.changed_endpoints.any?) ? struct.changed_endpoints.uniq : nil),
                 @__weel_data,
                 @__weel_endpoints
               )
@@ -888,15 +939,13 @@ class WEEL
             begin
               again = catch Signal::Again do
                 connectionwrapper.mem_guard
-                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional)
-                if prepare
-                  if prepare.is_a?(Proc)
-                    rs.instance_exec(&prepare)
-                  elsif prepare.is_a?(String)
-                    connectionwrapper.manipulate(rs,prepare,'Activity ' + position.to_s)
-                  end
+                struct = if prepare
+                  connectionwrapper.manipulate(true,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,prepare,'Activity ' + position.to_s)
+                else
+                  # just the read structure, no code exec necessary
+                  ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional)
                 end
-                params = connectionwrapper.prepare(rs,endpoint,parameters)
+                params = connectionwrapper.prepare(struct,endpoint,parameters)
                 raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
                 raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
@@ -935,30 +984,19 @@ class WEEL
                   else
                     finalize
                   end
-                  if code.is_a?(Proc) || code.is_a?(String)
+                  if code.is_a?(String)
                     connectionwrapper.inform_activity_manipulate
-                    if code.is_a?(Proc)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
-                      ma = catch Signal::Again do
-                        case code.arity
-                          when 1; mr.instance_exec(connectionwrapper.activity_result_value,&code)
-                          when 2; mr.instance_exec(connectionwrapper.activity_result_value,&code)
-                          else
-                            mr.instance_exec(&code)
-                        end
-                        'yes' # ma sadly will have nil when i just throw
-                      end
-                    elsif code.is_a?(String)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
-                      ma = catch Signal::Again do
-                        connectionwrapper.manipulate(mr,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
-                        'yes' # ma sadly will have nil when i just throw
-                      end
+                    struct = nil
+
+                    # when you throw without parameters, ma contains nil, so we return Signal::Proceed to give ma a meaningful value in other cases
+                    ma = catch Signal::Again do
+                      struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
+                      Signal::Proceed
                     end
                     connectionwrapper.inform_manipulate_change(
-                      (mr.changed_status ? @__weel_status : nil),
-                      (mr.changed_data.any? ? mr.changed_data.uniq : nil),
-                      (mr.changed_endpoints.any? ? mr.changed_endpoints.uniq : nil),
+                      ((struct && struct.changed_status) ? @__weel_status : nil),
+                      ((struct && struct.changed_data.any?) ? struct.changed_data.uniq : nil),
+                      ((struct && struct.changed_endpoints.any?) ? struct.changed_endpoints.uniq : nil),
                       @__weel_data,
                       @__weel_endpoints
                     )
@@ -1166,45 +1204,6 @@ public
     @dslr.__weel_state = :abandoned
   end # }}}
 
-  # Set search positions
-  # set new_weel_search to a boolean (or anything else) to start the process from beginning (reset serach positions)
-  def search(new_weel_search=false) # {{{
-    @dslr.__weel_search_positions.clear
-
-    new_weel_search = [new_weel_search] if new_weel_search.is_a?(Position)
-
-    if !new_weel_search.is_a?(Array) || new_weel_search.empty?
-      false
-    else
-      new_weel_search.each do |search_position|
-        @dslr.__weel_search_positions[search_position.position] = search_position
-      end
-      true
-    end
-  end # }}}
-
-  def data(new_data=nil) # {{{
-    unless new_data.nil? || !new_data.is_a?(Hash)
-      new_data.each{ |k,v| @dslr.__weel_data[k] = v }
-    end
-    @dslr.__weel_data
-  end # }}}
-  def endpoints(new_endpoints=nil) # {{{
-    unless new_endpoints.nil? || !new_endpoints.is_a?(Hash)
-      new_endpoints.each{ |k,v| @dslr.__weel_endpoints[k] = v }
-    end
-    @dslr.__weel_endpoints
-  end # }}}
-  def endpoint(new_endpoints) # {{{
-    unless new_endpoints.nil? || !new_endpoints.is_a?(Hash) || !new_endpoints.length == 1
-      new_endpoints.each{ |k,v| @dslr.__weel_endpoints[k] = v }
-    end
-    nil
-  end # }}}
-  def status # {{{
-    @dslr.__weel_status
-  end # }}}
-
   # get/set workflow description
   def description(&blk)
     self.description=(blk)
@@ -1248,6 +1247,45 @@ public
     end
   end # }}}
 
+  # Set search positions
+  # set new_weel_search to a boolean (or anything else) to start the process from beginning (reset serach positions)
+  def search(new_weel_search=false) # {{{
+    @dslr.__weel_search_positions.clear
+
+    new_weel_search = [new_weel_search] if new_weel_search.is_a?(Position)
+
+    if !new_weel_search.is_a?(Array) || new_weel_search.empty?
+      false
+    else
+      new_weel_search.each do |search_position|
+        @dslr.__weel_search_positions[search_position.position] = search_position
+      end
+      true
+    end
+  end # }}}
+
+  def data(new_data=nil) # {{{
+    unless new_data.nil? || !new_data.is_a?(Hash)
+      new_data.each{ |k,v| @dslr.__weel_data[k] = v }
+    end
+    @dslr.__weel_data
+  end # }}}
+  def endpoints(new_endpoints=nil) # {{{
+    unless new_endpoints.nil? || !new_endpoints.is_a?(Hash)
+      new_endpoints.each{ |k,v| @dslr.__weel_endpoints[k] = v }
+    end
+    @dslr.__weel_endpoints
+  end # }}}
+  def endpoint(new_endpoints) # {{{
+    unless new_endpoints.nil? || !new_endpoints.is_a?(Hash) || !new_endpoints.length == 1
+      new_endpoints.each{ |k,v| @dslr.__weel_endpoints[k] = v }
+    end
+    nil
+  end # }}}
+  def status # {{{
+    @dslr.__weel_status
+  end # }}}
+
   # Stop the workflow execution
   def stop # {{{
     Thread.new do

data/test/TestConnectionWrapper.rb

@@ -18,6 +18,7 @@ class TestConnectionWrapper < WEEL::ConnectionWrapperBase
     @__myhandler_position = position
     @__myhandler_continue = continue
     @__myhandler_returnValue = nil
+    @__myhandler_passthrough = nil
     @t = nil
   end
 
@@ -32,6 +33,10 @@ class TestConnectionWrapper < WEEL::ConnectionWrapperBase
     $long_track << "CALL #{@__myhandler_position}: passthrough=[#{passthrough}], endpoint=[#{@__myhandler_endpoint}], parameters=[#{parameters.inspect}]\n"
     $short_track << "C#{@__myhandler_position}"
 
+    if parameters[:async]
+      @__myhandler_passthrough = true
+    end
+
     if @__myhandler_endpoint == 'stop it'
       raise WEEL::Signal::Stop
     end
@@ -76,7 +81,7 @@ class TestConnectionWrapper < WEEL::ConnectionWrapperBase
   # information about how to continue the call. This passthrough-value is given
   # to activity_handle if the workflow is configured to do so.
   def activity_passthrough_value #{{{
-    nil
+    @__myhandler_passthrough
   end #}}}
 
   # Called if the execution of the actual activity_handle is not necessary anymore

data/test/basic/tc_wf_control.rb

@@ -18,10 +18,10 @@ class TestWorkflowControl < Test::Unit::TestCase
     assert(@wf.data[:x] == "begin_Handler_Dummy_Result_end", "Ending environment not correct, see result=#{@wf.data[:x].inspect}")
   end
 
-  def test_stop
+  def test_stop_async
     @wf.description do
       call :a_test_1_1, :endpoint1
-      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
+      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 }, :async => true }
       call :a_test_1_3, :endpoint1
     end
     @wf.search WEEL::Position.new(:a_test_1_1, :at)
@@ -38,6 +38,27 @@ class TestWorkflowControl < Test::Unit::TestCase
     assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
     assert(@wf.positions[0].detail == :at, "Stop-Position is not :at")
   end
+
+  def test_stop
+    @wf.description do
+      call :a_test_1_1, :endpoint1
+      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
+      call :a_test_1_3, :endpoint1
+    end
+    @wf.search WEEL::Position.new(:a_test_1_1, :at)
+    wf = @wf.start
+    sleep(0.2)
+    @wf.stop.join
+    wf.join
+    wf_assert("DONE a_test_1_1")
+    wf_assert("STOPPED a_test_1_2")
+    wf_assert("DONE a_test_1_2",true)
+    wf_assert("CALL a_test_1_2:")
+    assert(@wf.state == :stopped, "Stopped workflow has wrong state, #{@wf.state} instead of :stopped")
+    assert(@wf.positions.is_a?(Array), "@wf.positions has wrong type, should be an array, it is: #{@wf.positions.inspect}")
+    assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
+    assert(@wf.positions[0].detail == :after, "Stop-Position is not :at")
+  end
   # def test_continue
   #   @wf.description do
   #     call :a_test_1_1, :endpoint1

data/weel.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.118"
+  s.version          = "1.99.121"
   s.platform         = Gem::Platform::RUBY
-  s.license          = "LGPL-3.0"
+  s.license          = "LGPL-3.0-or-later"
   s.summary          = "Workflow Execution Engine Library (WEEL)"
 
   s.description      = "see http://cpee.org"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.118
+  version: 1.99.121
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -58,7 +58,6 @@ files:
 - test/basic/tc_search.rb
 - test/basic/tc_state.rb
 - test/basic/tc_wf_control.rb
-- test/basic/tc_wf_stop.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
 - test/complex/tc_parallel_stop.rb
 - test/complexsearch/tc_search.rb
@@ -66,7 +65,6 @@ files:
 - test/exec/tc_exec.rb
 - test/speed/tc_speed1.rb
 - test/speed/tc_speed2.rb
-- test/test
 - test/wfp_adv_branching/tc_generalizedjoin.rb
 - test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
 - test/wfp_adv_branching/tc_localsynchronizingmerge.rb
@@ -85,7 +83,7 @@ files:
 - weel.gemspec
 homepage: http://cpee.org/
 licenses:
-- LGPL-3.0
+- LGPL-3.0-or-later
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -102,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)
@@ -113,7 +111,6 @@ test_files:
 - test/TestConnectionWrapper.rb
 - test/TestMixin.rb
 - test/TestWorkflow.rb
-- test/test
 - test/basic/tc_choose.rb
 - test/basic/tc_codereplace.rb
 - test/basic/tc_data.rb
@@ -123,7 +120,6 @@ test_files:
 - test/basic/tc_search.rb
 - test/basic/tc_state.rb
 - test/basic/tc_wf_control.rb
-- test/basic/tc_wf_stop.rb
 - test/complex/tc_generalsynchonizingmerge_loopsearch.rb
 - test/complex/tc_parallel_stop.rb
 - test/complexsearch/tc_search.rb

data/test/basic/tc_wf_stop.rb

@@ -1,34 +0,0 @@
-require 'test/unit'
-require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
-
-class TestWorkflowControl < Test::Unit::TestCase
-  include TestMixin
-
-  def test_stop
-    @wf.description do
-      call :a_test_1_1, :endpoint1
-      call :a_test_1_2, :endpoint1, parameters: { :call => Proc.new{ sleep 0.5 } }
-      call :a_test_1_3, :endpoint1
-    end
-    @wf.search WEEL::Position.new(:a_test_1_1, :at)
-    wf = @wf.start
-    sleep(0.2)
-    @wf.stop.join
-    wf.join
-    wf_assert("DONE a_test_1_1")
-    wf_assert("STOPPED a_test_1_2")
-    wf_assert("DONE a_test_1_2")
-    wf_assert("CALL a_test_1_2:")
-    assert(@wf.state == :stopped, "Stopped workflow has wrong state, #{@wf.state} instead of :stopped")
-    assert(@wf.positions.is_a?(Array), "@wf.positions has wrong type, should be an array, it is: #{@wf.positions.inspect}")
-    assert(@wf.positions[0].position == :a_test_1_2, "Stop-position has wrong value: #{@wf.positions[0].position} instead of :a_test_2_1")
-    assert(@wf.positions[0].detail == :after, "Stop-Position is not :at")
-  end
-
-  def test_stops
-    1.upto 1000 do |i|
-      puts '.'
-      test_stop
-    end
-  end
-end

data/test/test

@@ -1,39 +0,0 @@
-ruby basic/tc_choose.rb
-ruby basic/tc_codereplace.rb
-ruby basic/tc_data.rb
-ruby basic/tc_endpoint.rb
-ruby basic/tc_handler.rb
-ruby basic/tc_parallel.rb
-ruby basic/tc_search.rb
-ruby basic/tc_state.rb
-ruby basic/tc_wf_control.rb
-ruby complexsearch/tc_search.rb
-ruby complex/tc_generalsynchonizingmerge_loopsearch.rb
-ruby complex/tc_parallel_stop.rb
-ruby exec/tc_again.rb
-ruby exec/tc_exec.rb
-ruby simulation/dl.rb
-ruby simulation/tt_permutationtester.rb
-ruby simulation/tt_sim_activity.rb
-ruby simulation/tt_sim_choose1.rb
-ruby simulation/tt_sim_choose2.rb
-ruby simulation/tt_sim_loop_parallel_choose.rb
-ruby simulation/tt_sim_loop_parallel.rb
-ruby simulation/tt_sim_loop.rb
-ruby speed/tc_speed1.rb
-ruby speed/tc_speed2.rb
-ruby wfp_adv_branching/tc_generalizedjoin.rb
-ruby wfp_adv_branching/tc_generalsynchronizingmerge.rb
-ruby wfp_adv_branching/tc_localsynchronizingmerge.rb
-ruby wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-ruby wfp_adv_branching/tc_multimerge.rb
-ruby wfp_adv_branching/tc_structured_discriminator.rb
-ruby wfp_adv_branching/tc_structured_partial_join.rb
-ruby wfp_adv_branching/tc_threadmerge.rb
-ruby wfp_adv_branching/tc_threadsplit.rb
-ruby wfp_basic/tc_exclusivechoice_simplemerge.rb
-ruby wfp_basic/tc_parallelsplit_synchronization.rb
-ruby wfp_basic/tc_sequence.rb
-ruby wfp_iteration/tc_structuredloop.rb
-ruby wfp_state_based/tc_deferredchoice.rb
-ruby wfp_state_based/tc_interleavedparallelrouting.rb