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/Infinity.xml CHANGED
@@ -14,7 +14,9 @@
14
14
  <pid>data.pid</pid>
15
15
  </arguments>
16
16
  </parameters>
17
- <finalize>data.progress = result["progress"]</finalize>
17
+ <code>
18
+ <finalize>data.progress = result["progress"]</finalize>
19
+ </code>
18
20
  </call>
19
21
  </loop>
20
22
  </description>
@@ -23,4 +25,4 @@
23
25
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Inifinity Example</info>
24
26
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
25
27
  </attributes>
26
- </testset>
28
+ </testset>
data/cockpit/testsets/Lego Boxer.xml CHANGED
@@ -25,7 +25,7 @@
25
25
  <attributes>
26
26
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">boxxxxxer</info>
27
27
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
28
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
28
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
29
29
  <bc>operate</bc>
30
30
  </attributes>
31
- </testset>
31
+ </testset>
data/cockpit/testsets/Lego Conveyor.xml CHANGED
@@ -25,7 +25,7 @@
25
25
  <attributes>
26
26
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">sdas</info>
27
27
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
28
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
28
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
29
29
  <bc>operate</bc>
30
30
  </attributes>
31
- </testset>
31
+ </testset>
data/cockpit/testsets/Lego Crane.xml CHANGED
@@ -81,7 +81,7 @@
81
81
  <attributes>
82
82
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
83
83
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
84
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
84
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
85
85
  <bc>operate</bc>
86
86
  </attributes>
87
- </testset>
87
+ </testset>
data/cockpit/testsets/Lego Ejector.xml CHANGED
@@ -49,7 +49,7 @@
49
49
  <attributes>
50
50
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
51
51
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
52
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
52
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
53
53
  <bc>operate</bc>
54
54
  </attributes>
55
- </testset>
55
+ </testset>
data/cockpit/testsets/Lego Plate.xml CHANGED
@@ -25,7 +25,7 @@
25
25
  <attributes>
26
26
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ss</info>
27
27
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
28
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
28
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
29
29
  <bc>operate</bc>
30
30
  </attributes>
31
- </testset>
31
+ </testset>
data/cockpit/testsets/Lego Transporter.xml CHANGED
@@ -37,7 +37,7 @@
37
37
  <attributes>
38
38
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
39
39
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
40
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
40
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
41
41
  <bc>start</bc>
42
42
  </attributes>
43
- </testset>
43
+ </testset>
data/cockpit/testsets/LgLinear.xml CHANGED
@@ -1,50 +1,69 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <positions><!--{{{-->
2
+ <positions>
3
+ <!--{{{-->
4
4
  <a1>after</a1>
5
- </positions><!--}}}-->
5
+ </positions>
6
+ <!--}}}-->
6
7
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
7
- <dataelements><!--{{{-->
8
+ <dataelements>
9
+ <!--{{{-->
8
10
  <x/>
9
- </dataelements><!--}}}-->
11
+ </dataelements>
12
+ <!--}}}-->
10
13
  <handlers/>
11
- <endpoints><!--{{{-->
14
+ <endpoints>
15
+ <!--{{{-->
12
16
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
13
- </endpoints><!--}}}-->
17
+ </endpoints>
18
+ <!--}}}-->
14
19
  <description>
15
- <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
20
+ <description xmlns="http://cpee.org/ns/description/1.0">
21
+ <!--{{{-->
16
22
  <call id="a1" endpoint="timeout">
17
- <parameters><!--{{{-->
23
+ <parameters>
24
+ <!--{{{-->
18
25
  <method>:post</method>
19
26
  <parameters>
20
27
  <timeout>2</timeout>
21
28
  </parameters>
22
- </parameters><!--}}}-->
23
- <finalize output="result"> data.x += "a1,"</finalize>
24
- </call>
29
+ </parameters>
30
+ <!--}}}-->
31
+ <code>
32
+ <finalize output="result"> data.x += "a1,"</finalize>
33
+ </code>
34
+ </call>
25
35
  <call id="a2" endpoint="timeout">
26
- <parameters><!--{{{-->
36
+ <parameters>
37
+ <!--{{{-->
27
38
  <method>:post</method>
28
39
  <parameters>
29
40
  <timeout>4</timeout>
30
41
  </parameters>
31
- </parameters><!--}}}-->
32
- <finalize output="result"> data.x += "a2,"</finalize>
42
+ </parameters>
43
+ <!--}}}-->
44
+ <code>
45
+ <finalize output="result"> data.x += "a2,"</finalize>
46
+ </code>
33
47
  </call>
34
48
  <call id="a3" endpoint="timeout">
35
- <parameters><!--{{{-->
49
+ <parameters>
50
+ <!--{{{-->
36
51
  <method>:post</method>
37
52
  <parameters>
38
53
  <timeout>4</timeout>
39
54
  </parameters>
40
- </parameters><!--}}}-->
41
- <finalize output="result"> data.x += "a3,"</finalize>
42
- </call>
43
- </description><!--}}}-->
55
+ </parameters>
56
+ <!--}}}-->
57
+ <code>
58
+ <finalize output="result"> data.x += "a3,"</finalize>
59
+ </code>
60
+ </call>
61
+ </description>
62
+ <!--}}}-->
44
63
  </description>
