cpee 1.5.15 → 1.5.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/testsets/Async.xml +17 -13
  3. data/cockpit/testsets/BCO.xml +37 -20
  4. data/cockpit/testsets/BCS.xml +37 -20
  5. data/cockpit/testsets/Centurio.xml +12 -9
  6. data/cockpit/testsets/Concurrent.xml +8 -7
  7. data/cockpit/testsets/Coopis Testset.xml +12 -9
  8. data/cockpit/testsets/Endpoints and Data Manipulation.xml +4 -5
  9. data/cockpit/testsets/ICSOC Testset.xml +30 -19
  10. data/cockpit/testsets/Infinity.xml +4 -2
  11. data/cockpit/testsets/Lego Boxer.xml +2 -2
  12. data/cockpit/testsets/Lego Conveyor.xml +2 -2
  13. data/cockpit/testsets/Lego Crane.xml +2 -2
  14. data/cockpit/testsets/Lego Ejector.xml +2 -2
  15. data/cockpit/testsets/Lego Plate.xml +2 -2
  16. data/cockpit/testsets/Lego Transporter.xml +2 -2
  17. data/cockpit/testsets/LgLinear.xml +43 -24
  18. data/cockpit/testsets/Linear.xml +41 -22
  19. data/cockpit/testsets/Log.xml +12 -11
  20. data/cockpit/testsets/Mangler 1.xml +27 -16
  21. data/cockpit/testsets/Mangler 2.xml +19 -12
  22. data/cockpit/testsets/Promise.xml +35 -14
  23. data/cockpit/testsets/SOPROMO Test Sonification.xml +18 -15
  24. data/cockpit/testsets/Subprocess.xml +18 -14
  25. data/cockpit/testsets/Syncing P34 1.xml +42 -23
  26. data/cockpit/testsets/Syncing P34 2.xml +42 -23
  27. data/cockpit/testsets/Syncing P34 3.xml +42 -23
  28. data/cockpit/testsets/Syncing P34.xml +42 -23
  29. data/cockpit/testsets/TEST - Bad Loop.xml +50 -29
  30. data/cockpit/testsets/TEST - Wrong Positions.xml +74 -35
  31. data/cockpit/testsets/Take_5.xml +18 -14
  32. data/cockpit/testsets/Update.xml +5 -4
  33. data/cockpit/testsets/Worklist Parallel.xml +13 -6
  34. data/cockpit/testsets/Worklist Test CPEE.xml +4 -3
  35. data/cockpit/testsets/Worklist Test.xml +7 -4
  36. data/cockpit/testsets/Worklist Test2.xml +7 -4
  37. data/cockpit/testsets/convert_preset.rb +32 -0
  38. data/cockpit/testsets/testsets.xml +1 -1
  39. data/cockpit/testsets/transformations.xml +1 -1
  40. data/cockpit/themes/compact/theme.js +1 -1
  41. data/cockpit/themes/extended/theme.js +1 -1
  42. data/cockpit/themes/packed/theme.js +1 -1
  43. data/cpee.gemspec +1 -1
  44. metadata +2 -1
data/cockpit/testsets/Promise.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <dataelements/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -32,7 +31,9 @@
32
31
  <method>:post</method>
33
32
  <arguments/>
34
33
  </parameters>
35
- <finalize>data.knr=result[0].value;data.status="normal";data.zaehlerid=result[1].value</finalize>
34
+ <code>
35
+ <finalize>data.knr=result[0].value;data.status="normal";data.zaehlerid=result[1].value</finalize>
36
+ </code>
36
37
  </call>
37
38
  <call id="a10" endpoint="sreminder1" svg-label="Sendung erste Mahnung">
38
39
  <parameters>
@@ -86,7 +87,9 @@
86
87
  <status>data.status</status>
87
88
  </arguments>
88
89
  </parameters>
89
- <finalize>data.status=result[0].value;data.zaehler_status='normal'</finalize>
90
+ <code>
91
+ <finalize>data.status=result[0].value;data.zaehler_status='normal'</finalize>
92
+ </code>
90
93
  </call>
91
94
  <parallel wait="-1" svg-label="">
