diff options
| author | tjung | 2012-09-05 19:30:47 +0000 |
|---|---|---|
| committer | tjung | 2012-09-05 19:30:47 +0000 |
| commit | 873d1ba8fc0592de341acec91d254940b8d4f591 (patch) | |
| tree | 3e4e90b7098a27c6d46b64be04c6866a1c6dd2bd | |
| parent | 81ef5727dc72a471e08c7d1ec778c0ff485a178b (diff) | |
| parent | 0eca831da96301904c0330cf90f5e20159bd103f (diff) | |
| download | org.eclipse.etrice-873d1ba8fc0592de341acec91d254940b8d4f591.tar.gz org.eclipse.etrice-873d1ba8fc0592de341acec91d254940b8d4f591.tar.xz org.eclipse.etrice-873d1ba8fc0592de341acec91d254940b8d4f591.zip | |
Merge branch 'master' of ssh://tjung@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git
43 files changed, 991 insertions, 185 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend index ad81991e2..cd7c85c8c 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend @@ -208,6 +208,7 @@ class ActorClassGen extends GenericActorClassGenerator { #include "modelbase/etActor.h"
#include "debugging/etLogger.h"
#include "debugging/etMSCLogger.h"
+ #include "etUnit/etUnit.h"
#include "platform/etMemory.h"
«FOR pc : root.getReferencedProtocolClasses(ac)»
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java index 5e1afeec5..c174aa5c4 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java @@ -614,6 +614,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("#include \"debugging/etMSCLogger.h\"");
_builder.newLine();
+ _builder.append("#include \"etUnit/etUnit.h\"");
+ _builder.newLine();
_builder.append("#include \"platform/etMemory.h\"");
_builder.newLine();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend index ae3ff2919..08b4c2bd3 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend @@ -359,9 +359,10 @@ class RoomExtensions { def List<State> getLeafStateList(StateGraph sg) {
var ArrayList<State> res = new ArrayList<State>()
- for (s : sg.states) {
- res.addAll(s.leafStateList)
- }
+ if (sg!=null)
+ for (s : sg.states) {
+ res.addAll(s.leafStateList)
+ }
return res
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java index 4c863e418..055bfe44e 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java @@ -524,10 +524,13 @@ public class RoomExtensions { public List<State> getLeafStateList(final StateGraph sg) {
ArrayList<State> _arrayList = new ArrayList<State>();
ArrayList<State> res = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State s : _states) {
- List<State> _leafStateList = this.getLeafStateList(s);
- res.addAll(_leafStateList);
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
+ EList<State> _states = sg.getStates();
+ for (final State s : _states) {
+ List<State> _leafStateList = this.getLeafStateList(s);
+ res.addAll(_leafStateList);
+ }
}
return res;
}
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip Binary files differindex 880d91876..363b4cadc 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip Binary files differindex 535501ecb..ce4c0e8b6 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip Binary files differindex 2d8b4cac8..c179c7c37 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip diff --git a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timingC/ATimingService.c b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timingC/ATimingService.c index 9795290bc..b401b16e5 100644 --- a/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timingC/ATimingService.c +++ b/runtime/org.eclipse.etrice.modellib.c/src-gen/room/basic/service/timingC/ATimingService.c @@ -10,6 +10,7 @@ #include "modelbase/etActor.h"
#include "debugging/etLogger.h"
#include "debugging/etMSCLogger.h"
+#include "etUnit/etUnit.h"
#include "platform/etMemory.h"
#include "PTimer.h"
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java index facd9a193..f12c4f957 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/org/eclipse/etrice/modellib/Socket/SocketClient.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.modellib.Socket.PSocket.*;
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java index cd951a06f..d465a3998 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.logging.Log.*;
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java index 9db63d5a1..bb9056314 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.tcp.PTcpControl.*;
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java index b2d837cc7..3d792e83b 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.tcp.PTcpControl.*;
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java index 34ebfdc48..6c5373263 100644 --- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java +++ b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.PTimeout.*;
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c index 717154200..076b056a7 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c @@ -254,6 +254,10 @@ void expectOrderEnd(etInt16 id, const char* message, etInt16 identifier, const c }
}
+etBool etUnit_isSuccess(etInt16 id) {
+ return etUnit_testcaseSuccess[id];
+}
+
/* private functions */
static void expect_equal_int(etInt16 id, const char* message, etInt32 expected, etInt32 actual, const char* file, int line) {
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h index 7ce12b8d3..7f9f03fb2 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h @@ -23,6 +23,7 @@ void etUnit_openTestSuite(const char* testSuiteName); void etUnit_closeTestSuite(void);
etInt16 etUnit_openTestCase(const char* testCaseName);
void etUnit_closeTestCase(etInt16 id);
+etBool etUnit_isSuccess(etInt16 id);
/* functions for more convenience for model and generator tests */
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java index 80a4985cc..04233a314 100644 --- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java +++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java @@ -275,6 +275,10 @@ public class EtUnit { }
}
+ public static boolean etUnit_isSuccess(int id) {
+ return !failed.contains(id);
+ }
+
private static void etUnit_handleExpect(int id, boolean result, String resulttext, String exp, String act) {
if (result) {
/* nothing to do because no failure */
diff --git a/tests/org.eclipse.etrice.integration.tests/.gitignore b/tests/org.eclipse.etrice.integration.tests/.gitignore index f68b3dddc..fb250f6fe 100644 --- a/tests/org.eclipse.etrice.integration.tests/.gitignore +++ b/tests/org.eclipse.etrice.integration.tests/.gitignore @@ -1,2 +1,2 @@ bin
-
+tmp/*.etu
diff --git a/tests/org.eclipse.etrice.integration.tests/generate.xml b/tests/org.eclipse.etrice.integration.tests/generate.xml index 05a76795c..fcb2185d4 100644 --- a/tests/org.eclipse.etrice.integration.tests/generate.xml +++ b/tests/org.eclipse.etrice.integration.tests/generate.xml @@ -3,7 +3,7 @@ <target name="set_tp" unless="target.platform">
<echo>using local target platform</echo>
- <property name="target.platform" value="C:\Users\hrentz\Downloads\eclipse\Indigo\target\eclipse-modeling-indigo-win32\eclipse"/>
+ <property name="target.platform" value="C:\Users\hrentz\Downloads\eclipse\Juno\eclipse-modeling-juno-win32\eclipse"/>
<property name="model.path" value="./model"/>
</target>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior new file mode 100644 index 000000000..26382fb62 --- /dev/null +++ b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior @@ -0,0 +1,826 @@ +<?xml version="1.0" encoding="ASCII"?>
+<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of HandlerUser" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.0/@children.4/@children.1/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.1/@children.5/@children.1/@link //@children.2/@children.3/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link //@connections.8/@link //@connections.9/@link //@connections.10/@link //@connections.11/@link //@connections.12/@link //@connections.13/@link //@connections.14/@link //@connections.15/@link //@connections.16/@link //@connections.17/@link //@connections.18/@link //@connections.19/@link //@connections.20/@link //@connections.21/@link" verticalGridUnit="10" version="0.9.0">
+ <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerUser"/>
+ </link>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="sg"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$sg"/>
+ </link>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="trp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$sg"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.14" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="htp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="226">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$tp0"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.12 //@connections.17 //@connections.18" incomingConnections="//@connections.12 //@connections.18"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="tp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="492">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$tp1"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.13 //@connections.16 //@connections.21" incomingConnections="//@connections.13 //@connections.16"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp1"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="100" y="120">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.15" incomingConnections="//@connections.17 //@connections.20" referencedGraphicsAlgorithm="//@children.0/@children.4/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="entp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="42">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="11" height="11" x="25" y="25"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
+ <points x="27" y="33"/>
+ <points x="33" y="27"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
+ <points x="27" y="27"/>
+ <points x="33" y="33"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$tp2"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.14" referencedGraphicsAlgorithm="//@children.0/@children.4/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="22" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp2"/>
+ </children>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="366" y="366">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$testOk"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.21"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="testOk"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="561" y="349">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state1"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.19" referencedGraphicsAlgorithm="//@children.0/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" visible="true" active="true">
+ <properties key="obj-type" value="trp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="507" y="265">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ChoicePoint:HandlerUser$cp1"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.19 //@connections.20" incomingConnections="//@connections.15"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
+ </children>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="sg"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$sg"/>
+ </link>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/state0"/>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$sg"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8" referencedGraphicsAlgorithm="//@children.1/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="htp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="160">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$state0$tp0"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3 //@connections.7" incomingConnections="//@connections.3 //@connections.7"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="tp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="360">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$state0$tp1"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4 //@connections.10 //@connections.11" incomingConnections="//@connections.4"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp1"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="entp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="560">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
+ <points x="33" y="47"/>
+ <points x="47" y="33"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
+ <points x="33" y="33"/>
+ <points x="47" y="47"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$tp2"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp2"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="206" y="120">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state1"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2 //@connections.9" incomingConnections="//@connections.9 //@connections.10" referencedGraphicsAlgorithm="//@children.1/@children.5/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="entp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="27">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="11" height="11" x="25" y="25"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
+ <points x="27" y="33"/>
+ <points x="33" y="27"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
+ <points x="27" y="27"/>
+ <points x="33" y="33"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$state1$tp0"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6" referencedGraphicsAlgorithm="//@children.1/@children.5/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="22" font="//@fonts.0" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
+ </children>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="472" y="120">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state2"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5" incomingConnections="//@connections.2 //@connections.5 //@connections.8 //@connections.11" referencedGraphicsAlgorithm="//@children.1/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state2"/>
+ </children>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="sg"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$state1$sg"/>
+ </link>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/state0/state1"/>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$state1$sg"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1" referencedGraphicsAlgorithm="//@children.2/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="trp"/>
+ <properties key="item-kind" value="entp"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="360">
+ <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
+ <points x="33" y="47"/>
+ <points x="47" y="33"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
+ <points x="33" y="33"/>
+ <points x="47" y="47"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$state1$tp0"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
+ </children>
+ </children>
+ <children xsi:type="pi:ContainerShape" active="true">
+ <properties key="obj-type" value="state"/>
+ <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="340" y="120">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="-3" y="-3"/>
+ <points x="-3" y="3"/>
+ <points x="-11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
+ <points x="3" y="-3"/>
+ <points x="3" y="3"/>
+ <points x="11" y="3"/>
+ </graphicsAlgorithmChildren>
+ <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
+ <points x="-2" y="-3"/>
+ <points x="-2" y="3"/>
+ <points x="2" y="3"/>
+ <points x="2" y="-3"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state1$state7"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0 //@connections.1" referencedGraphicsAlgorithm="//@children.2/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children>
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state7"/>
+ </children>
+ </children>
+ </children>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.2/@children.2/@anchors.0" end="//@children.2/@children.3/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$state0$state1$tr0"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: "/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.2/@children.1/@anchors.0" end="//@children.2/@children.3/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$state0$state1$initial"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.5/@anchors.0" end="//@children.1/@children.6/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr0"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.1" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: <msg5:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.1/@children.2/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr1"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: <msg3:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="240" y="200"/>
+ <bendpoints x="240" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.3/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr2"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr2: <msg4:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="440" y="200"/>
+ <bendpoints x="440" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.6/@anchors.0" end="//@children.1/@children.6/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr3"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr3: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="572" y="325"/>
+ <bendpoints x="572" y="325"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.4/@anchors.0" end="//@children.1/@children.5/@children.1/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$state0$tr4"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr4: "/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.1/@children.2/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr5"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr5: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="240" y="200"/>
+ <bendpoints x="240" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.1/@anchors.0" end="//@children.1/@children.6/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$state0$initial"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.5/@anchors.0" end="//@children.1/@children.5/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr6"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr6: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="306" y="325"/>
+ <bendpoints x="306" y="325"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.5/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr7"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr7: <msg2:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.6/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr8"/>
+ </link>
+ <connectionDecorators locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr8: <msg2:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr0"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="306" y="200"/>
+ <bendpoints x="306" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.3/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr1"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="572" y="200"/>
+ <bendpoints x="572" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.4/@children.1/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$initial"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.4/@anchors.0" end="//@children.0/@children.7/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr9"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr9: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.3/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr5"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr5: <msg2:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="572" y="200"/>
+ <bendpoints x="572" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.4/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr7"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr7: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr6"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr6: <msg1:TestPort1..."/>
+ </connectionDecorators>
+ <bendpoints x="306" y="200"/>
+ <bendpoints x="306" y="200"/>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.6/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$tr8"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr8: [else]"/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.4/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#CPBranchTransition:HandlerUser$tr10"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr10: [p1!=4]"/>
+ </connectionDecorators>
+ </connections>
+ <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.5/@anchors.0">
+ <properties key="obj-type" value="trans"/>
+ <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
+ <link>
+ <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr4"/>
+ </link>
+ <connectionDecorators visible="true" locationRelative="true" location="1.0">
+ <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
+ <points x="-15" y="5"/>
+ <points/>
+ <points x="-15" y="-5"/>
+ </graphicsAlgorithm>
+ </connectionDecorators>
+ <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
+ <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr4: <msg6:TestPort1..."/>
+ </connectionDecorators>
+ </connections>
+ <colors red="227" green="238" blue="249"/>
+ <colors red="255" green="255" blue="255"/>
+ <colors/>
+ <colors red="200" green="200" blue="200"/>
+ <fonts name="Arial" size="8"/>
+ <fonts name="Arial" size="9" bold="true"/>
+</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room index ea4877012..1a50037e9 100644 --- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room +++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room @@ -29,21 +29,22 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { ActorClass HandlerUser {
Interface {
Port TestPort1: TestProtocol
-
-
}
Structure {
usercode1{
- "import org.eclipse.etrice.integration.tests.helpers.*;"
"import org.eclipse.etrice.runtime.java.messaging.RTServices;"
}
- usercode2 {
- "private CRC16Generator crcGen = new CRC16Generator();"
- }
external Port TestPort1
Attribute counter: int32
+ Attribute caseId: int32
}
Behavior {
+ Operation HandlerUser() {
+ "caseId = etUnit_openAll(\"tmp\", \"HandlerTest.etu\", \"HandlerTest_suite\", \"HandlerTest_case\");"
+ }
+ Operation ~HandlerUser() {
+ "etUnit_closeAll(caseId);"
+ }
StateMachine {
Transition tr0: my tp0 -> my tp0 {
triggers {
@@ -51,7 +52,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"top level handler action no guard \");"
- "crcGen.update(11);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 11);"
}
}
Transition tr1: my tp1 -> my tp1 {
@@ -62,28 +63,14 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"top level self transition action P1=>3\");"
- "crcGen.update(12);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 12);"
}
}
Transition init: initial -> tp2 of state0 {
action {
"System.out.println(\"top level initial transition\");"
- "crcGen.update(10);"
- }
- }
- Transition tr2: cp cp0 -> testFalse {
- action {
- "System.out.println(\"Test false\");"
- "RTServices.getInstance().getSubSystem().testFinished(1);"
- }
- }
- Transition tr3: cp cp0 -> testOk {
- cond {
- "crcGen.getCrc()==7268"
- }
- action {
- "System.out.println(\"Test ok\");"
- "RTServices.getInstance().getSubSystem().testFinished(0);"
+ "int list[] = {13,15,16,22,23,11,24,17,14,12,13,16,23,70,24,17,14,114,113,111,11,70,24,17,120,16,23,24,17,121,18,19,25,18,20,19,21,18,19,25,18,19,14,117};"
+ "EXPECT_ORDER_START(caseId, list, list.length);"
}
}
Transition tr9: state0 -> cp cp1 {
@@ -94,7 +81,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"tr9 transition action\");"
- "crcGen.update(114);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 114);"
}
}
Transition tr5: my tp1 -> my tp1 {
@@ -105,7 +92,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"top level self transition action P1=>4\");"
- "crcGen.update(50);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 50);"
}
}
Transition tr7: my tp0 -> state0 {
@@ -116,7 +103,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"top level handler action p1=>7 \");"
- "crcGen.update(70);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 70);"
}
}
Transition tr6: my tp0 -> my tp0 {
@@ -127,13 +114,13 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"top level handler action p1=>12 \");"
- "crcGen.update(110);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 110);"
}
}
Transition tr8: cp cp1 -> state1 {
action {
"System.out.println(\"tr8 transition action\");"
- "crcGen.update(113);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 113);"
}
}
Transition tr10: cp cp1 -> state0 {
@@ -142,31 +129,29 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"tr4 transition action\");"
- "crcGen.update(115);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 115);"
}
}
- Transition tr4: my tp1 -> cp cp0 {
+ Transition tr4: my tp1 -> testOk {
triggers {
<msg6: TestPort1>
}
action {
"System.out.println(\"tp1 transition to choice action\");"
- "crcGen.update(117);"
- "System.out.printf(\"CRC: %d \\n\", crcGen.getCrc());"
+ "EXPECT_ORDER_END(caseId, \"<|MODEL_LOCATION|>\", 117);"
}
}
- ChoicePoint cp0
ChoicePoint cp1
handler TransitionPoint tp0
TransitionPoint tp1
State state0 {
entry {
"System.out.println(\"state 0 entry action\");"
- "crcGen.update(13);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 13);"
}
exit {
"System.out.println(\"state 0 exit action\");"
- "crcGen.update(14);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 14);"
}
subgraph {
Transition tr0: state1 -> state2 {
@@ -180,7 +165,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0 handler action no guard\");"
- "crcGen.update(20);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 20);"
}
}
Transition tr2: my tp1 -> my tp1 {
@@ -189,7 +174,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0 tp1 self transition action\");"
- "crcGen.update(21);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 21);"
}
}
Transition tr3: state2 -> state2 {
@@ -198,13 +183,13 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0/2 self transition action\");"
- "crcGen.update(25);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 25);"
}
}
Transition tr4: my tp2 -> tp0 of state1 {
action {
"System.out.println(\"state 0 tp2 transition action\");"
- "crcGen.update(15);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 15);"
}
}
Transition tr5: my tp0 -> my tp0 {
@@ -215,13 +200,13 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0 handler action P1 => 5\");"
- "crcGen.update(52);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 52);"
}
}
Transition init: initial -> state2 {
action {
"System.out.println(\"state 0 initial transition\");"
- "crcGen.update(53);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 53);"
}
}
Transition tr6: state1 -> state1 {
@@ -232,7 +217,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0/1 self transition\");"
- "crcGen.update(54);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 54);"
}
}
Transition tr7: my tp1 -> state1 {
@@ -243,7 +228,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0 tp1 p1=>5\");"
- "crcGen.update(120);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 120);"
}
}
Transition tr8: my tp1 -> state2 {
@@ -254,7 +239,7 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { }
action {
"System.out.println(\"state 0 tp1 action P1 => 6\");"
- "crcGen.update(121);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 121);"
}
}
handler TransitionPoint tp0
@@ -263,34 +248,34 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { State state1 {
entry {
"System.out.println(\"state 0/1 entry action\");"
- "crcGen.update(16);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 16);"
}
exit {
"System.out.println(\"state 0/1 exit action\");"
- "crcGen.update(17);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 17);"
}
subgraph {
Transition tr0: my tp0 -> state7 {
action {
"System.out.println(\"state 0/1 transition entry action\");"
- "crcGen.update(22);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 22);"
}
}
Transition init: initial -> state7 {
action {
"System.out.println(\"state 0/1 initial transition\");"
- "crcGen.update(121);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 121);"
}
}
EntryPoint tp0
State state7 {
entry {
"System.out.println(\"state 0/1/7 entry action\");"
- "crcGen.update(23);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 23);"
}
exit {
"System.out.println(\"state 0/1/7 exit action\");"
- "crcGen.update(24);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 24);"
}
}
}
@@ -298,25 +283,29 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { State state2 {
entry {
"System.out.println(\"state 0/2 entry action\");"
- "crcGen.update(18);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 18);"
}
exit {
"System.out.println(\"state 0/2 exit action\");"
- "crcGen.update(19);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 19);"
}
}
}
}
- State testOk
- State testFalse
+ State testOk {
+ entry {
+ "System.out.println(\"Test ok\");"
+ "RTServices.getInstance().getSubSystem().testFinished(etUnit_isSuccess(caseId)?0:1);"
+ }
+ }
State state1 {
entry {
"System.out.println(\"state 1 entry action\");"
- "crcGen.update(111);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 111);"
}
exit {
"System.out.println(\"state 1 exit action\");"
- "crcGen.update(112);"
+ "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 112);"
}
}
}
@@ -380,7 +369,6 @@ RoomModel org.eclipse.etrice.integration.HandlerTest { Message msg5(p1:int32)
Message msg6(p1:int32)
}
- outgoing{}
}
}
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java index 46715433f..0c062dc8a 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java index a1ba7b9d0..f682ca30a 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.ChoicePointTest.TestProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java index 47be318d6..7bb92601a 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.ChoicePointTest.TestProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java index 749cff503..10279e762 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.ConfigTest.PortProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java index 3edeb0d6f..125e536e8 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java index a2c7359af..0d1e3d928 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.ConfigTest.PortProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java index 9ab19306b..71ad8870e 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java index ddd27b84e..5cee38493 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java @@ -7,21 +7,18 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.HandlerTest.TestProtocol.*;
/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.integration.tests.helpers.*;
import org.eclipse.etrice.runtime.java.messaging.RTServices;
/*--------------------- end user code ---------------------*/
public class HandlerUser extends ActorClassBase {
- /*--------------------- begin user code ---------------------*/
- private CRC16Generator crcGen = new CRC16Generator();
- /*--------------------- end user code ---------------------*/
//--------------------- ports
protected TestProtocolPort TestPort1 = null;
@@ -35,7 +32,11 @@ public class HandlerUser extends ActorClassBase { /*--------------------- attributes ---------------------*/
int counter;
+ int caseId;
/*--------------------- operations ---------------------*/
+ public void HandlerUser_dtor() {
+ etUnit_closeAll(caseId);
+ }
//--------------------- construction
public HandlerUser(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
@@ -44,6 +45,7 @@ public class HandlerUser extends ActorClassBase { // initialize attributes
counter = 0;
+ caseId = 0;
// own ports
TestPort1 = new TestProtocolPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
@@ -51,6 +53,11 @@ public class HandlerUser extends ActorClassBase { // own saps
// own service implementations
+
+ {
+ // user defined constructor body
+ caseId = etUnit_openAll("tmp", "HandlerTest.etu", "HandlerTest_suite", "HandlerTest_case");
+ }
}
//--------------------- attribute setters and getters
public void setCounter (int counter) {
@@ -59,6 +66,12 @@ public class HandlerUser extends ActorClassBase { public int getCounter () {
return this.counter;
}
+ public void setCaseId (int caseId) {
+ this.caseId = caseId;
+ }
+ public int getCaseId () {
+ return this.caseId;
+ }
//--------------------- port getters
public TestProtocolPort getTestPort1 (){
return this.TestPort1;
@@ -78,6 +91,7 @@ public class HandlerUser extends ActorClassBase { }
public void destroy(){
+ HandlerUser_dtor();
}
@@ -87,14 +101,13 @@ public class HandlerUser extends ActorClassBase { public static final int STATE_state0_state1_state7 = 4;
public static final int STATE_state0_state2 = 5;
public static final int STATE_testOk = 6;
- public static final int STATE_testFalse = 7;
- public static final int STATE_state1 = 8;
+ public static final int STATE_state1 = 7;
/* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__state0_tp2 = 1;
public static final int CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0 = 2;
public static final int CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1 = 3;
- public static final int CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1 = 4;
+ public static final int CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1 = 4;
public static final int CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5 = 5;
public static final int CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6 = 6;
public static final int CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1 = 7;
@@ -125,12 +138,11 @@ public class HandlerUser extends ActorClassBase { "state0_state1_state7",
"state0_state2",
"testOk",
- "testFalse",
"state1"
};
// history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
+ protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
private void setState(int new_state) {
DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
@@ -143,138 +155,134 @@ public class HandlerUser extends ActorClassBase { /* Entry and Exit Codes */
protected void entry_state0() {
System.out.println("state 0 entry action");
- crcGen.update(13);
+ EXPECT_ORDER(caseId, "state state0 entry code", 13);
}
protected void exit_state0() {
System.out.println("state 0 exit action");
- crcGen.update(14);
+ EXPECT_ORDER(caseId, "state state0 exit code", 14);
}
protected void entry_state0_state1() {
System.out.println("state 0/1 entry action");
- crcGen.update(16);
+ EXPECT_ORDER(caseId, "state state0_state1 entry code", 16);
}
protected void exit_state0_state1() {
System.out.println("state 0/1 exit action");
- crcGen.update(17);
+ EXPECT_ORDER(caseId, "state state0_state1 exit code", 17);
}
protected void entry_state0_state1_state7() {
System.out.println("state 0/1/7 entry action");
- crcGen.update(23);
+ EXPECT_ORDER(caseId, "state state0_state1_state7 entry code", 23);
}
protected void exit_state0_state1_state7() {
System.out.println("state 0/1/7 exit action");
- crcGen.update(24);
+ EXPECT_ORDER(caseId, "state state0_state1_state7 exit code", 24);
}
protected void entry_state0_state2() {
System.out.println("state 0/2 entry action");
- crcGen.update(18);
+ EXPECT_ORDER(caseId, "state state0_state2 entry code", 18);
}
protected void exit_state0_state2() {
System.out.println("state 0/2 exit action");
- crcGen.update(19);
+ EXPECT_ORDER(caseId, "state state0_state2 exit code", 19);
+ }
+ protected void entry_testOk() {
+ System.out.println("Test ok");
+ RTServices.getInstance().getSubSystem().testFinished(etUnit_isSuccess(caseId)?0:1);
}
protected void entry_state1() {
System.out.println("state 1 entry action");
- crcGen.update(111);
+ EXPECT_ORDER(caseId, "state state1 entry code", 111);
}
protected void exit_state1() {
System.out.println("state 1 exit action");
- crcGen.update(112);
+ EXPECT_ORDER(caseId, "state state1 exit code", 112);
}
/* Action Codes */
protected void action_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0(InterfaceItemBase ifitem, int p1) {
System.out.println("top level handler action no guard ");
- crcGen.update(11);
+ EXPECT_ORDER(caseId, "transition tr0: TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0 action code", 11);
}
protected void action_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1(InterfaceItemBase ifitem, int p1) {
System.out.println("top level self transition action P1=>3");
- crcGen.update(12);
+ EXPECT_ORDER(caseId, "transition tr1: TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1 action code", 12);
}
protected void action_TRANS_INITIAL_TO__state0_tp2() {
System.out.println("top level initial transition");
- crcGen.update(10);
- }
- protected void action_TRANS_tr2_FROM_cp0_TO_testFalse(InterfaceItemBase ifitem, int p1) {
- System.out.println("Test false");
- RTServices.getInstance().getSubSystem().testFinished(1);
- }
- protected void action_TRANS_tr3_FROM_cp0_TO_testOk_COND_tr3(InterfaceItemBase ifitem, int p1) {
- System.out.println("Test ok");
- RTServices.getInstance().getSubSystem().testFinished(0);
+ int list[] = {13,15,16,22,23,11,24,17,14,12,13,16,23,70,24,17,14,114,113,111,11,70,24,17,120,16,23,24,17,121,18,19,25,18,20,19,21,18,19,25,18,19,14,117};
+ EXPECT_ORDER_START(caseId, list, list.length);
}
protected void action_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1(InterfaceItemBase ifitem, int p1) {
System.out.println("tr9 transition action");
- crcGen.update(114);
+ EXPECT_ORDER(caseId, "transition tr9: TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1 action code", 114);
}
protected void action_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5(InterfaceItemBase ifitem, int p1) {
System.out.println("top level self transition action P1=>4");
- crcGen.update(50);
+ EXPECT_ORDER(caseId, "transition tr5: TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5 action code", 50);
}
protected void action_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1(InterfaceItemBase ifitem, int p1) {
System.out.println("top level handler action p1=>7 ");
- crcGen.update(70);
+ EXPECT_ORDER(caseId, "transition tr7: TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1 action code", 70);
}
protected void action_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6(InterfaceItemBase ifitem, int p1) {
System.out.println("top level handler action p1=>12 ");
- crcGen.update(110);
+ EXPECT_ORDER(caseId, "transition tr6: TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6 action code", 110);
}
protected void action_TRANS_tr8_FROM_cp1_TO_state1(InterfaceItemBase ifitem, int p1) {
System.out.println("tr8 transition action");
- crcGen.update(113);
+ EXPECT_ORDER(caseId, "transition tr8: TRANS_tr8_FROM_cp1_TO_state1 action code", 113);
}
protected void action_TRANS_tr10_FROM_cp1_TO_state0_COND_tr10(InterfaceItemBase ifitem, int p1) {
System.out.println("tr4 transition action");
- crcGen.update(115);
+ EXPECT_ORDER(caseId, "transition tr10: TRANS_tr10_FROM_cp1_TO_state0_COND_tr10 action code", 115);
}
- protected void action_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1(InterfaceItemBase ifitem, int p1) {
+ protected void action_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1(InterfaceItemBase ifitem, int p1) {
System.out.println("tp1 transition to choice action");
- crcGen.update(117);
- System.out.printf("CRC: %d \n", crcGen.getCrc());
+ EXPECT_ORDER_END(caseId, "transition tr4: TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1 action code", 117);
}
protected void action_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1(InterfaceItemBase ifitem) {
System.out.println("state 0 handler action no guard");
- crcGen.update(20);
+ EXPECT_ORDER(caseId, "transition tr1: TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1 action code", 20);
}
protected void action_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2(InterfaceItemBase ifitem) {
System.out.println("state 0 tp1 self transition action");
- crcGen.update(21);
+ EXPECT_ORDER(caseId, "transition tr2: TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2 action code", 21);
}
protected void action_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3(InterfaceItemBase ifitem, int p1) {
System.out.println("state 0/2 self transition action");
- crcGen.update(25);
+ EXPECT_ORDER(caseId, "transition tr3: TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3 action code", 25);
}
protected void action_state0_TRANS_tr4_FROM_tp2_TO_state0_state1_tp0() {
System.out.println("state 0 tp2 transition action");
- crcGen.update(15);
+ EXPECT_ORDER(caseId, "transition tr4: TRANS_tr4_FROM_tp2_TO_state0_state1_tp0 action code", 15);
}
protected void action_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5(InterfaceItemBase ifitem, int p1) {
System.out.println("state 0 handler action P1 => 5");
- crcGen.update(52);
+ EXPECT_ORDER(caseId, "transition tr5: TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5 action code", 52);
}
protected void action_state0_TRANS_INITIAL_TO__state2() {
System.out.println("state 0 initial transition");
- crcGen.update(53);
+ EXPECT_ORDER(caseId, "transition init: TRANS_INITIAL_TO__state2 action code", 53);
}
protected void action_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6(InterfaceItemBase ifitem, int p1) {
System.out.println("state 0/1 self transition");
- crcGen.update(54);
+ EXPECT_ORDER(caseId, "transition tr6: TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6 action code", 54);
}
protected void action_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1(InterfaceItemBase ifitem, int p1) {
System.out.println("state 0 tp1 p1=>5");
- crcGen.update(120);
+ EXPECT_ORDER(caseId, "transition tr7: TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1 action code", 120);
}
protected void action_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1(InterfaceItemBase ifitem, int p1) {
System.out.println("state 0 tp1 action P1 => 6");
- crcGen.update(121);
+ EXPECT_ORDER(caseId, "transition tr8: TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1 action code", 121);
}
protected void action_state0_state1_TRANS_tr0_FROM_tp0_TO_state7() {
System.out.println("state 0/1 transition entry action");
- crcGen.update(22);
+ EXPECT_ORDER(caseId, "transition tr0: TRANS_tr0_FROM_tp0_TO_state7 action code", 22);
}
protected void action_state0_state1_TRANS_INITIAL_TO__state7() {
System.out.println("state 0/1 initial transition");
- crcGen.update(121);
+ EXPECT_ORDER(caseId, "transition init: TRANS_INITIAL_TO__state7 action code", 121);
}
/**
@@ -311,10 +319,6 @@ public class HandlerUser extends ActorClassBase { this.history[STATE_TOP] = STATE_testOk;
current = STATE_TOP;
break;
- case STATE_testFalse:
- this.history[STATE_TOP] = STATE_testFalse;
- current = STATE_TOP;
- break;
case STATE_state1:
if (!handler) exit_state1();
this.history[STATE_TOP] = STATE_state1;
@@ -383,16 +387,11 @@ public class HandlerUser extends ActorClassBase { action_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6(ifitem, p1);
return STATE_TOP;
}
- case CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1:
+ case CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1:
{
int p1 = (Integer) generic_data;
- action_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1(ifitem, p1);
- if (crcGen.getCrc()==7268) {
- action_TRANS_tr3_FROM_cp0_TO_testOk_COND_tr3(ifitem, p1);
- return STATE_testOk;}
- else {
- action_TRANS_tr2_FROM_cp0_TO_testFalse(ifitem, p1);
- return STATE_testFalse;}
+ action_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1(ifitem, p1);
+ return STATE_testOk;
}
case CHAIN_state0_TRANS_tr0_FROM_state1_TO_state2_BY_msg5TestPort1:
{
@@ -493,11 +492,9 @@ public class HandlerUser extends ActorClassBase { // in leaf state: return state id
return STATE_state0_state2;
case STATE_testOk:
+ if (!(skip_entry || handler)) entry_testOk();
// in leaf state: return state id
return STATE_testOk;
- case STATE_testFalse:
- // in leaf state: return state id
- return STATE_testFalse;
case STATE_state1:
if (!(skip_entry || handler)) entry_state1();
// in leaf state: return state id
@@ -619,7 +616,7 @@ public class HandlerUser extends ActorClassBase { break;
case TRIG_TestPort1__msg6:
{
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1;
+ chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
catching_state = STATE_TOP;
}
break;
@@ -670,7 +667,7 @@ public class HandlerUser extends ActorClassBase { break;
case TRIG_TestPort1__msg6:
{
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1;
+ chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
catching_state = STATE_TOP;
}
break;
@@ -719,56 +716,7 @@ public class HandlerUser extends ActorClassBase { break;
case TRIG_TestPort1__msg6:
{
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_testFalse:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- { int p1 = (Integer) generic_data;
- if (p1==7)
- {
- chain = CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- is_handler = true;
- } else
- if (p1==12)
- {
- chain = CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- } else
- if (p1==3)
- {
- chain = CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- } else
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg2:
- { int p1 = (Integer) generic_data;
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg6:
- {
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1;
+ chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
catching_state = STATE_TOP;
}
break;
@@ -817,7 +765,7 @@ public class HandlerUser extends ActorClassBase { break;
case TRIG_TestPort1__msg6:
{
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_cp0_BY_msg6TestPort1;
+ chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
catching_state = STATE_TOP;
}
break;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java index 95372f462..625d1d460 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java index 0b07da544..33ed62349 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java index 9480dc4a3..3c4b2fd0b 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java index 90fe0365b..1e2fe7894 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java index 9e553d321..708f960f4 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java index ac68f56c0..a3defa126 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java index 8a6ac04bf..cf2e34f03 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.PingPongThreadTestReplPort.PingPongProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java index 280d2cdac..6183af52f 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java index 5caab61dd..c25a1f642 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.SendingDataByValueTest.PingPongProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java index b3b3ac848..ed77e5dfe 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.SendingDataByValueTest.PingPongProtocol.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java index 14da0def9..ee67dd952 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java index 634de3c8b..e47679506 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java index ff9bb1aaf..c57e1e89c 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.tests.p_HFSM.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java index 2acba079d..2dd39ff72 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import org.eclipse.etrice.integration.tests.p_HFSM.*;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java index 2e7202a33..3e8cb6a56 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java @@ -7,6 +7,7 @@ import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase; import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
+import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
|