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_4_misc.rb CHANGED
@@ -11,227 +11,222 @@ require 'flowtestbase'
11
11
 
12
12
 
13
13
  class FlowTest4 < 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_print_0
23
- dotest(
22
+ def test_print_0
23
+ dotest(
24
24
  '''<process-definition name="print_0" revision="0">
25
- <sequence>
26
- <print escape="true">${f:xxx}</print>
27
- </sequence>
25
+ <sequence>
26
+ <print escape="true">${f:xxx}</print>
27
+ </sequence>
28
28
  </process-definition>''', "${f:xxx}")
29
- end
30
-
31
- class TestPrint1 < OpenWFE::ProcessDefinition
32
- sequence do
33
- _set :v => "toto", :value => '0'
34
- _print "${toto}"
35
- _print "${toto}", :escape => false
36
- _print "${toto}", :escape => true
37
- end
38
- end
39
- def test_print_1
40
- dotest TestPrint1, "0\n0\n${toto}"
41
- end
42
-
43
- def test_reval_0
44
- dotest(
29
+ end
30
+
31
+ class TestPrint1 < OpenWFE::ProcessDefinition
32
+ sequence do
33
+ _set :v => "toto", :value => '0'
34
+ _print "${toto}"
35
+ _print "${toto}", :escape => false
36
+ _print "${toto}", :escape => true
37
+ end
38
+ end
39
+ def test_print_1
40
+ dotest TestPrint1, "0\n0\n${toto}"
41
+ end
42
+
43
+ def test_reval_0
44
+ dotest(
45
45
  '''<process-definition name="reval_0" revision="0">
46
- <sequence>
47
- <reval><![CDATA[
48
- workitem.attributes["from_ruby"] = "ok"
49
- ]]></reval>
50
- <print>${f:from_ruby}</print>
51
- </sequence>
46
+ <sequence>
47
+ <reval><![CDATA[
48
+ workitem.attributes["from_ruby"] = "ok"
49
+ ]]></reval>
50
+ <print>${f:from_ruby}</print>
51
+ </sequence>
52
52
  </process-definition>''', "ok")
53
- end
53
+ end
54
54
 
55
- def test_reval_1
56
- dotest(
55
+ def test_reval_1
56
+ dotest(
57
57
  '''<process-definition name="reval_1" revision="0">
58
- <sequence>
59
- <set variable="field-name" value="from_ruby" />
60
- <reval>
61
- workitem.attributes["${field-name}"] = "ok"
62
- </reval>
63
- <print>${f:${field-name}}</print>
64
- </sequence>
58
+ <sequence>
59
+ <set variable="field-name" value="from_ruby" />
60
+ <reval>
61
+ workitem.attributes["${field-name}"] = "ok"
62
+ </reval>
63
+ <print>${f:${field-name}}</print>
64
+ </sequence>
65
65
  </process-definition>''', "ok")
66
- end
66
+ end
67
67
 
68
- def test_reval_2
69
- dotest(
68
+ def test_reval_2
69
+ dotest(
70
70
  '''<process-definition name="reval_2" revision="0">
71
- <sequence>
72
- <set variable="field-value" value="ok" />
73
- <reval>
74
- workitem.attributes["from_ruby"] = "${field-value}"
75
- </reval>
76
- <print>${f:from_ruby}</print>
77
- </sequence>
71
+ <sequence>
72
+ <set variable="field-value" value="ok" />
73
+ <reval>
74
+ workitem.attributes["from_ruby"] = "${field-value}"
75
+ </reval>
76
+ <print>${f:from_ruby}</print>
77
+ </sequence>
78
78
  </process-definition>''', "ok")
79
- end
79
+ end
80
80
 
81
- def test_reval_3
82
- dotest(
81
+ def test_reval_3
82
+ dotest(
83
83
  '''<process-definition name="reval_3" revision="0">
84
- <sequence>
85
- <set variable="v">
86
- <reval code="1 == 2" />
87
- </set>
88
- <print>${v}</print>
89
- </sequence>
84
+ <sequence>
85
+ <set variable="v">
86
+ <reval code="1 == 2" />
87
+ </set>
88
+ <print>${v}</print>
89
+ </sequence>
90
90
  </process-definition>''', "false")
91
- end
92
-
93
- class Reval4 < OpenWFE::ProcessDefinition
94
- reval """
95
- tracer = self.application_context['__tracer']
96
-
97
- tracer << 'hello\n'
98
-
99
- tracer << workitem.attributes.length.to_s
100
- """
101
- end
102
- def test_reval_4
103
- dotest Reval4, [ "hello\n2", "hello\n1" ]
104
- end
105
-
106
- class Reval5 < OpenWFE::ProcessDefinition
107
- sequence do
108
- reval """
109
- wi.customer_name = 'dubious'
110
- 'surf'
111
- """
112
- _print "${f:__result__}"
113
- _print "${f:customer_name}"
114
- end
115
- end
116
-
117
- def test_reval_5
118
- dotest Reval5, "surf\ndubious"
119
- end
120
-
121
- class Reval6 < OpenWFE::ProcessDefinition
122
- sequence do
123
- set :field => "f0", :value => "3 + 2 + 2"
124
- set :field => "f1" do
125
- reval :field_code => "f0"
126
- end
127
- _print "${f:f1}"
128
-
129
- set :variable => "v0", :value => "5 - 5"
130
- set :variable => "v1" do
131
- reval :variable_code => "v0"
132
- end
133
- _print "${v1}"
134
- end
135
- end
136
-
137
- def test_reval_6
138
- #log_level_to_debug
139
- dotest Reval6, "7\n0"
140
- end
141
-
142
- #
143
- # DRU tests
144
-
145
- def test_dru_0
146
- dotest(
91
+ end
92
+
93
+ class Reval4 < OpenWFE::ProcessDefinition
94
+ _print do
95
+ reval "sv('i', 0); 1"
96
+ end
97
+ end
98
+ def test_reval_4
99
+ dotest Reval4, '1'
100
+ end
101
+
102
+ #class Reval5 < OpenWFE::ProcessDefinition
103
+ # sequence do
104
+ # reval """
105
+ # wi.customer_name = 'dubious'
106
+ # 'surf'
107
+ # """
108
+ # _print "${f:__result__}"
109
+ # _print "${f:customer_name}"
110
+ # end
111
+ #end
112
+ #def test_reval_5
113
+ # dotest Reval5, "surf\ndubious"
114
+ #end
115
+
116
+ class Reval6 < OpenWFE::ProcessDefinition
117
+ sequence do
118
+ set :field => "f0", :value => "3 + 2 + 2"
119
+ set :field => "f1" do
120
+ reval :field_code => "f0"
121
+ end
122
+ _print "${f:f1}"
123
+
124
+ set :variable => "v0", :value => "5 - 5"
125
+ set :variable => "v1" do
126
+ reval :variable_code => "v0"
127
+ end
128
+ _print "${v1}"
129
+ end
130
+ end
131
+
132
+ def test_reval_6
133
+ #log_level_to_debug
134
+ dotest Reval6, "7\n0"
135
+ end
136
+
137
+ #
138
+ # DRU tests
139
+
140
+ def test_dru_0
141
+ dotest(
147
142
  '''<process-definition name="dru_0" revision="0">
148
- <sequence>
149
- <print>${r:1+2}</print>
150
- </sequence>
143
+ <sequence>
144
+ <print>${r:1+2}</print>
145
+ </sequence>
151
146
  </process-definition>''', "3")
152
- end
147
+ end
153
148
 
154
- def test_dru_1
155
- dotest(
149
+ def test_dru_1
150
+ dotest(
156
151
  '''<process-definition name="dru_1" revision="0">
157
- <sequence>
158
- <print>${r:"x"*3}</print>
159
- </sequence>
152
+ <sequence>
153
+ <print>${r:"x"*3}</print>
154
+ </sequence>
160
155
  </process-definition>''', "xxx")
161
- end
156
+ end
162
157
 
163
- def test_dru_2
164
- dotest(
158
+ def test_dru_2
159
+ dotest(
165
160
  '''<process-definition name="dru_2" revision="0">
166
- <sequence>
167
- <set
168
- variable="v"
169
- value="${r:5*2}"
170
- />
171
- <print>${v}</print>
172
- </sequence>
161
+ <sequence>
162
+ <set
163
+ variable="v"
164
+ value="${r:5*2}"
165
+ />
166
+ <print>${v}</print>
167
+ </sequence>
173
168
  </process-definition>''', "10")
174
- end
169
+ end
175
170
 
176
- def test_dru_3
177
- dotest(
171
+ def test_dru_3
172
+ dotest(
178
173
  '''<process-definition name="dru_3" revision="0">
179
- <sequence>
180
- <set variable="w" value="W" />
181
- <set variable="v">
182
- <!--
183
- <reval>self.lookup_variable("w") * 3</reval>
184
- <reval>lookup_variable("w") * 3</reval>
185
- -->
186
- <reval>"W" * 3</reval>
187
- </set>
188
- <print>${v}</print>
189
- </sequence>
174
+ <sequence>
175
+ <set variable="w" value="W" />
176
+ <set variable="v">
177
+ <!--
178
+ <reval>self.lookup_variable("w") * 3</reval>
179
+ <reval>lookup_variable("w") * 3</reval>
180
+ -->
181
+ <reval>"W" * 3</reval>
182
+ </set>
183
+ <print>${v}</print>
184
+ </sequence>
190
185
  </process-definition>''', "WWW")
191
- end
186
+ end
192
187
 
193
- def test_dru_4
194
- dotest(
188
+ def test_dru_4
189
+ dotest(
195
190
  '''<process-definition name="dru_4" revision="0">
196
- <sequence>
197
- <set variable="v">
198
- <reval>fei.workflow_definition_name</reval>
199
- </set>
200
- <print>${v}</print>
201
-
202
- <print>${r:fei.workflow_definition_name}</print>
203
- </sequence>
191
+ <sequence>
192
+ <set variable="v">
193
+ <reval>fei.workflow_definition_name</reval>
194
+ </set>
195
+ <print>${v}</print>
196
+
197
+ <print>${r:fei.workflow_definition_name}</print>
198
+ </sequence>
204
199
  </process-definition>''', """dru_4
205
200
  dru_4""")
206
- end
207
-
208
- class TestSetEscape0 < OpenWFE::ProcessDefinition
209
- sequence do
210
- _set :v => "t0" do
211
- "This is ${my template}"
212
- end
213
- _set :v => "t1", :escape => true do
214
- "This is ${my template}"
215
- end
216
- _set :v => "t2", :val => "This is ${my template}", :escape => "true"
217
- peek
218
- #_print { v "t0" }
219
- #_print { v "t1" }
220
- end
221
- end
222
- def test_set_escape_0
223
- @engine.register_participant :peek do |fexp, wi|
224
- @tracer << fexp.get_environment.variables['t0']
225
- @tracer << "\n"
226
- @tracer << fexp.get_environment.variables['t1']
227
- @tracer << "\n"
228
- @tracer << fexp.get_environment.variables['t2']
229
- @tracer << "\n"
230
- end
231
- dotest(
232
- TestSetEscape0,
233
- "This is \nThis is ${my template}\nThis is ${my template}")
234
- end
201
+ end
202
+
203
+ class TestSetEscape0 < OpenWFE::ProcessDefinition
204
+ sequence do
205
+ _set :v => "t0" do
206
+ "This is ${my template}"
207
+ end
208
+ _set :v => "t1", :escape => true do
209
+ "This is ${my template}"
210
+ end
211
+ _set :v => "t2", :val => "This is ${my template}", :escape => "true"
212
+ peek
213
+ #_print { v "t0" }
214
+ #_print { v "t1" }
215
+ end
216
+ end
217
+ def test_set_escape_0
218
+ @engine.register_participant :peek do |fexp, wi|
219
+ @tracer << fexp.get_environment.variables['t0']
220
+ @tracer << "\n"
221
+ @tracer << fexp.get_environment.variables['t1']
222
+ @tracer << "\n"
223
+ @tracer << fexp.get_environment.variables['t2']
224
+ @tracer << "\n"
225
+ end
226
+ dotest(
227
+ TestSetEscape0,
228
+ "This is \nThis is ${my template}\nThis is ${my template}")
229
+ end
235
230
 
236
231
  end
237
232
 
@@ -13,143 +13,140 @@ require 'rutest_utils'
13
13
 
14
14
 
15
15
  class FlowTest50 < Test::Unit::TestCase
16
- include FlowTestBase
16
+ include FlowTestBase
17
17
 
18
- #def setup
19
- #end
18
+ #def setup
19
+ #end
20
20
 
21
- #def teardown
22
- #end
21
+ #def teardown
22
+ #end
23
23
 
24
- #
25
- # A Test by Pat Cappelaere
26
- #
24
+ #
25
+ # A Test by Pat Cappelaere
26
+ #
27
27
 
28
- PAT_XML = <<END
28
+ PAT_XML = <<END
29
29
  <?xml version="1.0" encoding="UTF-8"?>
30
30
  <sps:GetFeasibilityRequestResponse xmlns:gml="http://www.opengis.net/gml"
31
31
  xmlns:sps="http://www.opengis.net/sps" xmlns="">
32
32
  <sps:Feasibility status="feasible" id="106">
33
- <DOY>106</DOY>
34
- <UTC>2007-04-16 09:20:00</UTC>
35
- <SZA>27.41</SZA>
36
- <TYPE>NADIR</TYPE>
37
- <PATH>52</PATH>
38
- <ROW>186</ROW>
39
- <COST>2600.85</COST>
40
- <![CDATA[
41
- <blah/>boum
42
- ]]>
43
- <sps:LatestResponseTime>
44
- <gml:TimeInstant>
45
- <gml:timePosition>2007-04-16T09:20:00Z</gml:timePosition>
46
- </gml:TimeInstant>
47
- </sps:LatestResponseTime>
33
+ <DOY>106</DOY>
34
+ <UTC>2007-04-16 09:20:00</UTC>
35
+ <SZA>27.41</SZA>
36
+ <TYPE>NADIR</TYPE>
37
+ <PATH>52</PATH>
38
+ <ROW>186</ROW>
39
+ <COST>2600.85</COST>
40
+ <![CDATA[
41
+ <blah/>boum
42
+ ]]>
43
+ <sps:LatestResponseTime>
44
+ <gml:TimeInstant>
45
+ <gml:timePosition>2007-04-16T09:20:00Z</gml:timePosition>
46
+ </gml:TimeInstant>
47
+ </sps:LatestResponseTime>
48
48
  </sps:Feasibility>
49
49
  </sps:GetFeasibilityRequestResponse>
50
50
  END
51
51
 
52
- class TestXmlAttribute50a0 < OpenWFE::ProcessDefinition
53
- sequence do
54
- geo_0
55
- geo_1
56
- end
52
+ class TestXmlAttribute50a0 < OpenWFE::ProcessDefinition
53
+ sequence do
54
+ geo_0
55
+ geo_1
57
56
  end
57
+ end
58
58
 
59
- def test_0
60
-
61
- doc0 = nil
62
- doc1 = nil
63
-
64
- @engine.register_participant :geo_0 do |fei, workitem|
65
- doc0 = REXML::Document.new(PAT_XML)
66
- workitem.attributes['xml'] = doc0
67
- @tracer << "0\n"
68
- end
69
-
70
- @engine.register_participant :geo_1 do |fei, workitem|
71
- doc1 = workitem.attributes['xml']
72
- @tracer << "1\n"
73
- end
74
-
75
- dotest(TestXmlAttribute50a0, "0\n1")
76
-
77
- assert_equal doc0.to_s, doc1.to_s
59
+ def test_0
60
+
61
+ doc0 = nil
62
+ doc1 = nil
63
+
64
+ @engine.register_participant :geo_0 do |fei, workitem|
65
+ doc0 = REXML::Document.new(PAT_XML)
66
+ workitem.attributes['xml'] = doc0
67
+ @tracer << "0\n"
78
68
  end
79
69
 
80
- def test_1
70
+ @engine.register_participant :geo_1 do |fei, workitem|
71
+ doc1 = workitem.attributes['xml']
72
+ @tracer << "1\n"
73
+ end
81
74
 
82
- doc0 = REXML::Document.new PAT_XML
83
- doc1 = OpenWFE::fulldup(doc0)
75
+ dotest(TestXmlAttribute50a0, "0\n1")
84
76
 
85
- assert_not_equal doc0.object_id, doc1.object_id
77
+ assert_equal doc0.to_s, doc1.to_s
78
+ end
86
79
 
87
- assert_equal doc0.to_s, doc1.to_s
88
- end
80
+ #def test_1 # moved to test/clone_test.rb
81
+ # doc0 = REXML::Document.new PAT_XML
82
+ # doc1 = OpenWFE::fulldup(doc0)
83
+ # assert_not_equal doc0.object_id, doc1.object_id
84
+ # assert_equal doc0.to_s, doc1.to_s
85
+ #end
89
86
 
90
- #
91
- # Against bug #10150
92
- #
93
- #def test_2
94
- # workitem = OpenWFE::InFlowWorkItem.new
95
- # workitem.fei = new_fei
96
- # workitem.result = REXML::Document.new PAT_XML
97
- # s = OpenWFE::XmlCodec::encode workitem
98
- # #puts s
99
- # w = OpenWFE::XmlCodec::decode s
100
- # w.attributes.delete '___map_type'
101
- # #puts workitem.to_s
102
- # #puts
103
- # #puts w.to_s
104
- # assert_equal workitem.to_s, w.to_s
105
- #end
87
+ #
88
+ # Against bug #10150
89
+ #
90
+ #def test_2
91
+ # workitem = OpenWFE::InFlowWorkItem.new
92
+ # workitem.fei = new_fei
93
+ # workitem.result = REXML::Document.new PAT_XML
94
+ # s = OpenWFE::XmlCodec::encode workitem
95
+ # #puts s
96
+ # w = OpenWFE::XmlCodec::decode s
97
+ # w.attributes.delete '___map_type'
98
+ # #puts workitem.to_s
99
+ # #puts
100
+ # #puts w.to_s
101
+ # assert_equal workitem.to_s, w.to_s
102
+ #end
106
103
 
107
- def test_3
104
+ def test_3
108
105
 
109
- workitem = OpenWFE::InFlowWorkItem.new
110
- workitem.fei = new_fei
106
+ workitem = OpenWFE::InFlowWorkItem.new
107
+ workitem.fei = new_fei
111
108
 
112
- workitem.result = REXML::Document.new(
113
- PAT_XML, :compress_whitespace=>:all, :ignore_whitespace_nodes=>:all)
109
+ workitem.result = REXML::Document.new(
110
+ PAT_XML, :compress_whitespace=>:all, :ignore_whitespace_nodes=>:all)
114
111
 
115
- workitem.result = workitem.result.root
112
+ workitem.result = workitem.result.root
116
113
 
117
- s = OpenWFE::XmlCodec::encode workitem
114
+ s = OpenWFE::XmlCodec::encode workitem
118
115
 
119
- #puts s
116
+ #puts s
120
117
 
121
- w = OpenWFE::XmlCodec::decode s
122
- w.attributes.delete '___map_type'
118
+ w = OpenWFE::XmlCodec::decode s
119
+ w.attributes.delete '___map_type'
123
120
 
124
- workitem.attributes.delete '___map_type'
121
+ workitem.attributes.delete '___map_type'
125
122
 
126
- #puts workitem.to_s
127
- #puts
128
- #puts w.to_s
123
+ #puts workitem.to_s
124
+ #puts
125
+ #puts w.to_s
129
126
 
130
- assert_equal workitem.to_s, w.to_s
131
- end
127
+ assert_equal workitem.to_s, w.to_s
128
+ end
132
129
 
133
130
  def test_4
134
131
 
135
- doc0 = nil
136
- doc1 = nil
137
-
138
- @engine.register_participant :geo_0 do |fei, workitem|
139
- doc0 = REXML::Document.new(PAT_XML).root
140
- workitem.attributes['xml'] = doc0
141
- @tracer << "0\n"
142
- end
143
-
144
- @engine.register_participant :geo_1 do |fei, workitem|
145
- doc1 = workitem.attributes['xml']
146
- @tracer << "1\n"
147
- end
148
-
149
- dotest(TestXmlAttribute50a0, "0\n1")
150
-
151
- assert_equal doc0.to_s, doc1.to_s
132
+ doc0 = nil
133
+ doc1 = nil
134
+
135
+ @engine.register_participant :geo_0 do |fei, workitem|
136
+ doc0 = REXML::Document.new(PAT_XML).root
137
+ workitem.attributes['xml'] = doc0
138
+ @tracer << "0\n"
139
+ end
140
+
141
+ @engine.register_participant :geo_1 do |fei, workitem|
142
+ doc1 = workitem.attributes['xml']
143
+ @tracer << "1\n"
144
+ end
145
+
146
+ dotest(TestXmlAttribute50a0, "0\n1")
147
+
148
+ assert_equal doc0.to_s, doc1.to_s
152
149
  end
153
-
150
+
154
151
  end
155
152