92
95
  <parallel_branch svg-label="">
@@ -112,7 +115,9 @@
112
115
  <status>data.zaehler_status</status>
113
116
  </arguments>
114
117
  </parameters>
115
- <finalize>data.zaehler_status=result[0].value</finalize>
118
+ <code>
119
+ <finalize>data.zaehler_status=result[0].value</finalize>
120
+ </code>
116
121
  </call>
117
122
  </parallel_branch>
118
123
  </parallel>
@@ -122,7 +127,9 @@
122
127
  <method>:post</method>
123
128
  <arguments/>
124
129
  </parameters>
125
- <finalize>data.wartefrist="ok";data.guthaben=result[0].value.to_i</finalize>
130
+ <code>
131
+ <finalize>data.wartefrist="ok";data.guthaben=result[0].value.to_i</finalize>
132
+ </code>
126
133
  </call>
127
134
  <call id="a3" endpoint="timeout3" svg-label="Aufladen">
128
135
  <parameters>
@@ -130,7 +137,9 @@
130
137
  <method>:post</method>
131
138
  <arguments/>
132
139
  </parameters>
133
- <finalize>p data.guthaben</finalize>
140
+ <code>
141
+ <finalize>p data.guthaben</finalize>
142
+ </code>
134
143
  </call>
135
144
  <loop mode="pre_test" condition="data.wartefrist!='verstrichen'" svg-label="">
136
145
  <loop mode="pre_test" condition="data.guthaben&gt;0" svg-label="">
@@ -142,7 +151,9 @@
142
151
  <knr>data.knr</knr>
143
152
  </arguments>
144
153
  </parameters>
145
- <finalize>data.guthaben=data.guthaben-result[0].value.to_i</finalize>
154
+ <code>
155
+ <finalize>data.guthaben=data.guthaben-result[0].value.to_i</finalize>
156
+ </code>
146
157
  </call>
147
158
  </loop>
148
159
  <call id="a13" endpoint="decide" svg-label="Gesetzl. Frist">
@@ -153,7 +164,9 @@
153
164
  <knr>data.knr</knr>
154
165
  </arguments>
155
166
  </parameters>
156
- <finalize>data.wartefrist="verstrichen" if result[0].name == 'wartefrist';data.guthaben=result[0].value.to_i if result[0].name == "balance"</finalize>
167
+ <code>
168
+ <finalize>data.wartefrist="verstrichen" if result[0].name == 'wartefrist';data.guthaben=result[0].value.to_i if result[0].name == "balance"</finalize>
169
+ </code>
157
170
  </call>
158
171
  </loop>
159
172
  <call id="a17" endpoint="timeout" svg-label="Abschaltung">
@@ -164,7 +177,9 @@
164
177
  <knr>data.knr</knr>
165
178
  </arguments>
166
179
  </parameters>
167
- <finalize>data.zaehler_status='off'</finalize>
180
+ <code>
181
+ <finalize>data.zaehler_status='off'</finalize>
182
+ </code>
168
183
  </call>
169
184
  <call id="a8" endpoint="credit_worthy" svg-label="Kreditwuerdig">
170
185
  <parameters>
@@ -174,7 +189,9 @@
174
189
  <knr>data.knr</knr>
175
190
  </arguments>
176
191
  </parameters>
177
- <finalize>data.kreditf=result[0].value;data.kredit_wanted="true"</finalize>
192
+ <code>
193
+ <finalize>data.kreditf=result[0].value;data.kredit_wanted="true"</finalize>
194
+ </code>
178
195
  </call>
179
196
  <choose mode="exclusive" svg-label="">
180
197
  <alternative condition="data.kreditf=='true'" svg-label="">
@@ -197,7 +214,9 @@
197
214
  <knr>knr=data.knr</knr>
198
215
  </arguments>
199
216
  </parameters>
200
- <finalize>data.kredit=result[0].value.to_i</finalize>
217
+ <code>
218
+ <finalize>data.kredit=result[0].value.to_i</finalize>
219
+ </code>
201
220
  </call>
202
221
  <loop mode="pre_test" condition="data.kredit&gt;0" svg-label="">
