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
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <attributes>
4
3
  <info>Syncing Instance 3</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>16</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>
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <attributes>
4
3
  <info>Syncing</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>
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <positions/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -12,102 +11,120 @@
12
11
  <description xmlns="http://cpee.org/ns/description/1.0">
13
12
  <parallel>
14
13
  <parallel_branch>
15
- <loop mode="pre_test" condition='data.feedback'>
14
+ <loop mode="pre_test" condition="data.feedback">
16
15
  <call id="publish" endpoint="timeout">
17
- <parameters><!--{{{-->
16
+ <parameters>
17
+ <!--{{{-->
18
18
  <method>:post</method>
19
19
  <arguments>
20
20
  <timeout>1</timeout>
21
21
  </arguments>
22
- </parameters><!--}}}-->
22
+ </parameters>
23
+ <!--}}}-->
23
24
  </call>
24
25
  <choose>
25
26
  <alternative condition="data.x != nil">
26
27
  <call id="a4_1" endpoint="timeout">
27
- <parameters><!--{{{-->
28
+ <parameters>
29
+ <!--{{{-->
28
30
  <method>:post</method>
29
31
  <arguments>
30
32
  <timeout>4</timeout>
31
33
  </arguments>
32
- </parameters><!--}}}-->
34
+ </parameters>
35
+ <!--}}}-->
33
36
  </call>
34
37
  </alternative>
35
38
  <otherwise>
36
39
  <call id="a4_2" endpoint="timeout">
37
- <parameters><!--{{{-->
40
+ <parameters>
41
+ <!--{{{-->
38
42
  <method>:post</method>
39
43
  <arguments>
40
44
  <timeout>10</timeout>
41
45
  </arguments>
42
- </parameters><!--}}}-->
46
+ </parameters>
47
+ <!--}}}-->
43
48
  </call>
44
49
  </otherwise>
45
50
  </choose>
46
51
  <choose>
47
52
  <alternative condition="data.x != nil">
48
53
  <call id="a4_1" endpoint="timeout">
49
- <parameters><!--{{{-->
54
+ <parameters>
55
+ <!--{{{-->
50
56
  <method>:post</method>
51
57
  <arguments>
52
58
  <timeout>4</timeout>
53
59
  </arguments>
54
- </parameters><!--}}}-->
60
+ </parameters>
61
+ <!--}}}-->
55
62
  </call>
56
63
  </alternative>
57
64
  <otherwise>
58
65
  <call id="a4_2" endpoint="timeout">
59
- <parameters><!--{{{-->
66
+ <parameters>
67
+ <!--{{{-->
60
68
  <method>:post</method>
61
69
  <arguments>
62
70
  <timeout>10</timeout>
63
71
  </arguments>
64
- </parameters><!--}}}-->
72
+ </parameters>
73
+ <!--}}}-->
65
74
  </call>
66
75
  </otherwise>
67
76
  </choose>
68
77
  </loop>
69
78
  <call id="a4_1" endpoint="timeout">
70
- <parameters><!--{{{-->
79
+ <parameters>
80
+ <!--{{{-->
71
81
  <method>:post</method>
72
82
  <arguments>
73
83
  <timeout>4</timeout>
74
84
  </arguments>
75
- </parameters><!--}}}-->
85
+ </parameters>
86
+ <!--}}}-->
76
87
  </call>
77
88
  </parallel_branch>
78
89
  <parallel_branch>
79
- <loop mode="pre_test" condition='data.feedback'>
90
+ <loop mode="pre_test" condition="data.feedback">
80
91
  <call id="prepare" endpoint="timeout">
81
- <parameters><!--{{{-->
92
+ <parameters>
93
+ <!--{{{-->
82
94
  <method>:post</method>
83
95
  <arguments>
84
96
  <timeout>4</timeout>
85
97
  </arguments>
86
- </parameters><!--}}}-->
98
+ </parameters>
99
+ <!--}}}-->
87
100
  </call>
88
101
  <parallel>
89
102
  <choose>
90
103
  <parallel_branch>
91
104
  <alternative condition="data.x != nil">
92
105
  <call id="a4_1" endpoint="timeout">
93
- <parameters><!--{{{-->
106
+ <parameters>
107
+ <!--{{{-->
94
108
  <method>:post</method>
95
109
  <arguments>
96
110
  <timeout>4</timeout>
97
111
  </arguments>
98
- </parameters><!--}}}-->
112
+ </parameters>
113
+ <!--}}}-->
99
114
  </call>
100
115
  </alternative>
101
116
  </parallel_branch>
102
117
  <parallel_branch>
103
118
  <alternative condition="data.x.nil?">
