ruote 0.9.18 → 0.9.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (323) hide show
  1. data/README.txt +2 -0
  2. data/examples/about_state.rb +29 -29
  3. data/examples/bigflow.rb +9 -9
  4. data/examples/csv_weather.rb +4 -4
  5. data/examples/engine_template.rb +141 -129
  6. data/examples/flowtracing.rb +8 -8
  7. data/examples/homeworkreview.rb +15 -15
  8. data/examples/kotoba.rb +9 -9
  9. data/examples/mano_tracker.rb +63 -63
  10. data/examples/openwferu.rb +22 -20
  11. data/examples/quotereporter.rb +79 -79
  12. data/lib/openwfe/contextual.rb +72 -72
  13. data/lib/openwfe/def.rb +21 -21
  14. data/lib/openwfe/engine.rb +19 -19
  15. data/lib/openwfe/engine/engine.rb +578 -614
  16. data/lib/openwfe/engine/expool_methods.rb +144 -115
  17. data/lib/openwfe/engine/file_persisted_engine.rb +77 -77
  18. data/lib/openwfe/engine/participant_methods.rb +96 -96
  19. data/lib/openwfe/engine/status_methods.rb +271 -247
  20. data/lib/openwfe/engine/update_exp_methods.rb +69 -69
  21. data/lib/openwfe/exceptions.rb +25 -25
  22. data/lib/openwfe/expool/errorjournal.rb +334 -348
  23. data/lib/openwfe/expool/expool_pause_methods.rb +98 -0
  24. data/lib/openwfe/expool/expressionpool.rb +793 -800
  25. data/lib/openwfe/expool/expstorage.rb +284 -313
  26. data/lib/openwfe/expool/history.rb +193 -105
  27. data/lib/openwfe/expool/journal.rb +163 -163
  28. data/lib/openwfe/expool/journal_replay.rb +228 -228
  29. data/lib/openwfe/expool/parser.rb +178 -142
  30. data/lib/openwfe/{orest/exception.rb → expool/paused_error.rb} +49 -32
  31. data/lib/openwfe/expool/representation.rb +59 -59
  32. data/lib/openwfe/expool/threadedexpstorage.rb +137 -134
  33. data/lib/openwfe/expool/wfidgen.rb +289 -287
  34. data/lib/openwfe/expool/yamlexpstorage.rb +154 -154
  35. data/lib/openwfe/expressions/condition.rb +175 -168
  36. data/lib/openwfe/expressions/environment.rb +165 -165
  37. data/lib/openwfe/expressions/expressionmap.rb +135 -131
  38. data/lib/openwfe/expressions/fe_cancel.rb +68 -68
  39. data/lib/openwfe/expressions/fe_command.rb +190 -190
  40. data/lib/openwfe/expressions/fe_concurrence.rb +531 -531
  41. data/lib/openwfe/expressions/fe_cron.rb +152 -197
  42. data/lib/openwfe/expressions/fe_cursor.rb +152 -186
  43. data/lib/openwfe/expressions/fe_define.rb +118 -118
  44. data/lib/openwfe/expressions/fe_do.rb +109 -109
  45. data/lib/openwfe/expressions/fe_equals.rb +219 -219
  46. data/lib/openwfe/expressions/fe_filter.rb +98 -98
  47. data/lib/openwfe/expressions/fe_filter_definition.rb +122 -122
  48. data/lib/openwfe/expressions/fe_fqv.rb +203 -203
  49. data/lib/openwfe/expressions/fe_http.rb +212 -0
  50. data/lib/openwfe/expressions/fe_if.rb +214 -214
  51. data/lib/openwfe/expressions/fe_iterator.rb +91 -91
  52. data/lib/openwfe/expressions/fe_listen.rb +268 -268
  53. data/lib/openwfe/expressions/fe_losfor.rb +73 -73
  54. data/lib/openwfe/expressions/fe_misc.rb +343 -351
  55. data/lib/openwfe/expressions/fe_participant.rb +206 -206
  56. data/lib/openwfe/expressions/fe_reserve.rb +153 -142
  57. data/lib/openwfe/expressions/fe_save.rb +226 -226
  58. data/lib/openwfe/expressions/fe_sequence.rb +66 -56
  59. data/lib/openwfe/expressions/fe_set.rb +80 -80
  60. data/lib/openwfe/expressions/fe_sleep.rb +132 -125
  61. data/lib/openwfe/expressions/fe_step.rb +113 -111
  62. data/lib/openwfe/expressions/fe_subprocess.rb +139 -136
  63. data/lib/openwfe/expressions/fe_timeout.rb +74 -78
  64. data/lib/openwfe/expressions/fe_wait.rb +48 -49
  65. data/lib/openwfe/expressions/fe_when.rb +106 -106
  66. data/lib/openwfe/expressions/filter.rb +60 -60
  67. data/lib/openwfe/expressions/flowexpression.rb +618 -612
  68. data/lib/openwfe/expressions/iterator.rb +158 -158
  69. data/lib/openwfe/expressions/merge.rb +53 -53
  70. data/lib/openwfe/expressions/raw.rb +396 -397
  71. data/lib/openwfe/expressions/rprocdef.rb +261 -266
  72. data/lib/openwfe/expressions/time.rb +238 -243
  73. data/lib/openwfe/expressions/timeout.rb +135 -135
  74. data/lib/openwfe/expressions/value.rb +55 -55
  75. data/lib/openwfe/extras/engine/db_persisted_engine.rb +94 -0
  76. data/lib/openwfe/extras/expool/dberrorjournal.rb +189 -0
  77. data/lib/openwfe/extras/expool/dbexpstorage.rb +355 -0
  78. data/lib/openwfe/extras/expool/dbhistory.rb +135 -0
  79. data/lib/openwfe/extras/listeners/sqslisteners.rb +146 -0
  80. data/lib/openwfe/extras/misc/activityfeed.rb +264 -0
  81. data/lib/openwfe/extras/misc/basecamp.rb +485 -0
  82. data/lib/openwfe/extras/participants/activeparticipants.rb +749 -0
  83. data/lib/openwfe/extras/participants/atomfeed_participants.rb +173 -0
  84. data/lib/openwfe/extras/participants/atompub_participants.rb +267 -0
  85. data/lib/openwfe/extras/participants/basecamp_participants.rb +87 -0
  86. data/lib/openwfe/extras/participants/csvparticipants.rb +127 -0
  87. data/lib/openwfe/extras/participants/sqsparticipants.rb +125 -0
  88. data/lib/openwfe/extras/participants/twitterparticipants.rb +176 -0
  89. data/lib/openwfe/filterdef.rb +191 -191
  90. data/lib/openwfe/flowexpressionid.rb +271 -269
  91. data/lib/openwfe/listeners/listener.rb +61 -61
  92. data/lib/openwfe/listeners/listeners.rb +81 -81
  93. data/lib/openwfe/listeners/socketlisteners.rb +189 -189
  94. data/lib/openwfe/logging.rb +74 -74
  95. data/lib/openwfe/omixins.rb +55 -54
  96. data/lib/openwfe/orest/definitions.rb +90 -90
  97. data/lib/openwfe/orest/osocket.rb +91 -91
  98. data/lib/openwfe/orest/xmlcodec.rb +471 -459
  99. data/lib/openwfe/participants.rb +19 -19
  100. data/lib/openwfe/participants/enoparticipants.rb +187 -187
  101. data/lib/openwfe/participants/participant.rb +100 -100
  102. data/lib/openwfe/participants/participantmap.rb +170 -170
  103. data/lib/openwfe/participants/participants.rb +316 -316
  104. data/lib/openwfe/participants/soapparticipants.rb +90 -90
  105. data/lib/openwfe/participants/socketparticipants.rb +143 -143
  106. data/lib/openwfe/participants/storeparticipants.rb +198 -198
  107. data/lib/openwfe/rexml.rb +44 -0
  108. data/lib/openwfe/rudefinitions.rb +87 -91
  109. data/lib/openwfe/service.rb +65 -65
  110. data/lib/openwfe/storage/yamlcustom.rb +71 -71
  111. data/lib/openwfe/storage/yamlfilestorage.rb +190 -190
  112. data/lib/openwfe/tools/flowtracer.rb +41 -45
  113. data/lib/openwfe/util/dollar.rb +125 -139
  114. data/lib/openwfe/util/irb.rb +42 -42
  115. data/lib/openwfe/util/observable.rb +93 -99
  116. data/lib/openwfe/util/ometa.rb +36 -36
  117. data/lib/openwfe/util/treechecker.rb +122 -0
  118. data/lib/openwfe/util/workqueue.rb +73 -73
  119. data/lib/openwfe/util/xml.rb +285 -279
  120. data/lib/openwfe/utils.rb +415 -442
  121. data/lib/openwfe/version.rb +1 -1
  122. data/lib/openwfe/workitem.rb +444 -437
  123. data/lib/openwfe/worklist/oldrest.rb +161 -161
  124. data/lib/openwfe/worklist/storelocks.rb +218 -218
  125. data/lib/openwfe/worklist/storeparticipant.rb +19 -19
  126. data/lib/openwfe/worklist/worklist.rb +223 -223
  127. data/test/back_0916_test.rb +57 -59
  128. data/test/bm/bm_1_xml_vs_prog.rb +25 -22
  129. data/test/bm/bm_2_step.rb +81 -81
  130. data/test/bm/ft_0f_5ms.rb +13 -13
  131. data/test/bm/ft_26_load.rb +177 -179
  132. data/test/bm/ft_26b_load.rb +57 -59
  133. data/test/bm/ft_26c_load.rb +70 -65
  134. data/test/bm/ft_recu.rb +51 -51
  135. data/test/clone_test.rb +145 -99
  136. data/test/concurrence_test.rb +41 -41
  137. data/test/condition_test.rb +104 -90
  138. data/test/description_test.rb +46 -45
  139. data/test/eno_test.rb +36 -36
  140. data/test/expmap_test.rb +26 -26
  141. data/test/extras/README.txt +5 -0
  142. data/test/extras/active_connection.rb +48 -0
  143. data/test/extras/active_with_engine_test.rb +140 -0
  144. data/test/extras/activityfeed_test.rb +85 -0
  145. data/test/extras/ap_0_test.rb +287 -0
  146. data/test/extras/ap_1_test.rb +53 -0
  147. data/test/extras/ap_test_base.rb +24 -0
  148. data/test/extras/atomfeedp_test.rb +113 -0
  149. data/test/extras/atompubp_test.rb +91 -0
  150. data/test/extras/basecamp_test.rb +53 -0
  151. data/test/extras/db_errorjournal_utest.rb +75 -0
  152. data/test/extras/db_expstorage_utest.rb +171 -0
  153. data/test/extras/db_history_0_test.rb +58 -0
  154. data/test/extras/ft_19_csv.rb +58 -0
  155. data/test/extras/ft_71_b14008.rb +85 -0
  156. data/test/extras/sqs_test.rb +57 -0
  157. data/test/extras/twitter_test.rb +62 -0
  158. data/test/fe_lookup_att_test.rb +41 -41
  159. data/test/fei_test.rb +131 -131
  160. data/test/file_persisted_engine_test.rb +30 -30
  161. data/test/file_persistence_test.rb +112 -111
  162. data/test/filep_cancel_test.rb +58 -58
  163. data/test/filter_test.rb +67 -67
  164. data/test/flowtestbase.rb +207 -219
  165. data/test/ft_0.rb +35 -35
  166. data/test/ft_0b_sequence.rb +15 -15
  167. data/test/ft_0c_testname.rb +12 -12
  168. data/test/ft_0d_participant.rb +9 -9
  169. data/test/ft_0e_multibody.rb +11 -11
  170. data/test/ft_10_loop.rb +103 -104
  171. data/test/ft_11_ppd.rb +285 -289
  172. data/test/ft_11b_ppd.rb +26 -26
  173. data/test/ft_12_blockparticipant.rb +57 -57
  174. data/test/ft_13_eno.rb +31 -31
  175. data/test/ft_14_subprocess.rb +45 -45
  176. data/test/ft_14b_subprocess.rb +107 -107
  177. data/test/ft_14c_subprocess.rb +33 -33
  178. data/test/ft_15_iterator.rb +127 -127
  179. data/test/ft_15b_iterator.rb +41 -41
  180. data/test/ft_16_fqv.rb +44 -44
  181. data/test/ft_17_condition.rb +48 -48
  182. data/test/ft_18_pname.rb +26 -26
  183. data/test/ft_1_unset.rb +140 -140
  184. data/test/ft_1b_unset.rb +17 -17
  185. data/test/ft_20_cron.rb +33 -33
  186. data/test/ft_21_cron.rb +51 -51
  187. data/test/ft_21b_cron_pause.rb +41 -41
  188. data/test/ft_22_history.rb +45 -41
  189. data/test/ft_23_when.rb +51 -51
  190. data/test/ft_23b_when.rb +43 -43
  191. data/test/ft_23c_wait.rb +48 -48
  192. data/test/ft_23d_cww.rb +28 -28
  193. data/test/ft_24_def.rb +15 -15
  194. data/test/ft_25_cancel.rb +57 -54
  195. data/test/ft_27_getflowpos.rb +79 -83
  196. data/test/ft_28_fileparticipant.rb +25 -25
  197. data/test/ft_29_httprb.rb +57 -57
  198. data/test/ft_2_concurrence.rb +99 -97
  199. data/test/ft_2b_concurrence.rb +132 -132
  200. data/test/ft_2c_concurrence.rb +37 -37
  201. data/test/ft_30_socketlistener.rb +133 -133
  202. data/test/ft_31_flowname.rb +15 -16
  203. data/test/ft_32_journal.rb +48 -48
  204. data/test/ft_32c_journal.rb +54 -54
  205. data/test/ft_32d_journal.rb +43 -46
  206. data/test/ft_33_description.rb +62 -62
  207. data/test/ft_34_cancelwfid.rb +37 -37
  208. data/test/ft_35_localdefs.rb +36 -34
  209. data/test/ft_36_subprocids.rb +61 -61
  210. data/test/ft_37_pnames.rb +33 -33
  211. data/test/ft_38_tag.rb +82 -82
  212. data/test/ft_38b_tag.rb +97 -97
  213. data/test/ft_38c_tag.rb +50 -50
  214. data/test/ft_38d_tag.rb +53 -0
  215. data/test/ft_39_reserve.rb +33 -33
  216. data/test/ft_39b_reserve.rb +59 -59
  217. data/test/ft_3_equals.rb +131 -131
  218. data/test/ft_3b_lookup_vf.rb +43 -43
  219. data/test/ft_40_defined.rb +33 -33
  220. data/test/ft_41_case.rb +80 -80
  221. data/test/ft_42_environments.rb +48 -48
  222. data/test/ft_43_pat10.rb +51 -51
  223. data/test/ft_44_save.rb +37 -37
  224. data/test/ft_44b_restore.rb +151 -151
  225. data/test/ft_45_citerator.rb +149 -149
  226. data/test/ft_45b_citerator.rb +77 -0
  227. data/test/ft_46_pparams.rb +27 -27
  228. data/test/ft_47_filter.rb +100 -100
  229. data/test/ft_48_fe_filter.rb +41 -41
  230. data/test/ft_49_condition.rb +101 -94
  231. data/test/ft_4_misc.rb +185 -190
  232. data/test/ft_50_xml_attribute.rb +101 -104
  233. data/test/ft_51_stack.rb +30 -30
  234. data/test/ft_52_obs_participant.rb +73 -73
  235. data/test/ft_53_null_noop_participant.rb +31 -31
  236. data/test/ft_54_listen.rb +183 -183
  237. data/test/ft_54b_listen.rb +32 -32
  238. data/test/ft_54c_listen.rb +60 -60
  239. data/test/ft_55_ptimeout.rb +29 -30
  240. data/test/ft_56_timeout.rb +29 -29
  241. data/test/ft_57_a.rb +105 -102
  242. data/test/ft_58_ejournal.rb +83 -80
  243. data/test/ft_58b_ejournal.rb +82 -0
  244. data/test/ft_59_ps.rb +148 -86
  245. data/test/ft_5_time.rb +77 -77
  246. data/test/ft_60_ecancel.rb +98 -98
  247. data/test/ft_61_elsub.rb +23 -23
  248. data/test/ft_62_procparticipant.rb +46 -46
  249. data/test/ft_63_pause.rb +82 -69
  250. data/test/ft_64_alias.rb +56 -57
  251. data/test/ft_65_stringlaunch.rb +29 -29
  252. data/test/ft_66_subforget.rb +42 -42
  253. data/test/ft_67_schedlaunch.rb +58 -59
  254. data/test/ft_68_ifparticipant.rb +39 -39
  255. data/test/ft_69_cancelmissing.rb +23 -21
  256. data/test/ft_6_lambda.rb +37 -37
  257. data/test/ft_70_lookupvar.rb +25 -25
  258. data/test/ft_71_log.rb +35 -35
  259. data/test/ft_72_lookup_processes.rb +43 -40
  260. data/test/ft_73_cancel_sub.rb +79 -79
  261. data/test/ft_74_block_and_workitem_dup.rb +42 -42
  262. data/test/ft_75_ruby_attributes.rb +53 -51
  263. data/test/ft_76_merge_isolate.rb +57 -57
  264. data/test/ft_77_segments.rb +13 -13
  265. data/test/ft_78_eval.rb +94 -94
  266. data/test/ft_79_tticket.rb +79 -79
  267. data/test/ft_79b_tticket.rb +73 -73
  268. data/test/ft_79c_outcome.rb +36 -36
  269. data/test/ft_7_lose.rb +73 -73
  270. data/test/ft_7b_lose.rb +49 -49
  271. data/test/ft_80_spname.rb +65 -65
  272. data/test/ft_81_exp.rb +30 -30
  273. data/test/ft_82_trecu.rb +30 -24
  274. data/test/ft_83_badpause.rb +35 -35
  275. data/test/ft_84_updateexp.rb +118 -118
  276. data/test/ft_84b_subrepr.rb +72 -0
  277. data/test/ft_85_dolhash.rb +18 -18
  278. data/test/ft_86_dollar_fv.rb +33 -33
  279. data/test/ft_87_define.rb +47 -47
  280. data/test/ft_88_http.rb +100 -0
  281. data/test/ft_8_forget.rb +25 -25
  282. data/test/ft_9_cursor.rb +119 -110
  283. data/test/ft_9b_cursor.rb +70 -70
  284. data/test/ft_tests.rb +6 -0
  285. data/test/hash_test.rb +52 -34
  286. data/test/hparticipant_test.rb +92 -88
  287. data/test/lookup_att_test.rb +70 -70
  288. data/test/lookup_vf_test.rb +52 -52
  289. data/test/misc_test.rb +55 -51
  290. data/test/obs_test.rb +82 -82
  291. data/test/param_test.rb +181 -181
  292. data/test/participant_test.rb +46 -46
  293. data/test/pending.rb +12 -12
  294. data/test/ps_representation.rb +70 -70
  295. data/test/rake_ltest.rb +2 -2
  296. data/test/rake_qtest.rb +11 -11
  297. data/test/raw_prog_test.rb +303 -308
  298. data/test/restart_cron_test.rb +74 -74
  299. data/test/restart_paused_test.rb +52 -47
  300. data/test/restart_sleep_test.rb +80 -80
  301. data/test/restart_when_test.rb +64 -64
  302. data/test/ruby_procdef_test.rb +71 -71
  303. data/test/rutest_utils.rb +32 -32
  304. data/test/sec_test.rb +143 -142
  305. data/test/slock_test.rb +41 -41
  306. data/test/storage_test.rb +15 -15
  307. data/test/timeout_test.rb +53 -53
  308. data/test/treechecker_test.rb +111 -0
  309. data/test/util_xml_test.rb +57 -57
  310. data/test/wfid_test.rb +93 -93
  311. data/test/wi_test.rb +58 -58
  312. metadata +64 -19
  313. data/examples/scheduler_cron_usage.rb +0 -48
  314. data/examples/scheduler_usage.rb +0 -56
  315. data/lib/openwfe/orest/controlclient.rb +0 -119
  316. data/lib/openwfe/orest/oldrestservlet.rb +0 -279
  317. data/lib/openwfe/orest/restclient.rb +0 -176
  318. data/lib/openwfe/orest/workitem.rb +0 -206
  319. data/lib/openwfe/orest/worklistclient.rb +0 -272
  320. data/test/bm/ft_26d_load.rb +0 -97
  321. data/test/ft_59b_ps_for_pat.rb +0 -58
  322. data/test/ft_64_clone.rb +0 -69
  323. data/test/orest_test.rb +0 -251