203
222
  <call id="a19" endpoint="credit_consume" svg-label="Consume credit">
@@ -208,7 +227,9 @@
208
227
  <knr>knr=data.knr</knr>
209
228
  </arguments>
210
229
  </parameters>
211
- <finalize>data.kredit=data.kredit-result[0].value.to_i</finalize>
230
+ <code>
231
+ <finalize>data.kredit=data.kredit-result[0].value.to_i</finalize>
232
+ </code>
212
233
  </call>
213
234
  </loop>
214
235
  </alternative>
@@ -247,8 +268,8 @@
247
268
  <endpoints type="none"/>
248
269
  </transformation>
249
270
  <attributes>
250
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
271
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
251
272
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ss</info>
252
273
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
253
274
  </attributes>
254
- </testset>
275
+ </testset>
data/cockpit/testsets/SOPROMO Test Sonification.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <positions/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -13,12 +12,12 @@
13
12
  </dataelements>
14
13
  <handlers>
15
14
  <handler url="http://localhost:9299/events">
16
- <events topic='activity'>calling,failed,manipulating,done</events>
17
- <events topic='dataelements'>change</events>
18
- <events topic='endpoints'>change</events>
19
- <events topic='description'>error</events>
20
- <events topic='state'>change</events>
21
- <events topic='status'>change</events>
15
+ <events topic="activity">calling,failed,manipulating,done</events>
16
+ <events topic="dataelements">change</events>
17
+ <events topic="endpoints">change</events>
18
+ <events topic="description">error</events>
19
+ <events topic="state">change</events>
20
+ <events topic="status">change</events>
22
21
  </handler>
23
22
  </handlers>
24
23
  <endpoints>
@@ -37,12 +36,14 @@
37
36
  <persons>data.persons</persons>
38
37
  </arguments>
39
38
  </parameters>
40
- <finalize output="result">data.airline = result.value('id')
39
+ <code>
40
+ <finalize output="result">data.airline = result.value('id')
41
41
  data.costs += result.value('costs').to_f
42
42
  status.update 1, 'Hotel'</finalize>
43
+ </code>
43
44
  </call>
44
45
  <parallel>
45
- <loop mode="pre_test" condition="data.persons > 0">
46
+ <loop mode="pre_test" condition="data.persons &gt; 0">
46
47
  <parallel_branch pass="data.persons" local="p">
47
48
  <call id="a2" endpoint="bookHotel">
48
49
  <parameters>
@@ -51,15 +52,17 @@ status.update 1, 'Hotel'</finalize>
51
52
  <to>data.to</to>
52
53
  </arguments>
53
54
  </parameters>
54
- <finalize output="result">data.hotels &lt;&lt; result.value('id')
55
+ <code>
56
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
55
57
  data.costs += result.value('costs').to_f</finalize>
58
+ </code>
56
59
  </call>
57
60
  </parallel_branch>
58
61
  <manipulate id="a3">data.persons -= 1</manipulate>
59
62
  </loop>
60
63
  </parallel>
61
64
  <choose>
62
- <alternative condition="data.costs > 700">
65
+ <alternative condition="data.costs &gt; 700">
63
66
  <call id="a4" endpoint="approve">
64
67
  <parameters>
65
68
  <method>:post</method>
@@ -73,8 +76,8 @@ data.costs += result.value('costs').to_f</finalize>
73
76
  </description>
74
77
  </description>
75
78
  <transformation>
76
- <description type='copy'/>
77
- <dataelements type='rest'/>
78
- <endpoints type='rest'/>
79
+ <description type="copy"/>
80
+ <dataelements type="rest"/>
81
+ <endpoints type="rest"/>
79
82
  </transformation>
80
- </testset>
83
+ </testset>
data/cockpit/testsets/Subprocess.xml CHANGED
@@ -21,19 +21,23 @@
21
21
  </init>
22
22
  </arguments>
23
23
  </parameters>
24
- <finalize output="result">data.instance = result['CPEE-INSTANCE']
24
+ <code>
25
+ <finalize output="result">data.instance = result['CPEE-INSTANCE']
25
26
  data.res = result</finalize>