45
64
  <transformation>
46
- <description type='copy'/>
47
- <dataelements type='rest'/>
48
- <endpoints type='rest'/>
65
+ <description type="copy"/>
66
+ <dataelements type="rest"/>
67
+ <endpoints type="rest"/>
49
68
  </transformation>
50
- </testset>
69
+ </testset>
data/cockpit/testsets/Linear.xml CHANGED
@@ -1,58 +1,77 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <positions><!--{{{-->
2
+ <positions>
3
+ <!--{{{-->
4
4
  <a1>after</a1>
5
- </positions><!--}}}-->
5
+ </positions>
6
+ <!--}}}-->
6
7
  <attributes>
7
8
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
8
9
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
9
10
  <theme>default</theme>
10
11
  </attributes>
11
12
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
12
- <dataelements><!--{{{-->
13
+ <dataelements>
14
+ <!--{{{-->
13
15
  <x/>
14
- </dataelements><!--}}}-->
16
+ </dataelements>
17
+ <!--}}}-->
15
18
  <handlers/>
16
- <endpoints><!--{{{-->
19
+ <endpoints>
20
+ <!--{{{-->
17
21
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
18
- </endpoints><!--}}}-->
22
+ </endpoints>
23
+ <!--}}}-->
19
24
  <description>
20
- <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
25
+ <description xmlns="http://cpee.org/ns/description/1.0">
26
+ <!--{{{-->
21
27
  <call id="a1" endpoint="timeout">
22
- <parameters><!--{{{-->
28
+ <parameters>
29
+ <!--{{{-->
23
30
  <label>Step 1</label>
24
31
  <method>:post</method>
25
32
  <arguments>
26
33
  <timeout>2</timeout>
27
34
  </arguments>
28
- </parameters><!--}}}-->
29
- <finalize output="result">data.x += "a1,"</finalize>
35
+ </parameters>
36
+ <!--}}}-->
37
+ <code>
38
+ <finalize output="result">data.x += "a1,"</finalize>
39
+ </code>
30
40
  </call>
31
41
  <call id="a2" endpoint="timeout">
32
- <parameters><!--{{{-->
42
+ <parameters>
43
+ <!--{{{-->
33
44
  <label>Step 2</label>
34
45
  <method>:post</method>
35
46
  <arguments>
36
47
  <timeout>4</timeout>
37
48
  </arguments>
38
- </parameters><!--}}}-->
39
- <finalize output="result">data.x += "a2,"</finalize>
49
+ </parameters>
50
+ <!--}}}-->
51
+ <code>
52
+ <finalize output="result">data.x += "a2,"</finalize>
53
+ </code>
40
54
  </call>
41
55
  <call id="a3" endpoint="timeout">
42
- <parameters><!--{{{-->
56
+ <parameters>
57
+ <!--{{{-->
43
58
  <label>Step 3</label>
44
59
  <method>:post</method>
45
60
  <arguments>
46
61
  <timeout>4</timeout>
47
62
  </arguments>
48
- </parameters><!--}}}-->
49
- <finalize output="result">data.x += "a3,"</finalize>
63
+ </parameters>
64
+ <!--}}}-->
65
+ <code>
66
+ <finalize output="result">data.x += "a3,"</finalize>
67
+ </code>
50
68
  </call>
51
- </description><!--}}}-->
69
+ </description>
70
+ <!--}}}-->
52
71
  </description>
53
72
  <transformation>
54
- <description type='copy'/>
55
- <dataelements type='rest'/>
56
- <endpoints type='rest'/>
73
+ <description type="copy"/>
74
+ <dataelements type="rest"/>
75
+ <endpoints type="rest"/>
57
76
  </transformation>