data/test/ft_5_time.rb CHANGED
@@ -11,108 +11,108 @@ require 'flowtestbase'
11
11
 
12
12
 
13
13
  class FlowTest5 < Test::Unit::TestCase
14
- include FlowTestBase
14
+ include FlowTestBase
15
15
 
16
- #def setup
17
- #end
16
+ #def setup
17
+ #end
18
18
 
19
- #def teardown
20
- #end
19
+ #def teardown
20
+ #end
21
21
 
22
- def test_sleep_0
23
- dotest(
22
+ def test_sleep_0
23
+ dotest(
24
24
  '''<process-definition name="sleep_0" revision="0">
25
- <sequence>
26
- <sleep for="2s" />
27
- <print>alpha</print>
28
- </sequence>
29
- </process-definition>''',
30
- "alpha",
31
- true)
32
- end
33
-
34
- def test_sleep_1
35
- dotest(
25
+ <sequence>
26
+ <sleep for="2s" />
27
+ <print>alpha</print>
28
+ </sequence>
29
+ </process-definition>''',
30
+ "alpha",
31
+ true)
32
+ end
33
+
34
+ def test_sleep_1
35
+ dotest(
36
36
  '''<process-definition name="sleep_1" revision="0">
37
- <concurrence>
38
- <sequence>
39
- <sleep for="2s" />
40
- <print>alpha</print>
41
- </sequence>
42
- <print>bravo</print>
43
- </concurrence>
44
- </process-definition>''',
45
- """bravo
46
- alpha""",
47
- true)
48
- end
49
-
50
- def test_sleep_2
51
- dotest(
52
- '''<process-definition name="sleep_2" revision="0">
37
+ <concurrence>
53
38
  <sequence>
54
- <sleep until="${ruby:Time.new() + 4}" />
55
- <print>alpha</print>
39
+ <sleep for="2s" />
40
+ <print>alpha</print>
56
41
  </sequence>
57
- </process-definition>''',
58
- "alpha",
59
- true)
60
- end
61
-
62
- def test_sleep_3
63
- dotest(
42
+ <print>bravo</print>
43
+ </concurrence>
44
+ </process-definition>''',
45
+ """bravo
46
+ alpha""",
47
+ true)
48
+ end
49
+
50
+ def test_sleep_2
51
+ dotest(
52
+ '''<process-definition name="sleep_2" revision="0">
53
+ <sequence>
54
+ <sleep until="${ruby:Time.new() + 4}" />
55
+ <print>alpha</print>
56
+ </sequence>
57
+ </process-definition>''',
58
+ "alpha",
59
+ true)
60
+ end
61
+
62
+ def test_sleep_3
63
+ dotest(
64
64
  '''<process-definition name="sleep_3" revision="0">
65
- <sequence>
66
- <sleep for="900" />
67
- <print>alpha</print>
68
- </sequence>
65
+ <sequence>
66
+ <sleep for="900" />
67
+ <print>alpha</print>
68
+ </sequence>
69
69
  </process-definition>''', "alpha", true)
70
- end
70
+ end
71
+
72
+ #
73
+ # Test 4
74
+ #
71
75
 
72
- #
73
- # Test 4
74
- #
76
+ class Test4 < OpenWFE::ProcessDefinition
77
+ _sleep "10s"
78
+ end
75
79
 
76
- class Test4 < OpenWFE::ProcessDefinition
77
- _sleep "10s"
78
- end
80
+ def test_sleep_4
79
81
 
80
- def test_sleep_4
82
+ fei = launch Test4
81
83
 
82
- fei = launch Test4
84
+ sleep 0.250
83
85
 
84
- sleep 0.250
85
-
86
- jobs = @engine.get_scheduler.find_jobs OpenWFE::SleepExpression.name
86
+ jobs = @engine.get_scheduler.find_jobs OpenWFE::SleepExpression.name
87
87
 
88
- assert_equal 1, jobs.size
88
+ assert_equal 1, jobs.size
89
89
 
90
- @engine.cancel_process fei
90
+ @engine.cancel_process fei
91
91
 
92
- sleep 0.300
93
- end
92
+ sleep 0.300
93
+ end
94
94
 
95
- #
96
- # Test 5
97
- #
95
+ #
96
+ # Test 5
97
+ #
98
98
 
99
- class Test5 < OpenWFE::ProcessDefinition
100
- _sleep "10s", :scheduler_tags => "a, b"
101
- end
99
+ class Test5 < OpenWFE::ProcessDefinition
100
+ _sleep "10s", :scheduler_tags => "a, b"
101
+ end
102
102
 
103
- def test_sleep_5
103
+ def test_sleep_5
104
104
 
105
- fei = launch Test5
105
+ fei = launch Test5
106
106
 
107
- sleep 0.250
107
+ sleep 0.250
108
108
 
109
- assert_equal 1, @engine.get_scheduler.find_jobs("a").size
110
- assert_equal 1, @engine.get_scheduler.find_jobs("b").size
109
+ assert_equal 1, @engine.get_scheduler.find_jobs("a").size
110
+ assert_equal 1, @engine.get_scheduler.find_jobs("b").size
111
111
 
112
- @engine.cancel_process fei
112
+ @engine.cancel_process fei
113
113
 
114
- sleep 0.300
115
- end
114
+ sleep 0.300
115
+ end
116
116
 
117
117
  end
118
118
 
@@ -14,148 +14,148 @@ require 'flowtestbase'
14
14
 
15
15
 
16
16
  class FlowTest60 < Test::Unit::TestCase
17
- include FlowTestBase
18
-
19
- #def setup
20
- #end
21
-
22
- #def teardown
23
- # $OWFE_LOG.level = Logger::INFO # done in FlowTestBase !
24
- #end
25
-
26
- #
27
- # TEST 0
28
-
29
- class TestDefinition0 < OpenWFE::ProcessDefinition
30
- sequence do
31
- _print "a"
32
- sequence do
33
- _print "b.0"
34
- _sleep "1s"
35
- _print "b.1"
36
- end
37
- _print "c"
38
- end
17
+ include FlowTestBase
18
+
19
+ #def setup
20
+ #end
21
+
22
+ #def teardown
23
+ # $OWFE_LOG.level = Logger::INFO # done in FlowTestBase !
24
+ #end
25
+
26
+ #
27
+ # TEST 0
28
+
29
+ class TestDefinition0 < OpenWFE::ProcessDefinition
30
+ sequence do
31
+ _print "a"
32
+ sequence do
33
+ _print "b.0"
34
+ _sleep "1s"
35
+ _print "b.1"
36
+ end
37
+ _print "c"
39
38
  end
39
+ end
40
40
 
41
- def test_0
41
+ def test_0
42
42
 
43
- #$OWFE_LOG.level = Logger::DEBUG
43
+ #$OWFE_LOG.level = Logger::DEBUG
44
44
 
45
- fei = launch TestDefinition0
45
+ fei = launch TestDefinition0
46
46
 
47
- sleep 0.350
47
+ sleep 0.350
48
48
 
49
- #puts
50
- #puts @engine.get_process_stack fei.wfid
51
- #puts
49
+ #puts
50
+ #puts @engine.get_process_stack fei.wfid
51
+ #puts
52
52
 
53
- fei.expression_id = "0.0.1"
54
- fei.expression_name = "sequence"
55
- @engine.cancel_expression fei
53
+ fei.expression_id = "0.0.1"
54
+ fei.expression_name = "sequence"
55
+ @engine.cancel_expression fei
56
56
 
57
- sleep 0.350
57
+ sleep 0.350
58
58
 
59
- assert_equal "a\nb.0\nc", @tracer.to_s
59
+ assert_equal "a\nb.0\nc", @tracer.to_s
60
60
 
61
- assert_equal 0, @engine.process_stack(fei.wfid).size
62
- assert_equal 1, @engine.get_expression_storage.size
63
- end
61
+ assert_equal 0, @engine.process_stack(fei.wfid).size
62
+ assert_equal 1, @engine.get_expression_storage.size
63
+ end
64
64
 
65
- def test_1
65
+ def test_1
66
66
 
67
- #$OWFE_LOG.level = Logger::DEBUG
67
+ #$OWFE_LOG.level = Logger::DEBUG
68
68
 
69
- fei = launch TestDefinition0
69
+ fei = launch TestDefinition0
70
70
 
71
- sleep 0.350
71
+ sleep 0.350
72
72
 
73
- fei.expression_id = "0.0.1.2"
74
- fei.expression_name = "print"
75
- @engine.cancel_expression fei
73
+ fei.expression_id = "0.0.1.2"
74
+ fei.expression_name = "print"
75
+ @engine.cancel_expression fei
76
76
 
77
- #@engine.wait_for(fei.wfid)
78
- wait_for fei
77
+ #@engine.wait_for(fei.wfid)
78
+ wait_for fei
79
79
 
80
- assert_equal "a\nb.0\nc", @tracer.to_s
80
+ assert_equal "a\nb.0\nc", @tracer.to_s
81
81
 
82
- assert_equal 0, @engine.process_stack(fei.wfid).size
83
- assert_equal 1, @engine.get_expression_storage.size
84
- end
82
+ assert_equal 0, @engine.process_stack(fei.wfid).size
83
+ assert_equal 1, @engine.get_expression_storage.size
84
+ end
85
85
 
86
- def test_2
86
+ def test_2
87
87
 
88
- #$OWFE_LOG.level = Logger::DEBUG
88
+ #$OWFE_LOG.level = Logger::DEBUG
89
89
 
90
- fei = launch TestDefinition0
90
+ fei = launch TestDefinition0
91
91
 
92
- sleep 0.350
92
+ sleep 0.350
93
93
 
94
- fei.expression_id = "0"
95
- fei.expression_name = "process-definition"
96
- @engine.cancel_expression fei
94
+ fei.expression_id = "0"
95
+ fei.expression_name = "process-definition"
96
+ @engine.cancel_expression fei
97
97
 
98
- sleep 0.350
99
- #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
98
+ sleep 0.350
99
+ #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
100
100
 
101
- assert_equal "a\nb.0", @tracer.to_s
101
+ assert_equal "a\nb.0", @tracer.to_s
102
102
 
103
- assert_equal 0, @engine.process_stack(fei.wfid).size
104
- assert_equal 1, @engine.get_expression_storage.size
105
- end
103
+ assert_equal 0, @engine.process_stack(fei.wfid).size
104
+ assert_equal 1, @engine.get_expression_storage.size
105
+ end
106
106
 
107
- def test_2b
107
+ def test_2b
108
108
 
109
- #$OWFE_LOG.level = Logger::DEBUG
109
+ #$OWFE_LOG.level = Logger::DEBUG
110
110
 
111
- fei = launch <<-EOS
112
- class Test2b < OpenWFE::ProcessDefinition
113
- nada
114
- end
115
- EOS
111
+ fei = launch <<-EOS
112
+ class Test2b < OpenWFE::ProcessDefinition
113
+ nada
114
+ end
115
+ EOS
116
116
 
117
- # will result in an error
118
- # testing against bug
119
- # http://rubyforge.org/tracker/index.php?func=detail&aid=19607&group_id=2609&atid=10023
117
+ # will result in an error
118
+ # testing against bug
119
+ # http://rubyforge.org/tracker/index.php?func=detail&aid=19607&group_id=2609&atid=10023
120
120
 
121
- sleep 0.350
121
+ sleep 0.350
122
122
 
123
- fei.expression_id = "0"
124
- fei.expression_name = "process-definition"
125
- @engine.cancel_expression fei
123
+ fei.expression_id = "0"
124
+ fei.expression_name = "process-definition"
125
+ @engine.cancel_expression fei
126
126
 
127
- sleep 0.350
128
- #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
127
+ sleep 0.350
128
+ #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
129
129
 
130
- assert_equal "", @tracer.to_s
130
+ assert_equal "", @tracer.to_s
131
131
 
132
- assert_equal 0, @engine.process_stack(fei.wfid).size
133
- assert_equal 1, @engine.get_expression_storage.size
134
- end
132
+ assert_equal 0, @engine.process_stack(fei.wfid).size
133
+ assert_equal 1, @engine.get_expression_storage.size
134
+ end
135
135
 
136
- def test_3
136
+ def test_3
137
137
 
138
- #$OWFE_LOG.level = Logger::DEBUG
138
+ #$OWFE_LOG.level = Logger::DEBUG
139
139
 
140
- fei = launch TestDefinition0
140
+ fei = launch TestDefinition0
141
141
 
142
- sleep 0.350
142
+ sleep 0.350
143
143
 
144
- fei.expression_id = "0.0"
145
- fei.expression_name = "sequence"
146
- @engine.cancel_expression fei
144
+ fei.expression_id = "0.0"
145
+ fei.expression_name = "sequence"
146
+ @engine.cancel_expression fei
147
147
 
148
- #@engine.wait_for(fei.wfid)
149
- wait_for fei
148
+ #@engine.wait_for(fei.wfid)
149
+ wait_for fei
150
150
 
151
- #sleep 0.350
152
- #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
151
+ #sleep 0.350
152
+ #puts @engine.get_error_journal.get_error_log(fei.wfid).to_s
153
153
 
154
- assert_equal "a\nb.0", @tracer.to_s
154
+ assert_equal "a\nb.0", @tracer.to_s
155
155
 
156
- assert_equal 0, @engine.process_stack(fei.wfid).size
157
- assert_equal 1, @engine.get_expression_storage.size
158
- end
156
+ assert_equal 0, @engine.process_stack(fei.wfid).size
157
+ assert_equal 1, @engine.get_expression_storage.size
158
+ end
159
159
 
160
160
  end
161
161
 
data/test/ft_61_elsub.rb CHANGED
@@ -14,38 +14,38 @@ require 'flowtestbase'
14
14
 
15
15
 
16
16
  class FlowTest61 < Test::Unit::TestCase
17
- include FlowTestBase
17
+ include FlowTestBase
18
18
 
19
- #def teardown
20
- #end
19
+ #def teardown
20
+ #end
21
21
 
22
- #def setup
23
- #end
22
+ #def setup
23
+ #end
24
24
 
25
- #
26
- # TEST 0
25
+ #
26
+ # TEST 0
27
27
 
28
- class EngineLevelProcessDefinition < OpenWFE::ProcessDefinition
29
- sequence do
30
- end
31
- process_definition :name => "//elsub" do
32
- _print "nada"
33
- end
28
+ class EngineLevelProcessDefinition < OpenWFE::ProcessDefinition
29
+ sequence do
34
30
  end
35
-
36
- class TestDefinition0 < OpenWFE::ProcessDefinition
37
- elsub
38
- #subprocess :ref => "//elsub"
31
+ process_definition :name => "//elsub" do
32
+ _print "nada"
39
33
  end
34
+ end
40
35
 
41
- def test_0
36
+ class TestDefinition0 < OpenWFE::ProcessDefinition
37
+ elsub
38
+ #subprocess :ref => "//elsub"
39
+ end
42
40
 
43
- #log_level_to_debug
41
+ def test_0
44
42
 
45
- launch EngineLevelProcessDefinition
46
- sleep 0.700
47
- dotest TestDefinition0, "nada", false, true
48
- end
43
+ #log_level_to_debug
44
+
45
+ launch EngineLevelProcessDefinition
46
+ sleep 0.700
47
+ dotest TestDefinition0, "nada", false, true
48
+ end
49
49
 
50
50
  end
51
51