26
- <update output="result"/>
27
- <_timing>
28
- <_timing_min/>
29
- <_timing_max/>
30
- <_timing_avg/>
31
- </_timing>
32
- <_notes>
33
- <_notes_general/>
34
- <_notes_output/>
35
- <_attachments/>
36
- </_notes>
27
+ <update output="result"/>
28
+ </code>
29
+ <annotations>
30
+ <_timing>
31
+ <_timing_min/>
32
+ <_timing_max/>
33
+ <_timing_avg/>
34
+ </_timing>
35
+ <_notes>
36
+ <_notes_general/>
37
+ <_notes_output/>
38
+ <_attachments/>
39
+ </_notes>
40
+ </annotations>
37
41
  </call>
38
42
  </description>
39
43
  </description>
@@ -45,8 +49,8 @@ data.res = result</finalize>
45
49
  <attributes>
46
50
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Subprocess</info>
47
51
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
48
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
52
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
49
53
  <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
50
54
  <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
51
55
  </attributes>
52
- </testset>
56
+ </testset>
data/cockpit/testsets/Syncing P34 1.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <attributes>
4
3
  <info>Syncing Instance 1</info>
@@ -7,55 +6,75 @@
7
6
  </attributes>
8
7
  <positions/>
9
8
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
10
- <dataelements><!--{{{-->
9
+ <dataelements>
10
+ <!--{{{-->
11
11
  <x/>
12
- </dataelements><!--}}}-->
13
- <handlers><!--{{{-->
12
+ </dataelements>
13
+ <!--}}}-->
14
+ <handlers>
15
+ <!--{{{-->
14
16
  <handler url="http://localhost:9399/1/events">
15
- <votes topic='activity'>syncing_before,syncing_after</votes>
17
+ <votes topic="activity">syncing_before,syncing_after</votes>
16
18
  </handler>
17
- </handlers><!--}}}-->
18
- <endpoints><!--{{{-->
19
+ </handlers>
20
+ <!--}}}-->
21
+ <endpoints>
22
+ <!--{{{-->
19
23
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
20
24
  <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
21
- </endpoints> <!--}}}-->
25
+ </endpoints>
26
+ <!--}}}-->
22
27
  <description>
23
- <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
28
+ <description xmlns="http://cpee.org/ns/description/1.0">
29
+ <!--{{{-->
24
30
  <call id="a1" endpoint="timeout">
25
- <parameters><!--{{{-->
31
+ <parameters>
32
+ <!--{{{-->
26
33
  <label>Task 1</label>
27
34
  <method>:post</method>
28
35
  <arguments>
29
36
  <timeout>2</timeout>
30
37
  </arguments>
31
- </parameters><!--}}}-->
32
- <finalize output="result">data.x += "a1,"</finalize>
38
+ </parameters>
39
+ <!--}}}-->
40
+ <code>
41
+ <finalize output="result">data.x += "a1,"</finalize>
42
+ </code>
33
43
  </call>
34
44
  <call id="a2" endpoint="timeouts">
35
- <parameters><!--{{{-->
45
+ <parameters>
46
+ <!--{{{-->
36
47
  <label>Resource Synchronisation</label>
37
48
  <method>:post</method>
38
49
  <arguments>
39
50
  <timeout>4</timeout>
40
51
  </arguments>
41
- </parameters><!--}}}-->
42
- <finalize output="result">data.x += "a2,"</finalize>
52
+ </parameters>
53
+ <!--}}}-->
54
+ <code>
55
+ <finalize output="result">data.x += "a2,"</finalize>
56
+ </code>
43
57
  </call>
44
58
  <call id="a3" endpoint="timeout">
45
- <parameters><!--{{{-->
59
+ <parameters>
60
+ <!--{{{-->
46
61
  <label>Task 3</label>
47
62
  <method>:post</method>
48
63
  <arguments>
49
64
  <timeout>4</timeout>
50
65
  </arguments>
51
- </parameters><!--}}}-->
52
- <finalize output="result">data.x += "a3,"</finalize>
66
+ </parameters>
67
+ <!--}}}-->
68
+ <code>
69
+ <finalize output="result">data.x += "a3,"</finalize>
70
+ </code>
53
71
  </call>
54
- </description><!--}}}-->
72
+ </description>
73
+ <!--}}}-->
55
74
  </description>