58
- </testset>
77
+ </testset>
data/cockpit/testsets/Log.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <handlers>
4
3
  <handler url="http://solo.wst.univie.ac.at:9299/log">
@@ -22,10 +21,12 @@
22
21
  <mid>'sid-7F616193-69F1-4097-A107-FC87404AE047'</mid>
23
22
  <arguments/>
24
23
  </parameters>
25
- <finalize output="result">data.x = result["n"]</finalize>
24
+ <code>
25
+ <finalize output="result">data.x = result["n"]</finalize>
26
+ </code>
26
27
  </call>
27
28
  <choose mode="exclusive">
28
- <alternative condition="data.x >= 100" language="text/javascript">
29
+ <alternative condition="data.x &gt;= 100" language="text/javascript">
29
30
  <call id="a11" endpoint="timeout">
30
31
  <parameters>
31
32
  <label>Decision 2</label>
@@ -38,7 +39,7 @@
38
39
  </parameters>
39
40
  </call>
40
41
  </alternative>
41
- <alternative condition="100 > data.x" language="text/javascript">
42
+ <alternative condition="100 &gt; data.x" language="text/javascript">
42
43
  <call id="a10" endpoint="timeout">
43
44
  <parameters>
44
45
  <label>Decision 1</label>
@@ -58,9 +59,9 @@
58
59
  <method/>
59
60
  <type>:task</type>
60
61
  <mid>'sid-B93496AA-15AA-4239-B301-8899F47204EE'</mid>
61
- <arguments>
62
- <timeout>2</timeout>
63
- </arguments>
62
+ <arguments>
63
+ <timeout>2</timeout>
64
+ </arguments>
64
65
  </parameters>
65
66
  </call>
66
67
  <parallel wait="-1">
@@ -97,9 +98,9 @@
97
98
  <method/>
98
99
  <type>:task</type>
99
100
  <mid>'sid-4692423B-174F-4460-B034-19E0624C585E'</mid>
100
- <arguments>
101
- <timeout>2</timeout>
102
- </arguments>
101
+ <arguments>
102
+ <timeout>2</timeout>
103
+ </arguments>
103
104
  </parameters>
104
105
  </call>
105
106
  </description>
@@ -113,4 +114,4 @@
113
114
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
114
115
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Signavio</modeltype>
115
116
  </attributes>
116
- </testset>
117
+ </testset>
data/cockpit/testsets/Mangler 1.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <positions/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -12,34 +11,42 @@
12
11
  <description>
13
12
  <description xmlns="http://cpee.org/ns/description/1.0">
14
13
  <call id="a1" endpoint="timeout">
15
- <parameters><!--{{{-->
14
+ <parameters>
15
+ <!--{{{-->
16
16
  <method>:post</method>
17
17
  <arguments>
18
18
  <timeout>4</timeout>
19
19
  <bug>data.nasty</bug>
20
20
  </arguments>
21
- </parameters><!--}}}-->
22
- <finalize output="result">data.x += "done"</finalize>
21
+ </parameters>
22
+ <!--}}}-->
23
+ <code>
24
+ <finalize output="result">data.x += "done"</finalize>
25
+ </code>
23
26
  </call>
24
27
  <parallel wait="2">
25
28
  <parallel_branch>
26
29
  <call id="a2_1" endpoint="timeout">
27
- <parameters><!--{{{-->
30
+ <parameters>
31
+ <!--{{{-->
28
32
  <method>:post</method>
29
33
  <arguments>
30
34
  <timeout>6</timeout>
31
35
  </arguments>
32
- </parameters><!--}}}-->
36
+ </parameters>
37
+ <!--}}}-->
33
38
  </call>
34
39
  </parallel_branch>
35
40
  <parallel_branch>
36
41
  <call id="a2_2" endpoint="timeout">
37
- <parameters><!--{{{-->
42
+ <parameters>
43
+ <!--{{{-->
38
44
  <method>:post</method>
39
45
  <arguments>
40
46
  <timeout>2</timeout>
41
47
  </arguments>
42
- </parameters><!--}}}-->
48
+ </parameters>
49
+ <!--}}}-->
43
50
  </call>
44
51
  </parallel_branch>
45
52
  </parallel>
@@ -47,30 +54,34 @@
47
54
  <choose>
48
55
  <alternative condition="data.x != nil">
49
56
  <call id="a4_1" endpoint="timeout">