104
119
  <call id="a4_2" endpoint="timeout">
105
- <parameters><!--{{{-->
120
+ <parameters>
121
+ <!--{{{-->
106
122
  <method>:post</method>
107
123
  <arguments>
108
124
  <timeout>10</timeout>
109
125
  </arguments>
110
- </parameters><!--}}}-->
126
+ </parameters>
127
+ <!--}}}-->
111
128
  </call>
112
129
  </alternative>
113
130
  </parallel_branch>
@@ -116,24 +133,28 @@
116
133
  <parallel_branch>
117
134
  <alternative condition="data.x != nil">
118
135
  <call id="a4_1" endpoint="timeout">
119
- <parameters><!--{{{-->
136
+ <parameters>
137
+ <!--{{{-->
120
138
  <method>:post</method>
121
139
  <arguments>
122
140
  <timeout>4</timeout>
123
141
  </arguments>
124
- </parameters><!--}}}-->
142
+ </parameters>
143
+ <!--}}}-->
125
144
  </call>
126
145
  </alternative>
127
146
  </parallel_branch>
128
147
  <parallel_branch>
129
148
  <alternative condition="data.x.nil?">
130
149
  <call id="a4_2" endpoint="timeout">
131
- <parameters><!--{{{-->
150
+ <parameters>
151
+ <!--{{{-->
132
152
  <method>:post</method>
133
153
  <arguments>
134
154
  <timeout>10</timeout>
135
155
  </arguments>
136
- </parameters><!--}}}-->
156
+ </parameters>
157
+ <!--}}}-->
137
158
  </call>
138
159
  </alternative>
139
160
  </parallel_branch>
@@ -145,8 +166,8 @@
145
166
  </description>
146
167
  </description>
147
168
  <transformation>
148
- <description type='copy'/>
149
- <dataelements type='rest'/>
150
- <endpoints type='rest'/>
169
+ <description type="copy"/>
170
+ <dataelements type="rest"/>
171
+ <endpoints type="rest"/>
151
172
  </transformation>
152
- </testset>
173
+ </testset>
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <positions/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -14,112 +13,152 @@
14
13
  <parallel>
15
14
  <parallel_branch>
16
15
  <call id="b1_a01" endpoint="services">
17
- <parameters><!--{{{-->
16
+ <parameters>
17
+ <!--{{{-->
18
18
  <service/>
19
19
  <parameters>
20
20
  <op1>data.wait</op1>
21
21
  </parameters>
22
- </parameters><!--}}}-->
23
- <finalize output="result">data.wait -= 1</finalize>
22
+ </parameters>
23
+ <!--}}}-->
24
+ <code>
25
+ <finalize output="result">data.wait -= 1</finalize>
26
+ </code>
24
27
  </call>
25
28
  <manipulate id="b1_a02">data.wait += 1</manipulate>
26
29
  <parallel>
27
30
  <parallel_branch>
28
31
  <call id="b1_a03" endpoint="services">
29
- <parameters><!--{{{-->
32
+ <parameters>
33
+ <!--{{{-->
30
34
  <service/>
31
35
  <parameters>
32
36
  <op1>data.wait</op1>
33
37
  </parameters>
34
- </parameters><!--}}}-->
35
- <finalize output="result">data.wait -= 1</finalize>
38
+ </parameters>
39
+ <!--}}}-->
40
+ <code>
41
+ <finalize output="result">data.wait -= 1</finalize>
42
+ </code>
36
43
  </call>
37
44
  <call id="b1_a04" endpoint="services">
38
- <parameters><!--{{{-->
45
+ <parameters>
46
+ <!--{{{-->
39
47
  <service/>
40
48
  <parameters>
41
49
  <op1>data.wait</op1>
42
50
  </parameters>
43
- </parameters><!--}}}-->
44
- <finalize output="result">data.wait -= 1</finalize>
51
+ </parameters>
52
+ <!--}}}-->
53
+ <code>
54
+ <finalize output="result">data.wait -= 1</finalize>
55
+ </code>
45
56
  </call>
46
57
  <manipulate id="b1_a05">data.wait += 1</manipulate>
47
58
  </parallel_branch>
48
59
  <parallel_branch>
49
60
  <call id="b1_a06" endpoint="services">
50
- <parameters><!--{{{-->
61
+ <parameters>
62
+ <!--{{{-->
51
63
  <service/>
52
64
  <parameters>
53
65
  <op1>data.wait</op1>
54
66
  </parameters>
55
- </parameters><!--}}}-->
56
- <finalize output="result">data.wait -= 1</finalize>
67
+ </parameters>
68
+ <!--}}}-->
69
+ <code>
70
+ <finalize output="result">data.wait -= 1</finalize>
71
+ </code>
57
72
  </call>