56
75
  <transformation>
57
- <description type='copy'/>
58
- <dataelements type='rest'/>
59
- <endpoints type='rest'/>
76
+ <description type="copy"/>
77
+ <dataelements type="rest"/>
78
+ <endpoints type="rest"/>
60
79
  </transformation>
61
- </testset>
80
+ </testset>
data/cockpit/testsets/Syncing P34 2.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <attributes>
4
3
  <info>Syncing Instance 2</info>
@@ -7,55 +6,75 @@
7
6
  </attributes>
8
7
  <positions/>
9
8
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
10
- <dataelements><!--{{{-->
9
+ <dataelements>
10
+ <!--{{{-->
11
11
  <x/>
12
- </dataelements><!--}}}-->
13
- <handlers><!--{{{-->
12
+ </dataelements>
13
+ <!--}}}-->
14
+ <handlers>
15
+ <!--{{{-->
14
16
  <handler url="http://localhost:9399/1/events">
15
- <votes topic='activity'>syncing_before,syncing_after</votes>
17
+ <votes topic="activity">syncing_before,syncing_after</votes>
16
18
  </handler>
17
- </handlers><!--}}}-->
18
- <endpoints><!--{{{-->
19
+ </handlers>
20
+ <!--}}}-->
21
+ <endpoints>
22
+ <!--{{{-->
19
23
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
20
24
  <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
21
- </endpoints> <!--}}}-->
25
+ </endpoints>
26
+ <!--}}}-->
22
27
  <description>
23
- <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
28
+ <description xmlns="http://cpee.org/ns/description/1.0">
29
+ <!--{{{-->
24
30
  <call id="a1" endpoint="timeout">
25
- <parameters><!--{{{-->
31
+ <parameters>
32
+ <!--{{{-->
26
33
  <label>Task 1</label>
27
34
  <method>:post</method>
28
35
  <arguments>
29
36
  <timeout>2</timeout>
30
37
  </arguments>
31
- </parameters><!--}}}-->
32
- <finalize output="result">data.x += "a1,"</finalize>
38
+ </parameters>
39
+ <!--}}}-->
40
+ <code>
41
+ <finalize output="result">data.x += "a1,"</finalize>
42
+ </code>
33
43
  </call>
34
44
  <call id="a2" endpoint="timeouts">
35
- <parameters><!--{{{-->
45
+ <parameters>
46
+ <!--{{{-->
36
47
  <label>Resource Synchronisation</label>
37
48
  <method>:post</method>
38
49
  <arguments>
39
50
  <timeout>10</timeout>
40
51
  </arguments>
41
- </parameters><!--}}}-->
42
- <finalize output="result">data.x += "a2,"</finalize>
52
+ </parameters>
53
+ <!--}}}-->
54
+ <code>
55
+ <finalize output="result">data.x += "a2,"</finalize>
56
+ </code>
43
57
  </call>
44
58
  <call id="a3" endpoint="timeout">
45
- <parameters><!--{{{-->
59
+ <parameters>
60
+ <!--{{{-->
46
61
  <label>Task 3</label>
47
62
  <method>:post</method>
48
63
  <arguments>
49
64
  <timeout>4</timeout>
50
65
  </arguments>
51
- </parameters><!--}}}-->
52
- <finalize output="result">data.x += "a3,"</finalize>
66
+ </parameters>
67
+ <!--}}}-->
68
+ <code>
69
+ <finalize output="result">data.x += "a3,"</finalize>
70
+ </code>
53
71
  </call>
54
- </description><!--}}}-->
72
+ </description>
73
+ <!--}}}-->
55
74
  </description>
56
75
  <transformation>
57
- <description type='copy'/>
58
- <dataelements type='rest'/>
59
- <endpoints type='rest'/>
76
+ <description type="copy"/>
77
+ <dataelements type="rest"/>
78
+ <endpoints type="rest"/>
60
79
  </transformation>
61
- </testset>
80
+ </testset>