50
- <parameters><!--{{{-->
57
+ <parameters>
58
+ <!--{{{-->
51
59
  <method>:post</method>
52
60
  <arguments>
53
61
  <timeout>4</timeout>
54
62
  </arguments>
55
- </parameters><!--}}}-->
63
+ </parameters>
64
+ <!--}}}-->
56
65
  </call>
57
66
  </alternative>
58
67
  <otherwise>
59
68
  <call id="a4_2" endpoint="timeout">
60
- <parameters><!--{{{-->
69
+ <parameters>
70
+ <!--{{{-->
61
71
  <method>:post</method>
62
72
  <arguments>
63
73
  <timeout>10</timeout>
64
74
  </arguments>
65
- </parameters><!--}}}-->
75
+ </parameters>
76
+ <!--}}}-->
66
77
  </call>
67
78
  </otherwise>
68
79
  </choose>
69
80
  </description>
70
81
  </description>
71
82
  <transformation>
72
- <description type='copy'/>
73
- <dataelements type='rest'/>
74
- <endpoints type='rest'/>
83
+ <description type="copy"/>
84
+ <dataelements type="rest"/>
85
+ <endpoints type="rest"/>
75
86
  </transformation>
76
- </testset>
87
+ </testset>
data/cockpit/testsets/Mangler 2.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <positions/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -27,11 +26,13 @@
27
26
  <persons>data.persons</persons>
28
27
  </arguments>
29
28
  </parameters>
30
- <finalize output="result">data.airline = result.value('id')
29
+ <code>
30
+ <finalize output="result">data.airline = result.value('id')
31
31
  data.costs += result.value('costs').to_f</finalize>
32
+ </code>
32
33
  </call>
33
34
  <parallel>
34
- <loop mode="pre_test" condition="data.persons > 0">
35
+ <loop mode="pre_test" condition="data.persons &gt; 0">
35
36
  <parallel_branch pass="data.persons" local="p">
36
37
  <call id="a2" endpoint="bookHotel">
37
38
  <parameters>
@@ -40,13 +41,15 @@ data.costs += result.value('costs').to_f</finalize>
40
41
  <to>data.to</to>
41
42
  </arguments>
42
43
  </parameters>
43
- <finalize output="result">data.hotels &lt;&lt; result.value('id')
44
+ <code>
45
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
44
46
  data.costs += result.value('costs').to_f</finalize>
47
+ </code>
45
48
  </call>
46
49
  </parallel_branch>
47
50
  <manipulate id="a3">data.persons -= 1</manipulate>
48
51
  </loop>
49
- <loop mode="pre_test" condition="data.persons > 0">
52
+ <loop mode="pre_test" condition="data.persons &gt; 0">
50
53
  <parallel_branch pass="data.persons" local="p">
51
54
  <call id="a4" endpoint="bookHotel">
52
55
  <parameters>
@@ -55,8 +58,10 @@ data.costs += result.value('costs').to_f</finalize>
55
58
  <to>data.to</to>
56
59
  </arguments>
57
60
  </parameters>
58
- <finalize output="result">data.hotels &lt;&lt; result.value('id')
61
+ <code>
62
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
59
63
  data.costs += result.value('costs').to_f</finalize>
64
+ </code>
60
65
  </call>
61
66
  </parallel_branch>
62
67
  <parallel_branch pass="data.persons" local="p">
@@ -67,15 +72,17 @@ data.costs += result.value('costs').to_f</finalize>
67
72
  <to>data.to</to>
68
73
  </arguments>
69
74
  </parameters>
70
- <finalize output="result">data.hotels &lt;&lt; result.value('id')
75
+ <code>
76
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
71
77
  data.costs += result.value('costs').to_f</finalize>
78
+ </code>
72
79
  </call>
73
80
  </parallel_branch>
74
81
  <manipulate id="a6">data.persons -= 1</manipulate>
75
82
  </loop>
76
83
  </parallel>
77
84
  <choose>
78
- <alternative condition="data.costs > 700">
85
+ <alternative condition="data.costs &gt; 700">
79
86
  <call id="a7" endpoint="approve">
80
87
  <parameters>
81
88
  <method>:post</method>
@@ -89,8 +96,8 @@ data.costs += result.value('costs').to_f</finalize>
89
96
  </description>
90
97
  </description>
91
98
  <transformation>
92
- <description type='copy'/>
93
- <dataelements type='rest'/>
94
- <endpoints type='rest'/>
99
+ <description type="copy"/>
100
+ <dataelements type="rest"/>
101
+ <endpoints type="rest"/>
95
102
  </transformation>
96
- </testset>
103
+ </testset>