58
73
  <manipulate id="b1_a07">data.wait += 1</manipulate>
59
74
  <call id="b1_a08" endpoint="services">
60
- <parameters><!--{{{-->
75
+ <parameters>
76
+ <!--{{{-->
61
77
  <service/>
62
78
  <parameters>
63
79
  <op1>data.wait</op1>
64
80
  </parameters>
65
- </parameters><!--}}}-->
66
- <finalize output="result">data.wait -= 1</finalize>
81
+ </parameters>
82
+ <!--}}}-->
83
+ <code>
84
+ <finalize output="result">data.wait -= 1</finalize>
85
+ </code>
67
86
  </call>
68
87
  </parallel_branch>
69
88
  </parallel>
70
89
  </parallel_branch>
71
90
  <parallel_branch>
72
91
  <call id="b2_a01" endpoint="services">
73
- <parameters><!--{{{-->
92
+ <parameters>
93
+ <!--{{{-->
74
94
  <service/>
75
95
  <parameters>
76
96
  <op1>data.wait</op1>
77
97
  </parameters>
78
- </parameters><!--}}}-->
79
- <finalize output="result">data.wait -= 1</finalize>
98
+ </parameters>
99
+ <!--}}}-->
100
+ <code>
101
+ <finalize output="result">data.wait -= 1</finalize>
102
+ </code>
80
103
  </call>
81
104
  <manipulate id="b2_a02">data.wait += 1</manipulate>
82
105
  <parallel>
83
106
  <parallel_branch>
84
107
  <call id="b2_a03" endpoint="services">
85
- <parameters><!--{{{-->
108
+ <parameters>
109
+ <!--{{{-->
86
110
  <service/>
87
111
  <parameters>
88
112
  <op1>data.wait</op1>
89
113
  </parameters>
90
- </parameters><!--}}}-->
91
- <finalize output="result">data.wait -= 1</finalize>
114
+ </parameters>
115
+ <!--}}}-->
116
+ <code>
117
+ <finalize output="result">data.wait -= 1</finalize>
118
+ </code>
92
119
  </call>
93
120
  <call id="b2_a04" endpoint="services">
94
- <parameters><!--{{{-->
121
+ <parameters>
122
+ <!--{{{-->
95
123
  <service/>
96
124
  <parameters>
97
125
  <op1>data.wait</op1>
98
126
  </parameters>
99
- </parameters><!--}}}-->
100
- <finalize output="result">data.wait -= 1</finalize>
127
+ </parameters>
128
+ <!--}}}-->
129
+ <code>
130
+ <finalize output="result">data.wait -= 1</finalize>
131
+ </code>
101
132
  </call>
102
133
  <manipulate id="b2_a05">data.wait += 1</manipulate>
103
134
  </parallel_branch>
104
135
  <parallel_branch>
105
136
  <call id="b2_a06" endpoint="services">
106
- <parameters><!--{{{-->
137
+ <parameters>
138
+ <!--{{{-->
107
139
  <service/>
108
140
  <parameters>
109
141
  <op1>data.wait</op1>
110
142
  </parameters>
111
- </parameters><!--}}}-->
112
- <finalize output="result">data.wait -= 1</finalize>
143
+ </parameters>
144
+ <!--}}}-->
145
+ <code>
146
+ <finalize output="result">data.wait -= 1</finalize>
147
+ </code>
113
148
  </call>
114
149
  <manipulate id="b2_a07">data.wait += 1</manipulate>
115
150
  <call id="b2_a08" endpoint="services">
116
- <parameters><!--{{{-->
151
+ <parameters>
152
+ <!--{{{-->
117
153
  <service/>
118
154
  <parameters>
119
155
  <op1>data.wait</op1>
120
156
  </parameters>
121
- </parameters><!--}}}-->
122
- <finalize output="result">data.wait -= 1</finalize>
157
+ </parameters>
158
+ <!--}}}-->
159
+ <code>
160
+ <finalize output="result">data.wait -= 1</finalize>
161
+ </code>
123
162
  </call>
124
163
  </parallel_branch>
125
164
  </parallel>
@@ -128,8 +167,8 @@
128
167
  </description>
129
168
  </description>
130
169
  <transformation>
131
- <description type='copy'/>
132
- <dataelements type='rest'/>
133
- <endpoints type='rest'/>
170
+ <description type="copy"/>
171
+ <dataelements type="rest"/>
172
+ <endpoints type="rest"/>
134
173
  </transformation>
135
- </testset>
174
+ </testset>