test/functional/ct_0_concurrence.rb in ruote-2.1.9 vs test/functional/ct_0_concurrence.rb in ruote-2.1.10

@@ -23,49 +23,36 @@
     end
 
     #noisy
 
     wfid = @engine0.launch(pdef)
-    @engine0.step 4
 
-    msgs = @storage.get_msgs
-    $stderr.puts "*cough*" if msgs.size != 2
-    #msgs.each do |m|
-    #  p [ m['action'], m['fei']['expid'], m['workitem'] ]
-    #end
+    replies = []
 
-    t0 = Thread.new { @engine1.step! }
-    t1 = Thread.new { @engine0.step! }
-    t0.join
-    t1.join
+    while replies.size < 2
 
-    #t0 = Thread.new { @engine1.step }
-    #@engine0.step
-    #t0.join
+      msg = @engine0.next_msg
 
-    msgs = @storage.get_msgs
-    msg = msgs.first
+      if msg['action'] == 'reply'
+        replies << msg
+      else
+        @engine0.do_process(msg)
+      end
+    end
 
-    if msgs.size > 1 || (msg && msg['fei'] && msg['fei']['expid'] != '0')
+    replies.sort! { |a, b| a['put_at'] <=> b['put_at'] }
 
-      msgs.each do |m|
+    t0 = Thread.new { @engine1.do_process(replies[0]) }
+    t1 = Thread.new { @engine0.do_process(replies[1]) }
+    t0.join
+    t1.join
 
-        fei = m['fei'] ?
-          Ruote::FlowExpressionId.to_storage_id(m['fei']) : ''
-        wi_fei = m['workitem'] ?
-          Ruote::FlowExpressionId.to_storage_id(m['workitem']['fei']) : ''
+    msgs = @engine0.gather_msgs
 
-        p [ m['action'], fei, wi_fei ]
-      end
-    end
+    assert_equal 1, msgs.size, 'exactly 1 message was expected'
 
-    if msg['action'] == 'error_intercepted'
-      #p @engine0.process(wfid).errors.first
-      puts @engine0.process(wfid).errors.first.message
-      puts @engine0.process(wfid).errors.first.trace
-    end
+    msg = msgs.first
 
-    assert_equal 1, msgs.size
     assert_equal 'reply', msg['action']
     assert_equal '0', msg['fei']['expid']
   end
 end