Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2017-02-27 20:08:09 +0000
committerJuergen Haug2017-02-28 15:13:03 +0000
commit881e6359f7b07c1d6e8a27e9b81a06172819b3fd (patch)
treecd808b06e75eeaa7bfd756f04fb4fe456013352d /tests/org.eclipse.etrice.generator.common.tests
parentb09aa986105adad9f2b9c227a79f2669830d306a (diff)
downloadorg.eclipse.etrice-881e6359f7b07c1d6e8a27e9b81a06172819b3fd.tar.gz
org.eclipse.etrice-881e6359f7b07c1d6e8a27e9b81a06172819b3fd.tar.xz
org.eclipse.etrice-881e6359f7b07c1d6e8a27e9b81a06172819b3fd.zip
Bug 512819 - [actioneditor] missing highlighting and proposal for event
ports in guard window
Diffstat (limited to 'tests/org.eclipse.etrice.generator.common.tests')
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
index f45443da0..0330485c1 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
@@ -29,11 +29,11 @@ RoomModel DetailExpressionTestModel {
triggers {
<out1: cPortEvent guard {
"/* TODO activate action code editor */"
- "rPortData.in1 == numberArray[3] &&"
- "accessibleMessageData && infoData.flag"
+ "rPortData.in1 == numberArray[3] && accessibleMessageData && infoData.flag && actorOp(32) && rPortEvent.regularOp(32) && cPortEvent.conjugatedOp(32)"
}>
}
- action {
+ action
+ {
"// TODO syntax highlightiing"
"rPortEvent.out1(true);"
"rPortData.in1;"
@@ -67,8 +67,9 @@ RoomModel DetailExpressionTestModel {
}
}
Transition guardedTrans: idle -> state2 {
- guard {
- "rPortData.in1 == numberArray[3] && infoData.flag"
+ guard
+ {
+ "rPortData.in1 == numberArray[3] && infoData.flag && actorOp(32) && rPortEvent.regularOp(32) && cPortEvent.conjugatedOp(32)"
}
}
Transition init: initial -> idle

Back to the top