Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-20 06:03:00 +0000
committerHenrik Rentz-Reichert2012-09-20 06:03:00 +0000
commit357a140f8befc7f107d4114911976f1a7b8f1ba2 (patch)
treee397b33c126c42e6e00b1850d131507c097ac9e7 /tests
parent8faad1f11c3a10ac41b0ab553a15b4f6471dcb65 (diff)
downloadorg.eclipse.etrice-357a140f8befc7f107d4114911976f1a7b8f1ba2.tar.gz
org.eclipse.etrice-357a140f8befc7f107d4114911976f1a7b8f1ba2.tar.xz
org.eclipse.etrice-357a140f8befc7f107d4114911976f1a7b8f1ba2.zip
[modellib.java, ...] timing service interface of java modellib like in C
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room7
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/make.xml4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room5
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room5
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java50
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java60
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java50
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java8
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java26
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java26
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/SubSystemHFSMTest.java36
16 files changed, 132 insertions, 217 deletions
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
index 464aae65c..58997f659 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
@@ -1,4 +1,4 @@
-RoomModel org.eclipse.etrice.generator.common.tests.ChoicePointTest {
+RoomModel ChoicePointTest {
import room.basic.types.* from "Types.room"
@@ -40,8 +40,8 @@ RoomModel org.eclipse.etrice.generator.common.tests.ChoicePointTest {
Transition init: initial -> cp cp0 {
action {
"counter = 0;"
- "int list[] = {1,2,3,4,5,6,3,4,5,7,8,10,11,12,9,16,3,4,5,17,8,13,15,11,19,12,9,18,20};"
- "EXPECT_ORDER_START(caseId,list,list.length);"
+ "int16 list[] = {1,2,3,4,5,6,3,4,5,7,8,10,11,12,9,16,3,4,5,17,8,13,15,11,19,12,9,18,20};"
+ "EXPECT_ORDER_START(caseId,list,29);"
"EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);"
}
}
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
index 888468f75..7aba7f2f9 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
@@ -1,6 +1,5 @@
-RoomModel org.eclipse.etrice.generator.common.tests.HandlerTest {
+RoomModel HandlerTest {
- import room.basic.service.timing.* from "TimingService.room"
import room.basic.types.* from "Types.room"
LogicalSystem System_HandlerTest {
@@ -9,9 +8,6 @@ RoomModel org.eclipse.etrice.generator.common.tests.HandlerTest {
SubSystemClass SubSystem_HandlerTest {
ActorRef HandlerTest_Top: HandlerTest_Top
- ActorRef timerService: room.basic.service.timing.ATimingService
- LayerConnection ref HandlerTest_Top satisfied_by timerService.timer
- LayerConnection ref HandlerTest_Top satisfied_by timerService.timeout
// LogicalThread t1 prio=5 {HandlerTest_Top.tester}
// LogicalThread t2 prio=5 {HandlerTest_Top.handlerUser}
}
@@ -283,7 +279,6 @@ RoomModel org.eclipse.etrice.generator.common.tests.HandlerTest {
}
Structure {
external Port TestPort1
- SAP timer: room.basic.service.timing.PTimeout
}
Behavior {
StateMachine {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index cb2158d37..f7a6300bf 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -121,11 +121,11 @@
-->
<target name="run" depends="compile">
<mkdir dir="tmp/log"/>
- <java output="${output}/runHandlerTest.txt" classname="org.eclipse.etrice.generator.common.tests.HandlerTest.SubSystem_HandlerTestRunner" fork="true" failonerror="true">
+ <java output="${output}/runHandlerTest.txt" classname="HandlerTest.SubSystem_HandlerTestRunner" fork="true" failonerror="true">
<arg value="-run_as_test"/>
<classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
</java>
- <java output="${output}/runChoicePointTest.txt" classname="org.eclipse.etrice.generator.common.tests.ChoicePointTest.SubSystem_CPTestRunner" fork="true" failonerror="true">
+ <java output="${output}/runChoicePointTest.txt" classname="ChoicePointTest.SubSystem_CPTestRunner" fork="true" failonerror="true">
<arg value="-run_as_test"/>
<classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
</java>
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 0415e2589..9b30feb77 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
@@ -1,6 +1,5 @@
RoomModel org.eclipse.etrice.integration.HandlerTest {
- import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"
import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
LogicalSystem System_HandlerTest {
@@ -9,9 +8,6 @@ RoomModel org.eclipse.etrice.integration.HandlerTest {
SubSystemClass SubSystem_HandlerTest {
ActorRef HandlerTest_Top: HandlerTest_Top
- ActorRef timerService: room.basic.service.timing.ATimingService
- LayerConnection ref HandlerTest_Top satisfied_by timerService.timer
- LayerConnection ref HandlerTest_Top satisfied_by timerService.timeout
// LogicalThread t1 prio=5 {HandlerTest_Top.tester}
// LogicalThread t2 prio=5 {HandlerTest_Top.handlerUser}
}
@@ -318,7 +314,6 @@ RoomModel org.eclipse.etrice.integration.HandlerTest {
}
Structure {
external Port TestPort1
- SAP timer: room.basic.service.timing.PTimeout
}
Behavior {
StateMachine {
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
index d6385ecce..f0e6d990c 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
@@ -11,7 +11,6 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTest {
ActorRef application: PingPongTop
ActorRef services: ATimingService
LayerConnection ref application satisfied_by services.timer
- LayerConnection ref application satisfied_by services.timeout
LogicalThread mrPingThread prio=5 {application.MrPing}
LogicalThread mrPong1Thread prio=5 {application.MrPong1}
LogicalThread mrPong2Thread prio=5 {application.MrPong2}
@@ -44,7 +43,7 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTest {
external Port PingPongPort
external Port PingPongPort2
external Port PingPongPort3
- SAP timer: PTimeout
+ SAP timer: PTimer
Attribute count : int32
Attribute pongCount : int32
}
@@ -53,12 +52,12 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTest {
Transition tr0: initial -> waitForTimer {
action {
"count = 0;"
- "timer.Start(10);"
+ "timer.startTimeout(10);"
}
}
Transition tr1: waitForTimer -> waitForPong {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"PingPongPort.ping();"
@@ -82,7 +81,7 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTest {
"RTServices.getInstance().getSubSystem().testFinished(0);"
"} else {"
"System.out.println(count);"
- "timer.Start(5);}"
+ "timer.startTimeout(5);}"
}
}
Transition tr6: cp cp0 -> waitForPong {
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
index ed7b787c0..e92e600a8 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
@@ -11,7 +11,6 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {
ActorRef application: PingPongTop
ActorRef services: ATimingService
LayerConnection ref application satisfied_by services.timer
- LayerConnection ref application satisfied_by services.timeout
LogicalThread mrPingThread prio=5 {application.MrPing}
LogicalThread mrPong1Thread prio=5 {application.MrPong1}
LogicalThread mrPong2Thread prio=5 {application.MrPong2}
@@ -40,7 +39,7 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {
"import org.eclipse.etrice.runtime.java.messaging.RTServices;"
}
external Port PingPongPort
- SAP timer: PTimeout
+ SAP timer: PTimer
Attribute count : int32
Attribute pongCount : int32
}
@@ -49,12 +48,12 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {
Transition tr0: initial -> waitForTimer {
action {
"count = 0;"
- "timer.Start(1000);"
+ "timer.startTimeout(1000);"
}
}
Transition tr1: waitForTimer -> waitForPong {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"PingPongPort.get(0).ping();"
@@ -82,7 +81,7 @@ RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {
"System.out.println(pongCount);"
"System.out.println(count);"
"pongCount = 0;"
- "timer.Start(10);"
+ "timer.startTimeout(10);"
"}"
}
}
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
index d33402d4a..9e206ee4c 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
@@ -1,6 +1,5 @@
RoomModel org.eclipse.etrice.integration.tests {
- import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"
import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
LogicalSystem SystemHFSMTest {
@@ -9,10 +8,6 @@ RoomModel org.eclipse.etrice.integration.tests {
SubSystemClass SubSystemHFSMTest {
ActorRef application : App_SubSystemHFSMTest
- ActorRef services : ATimingService
-
- LayerConnection ref application satisfied_by services.timer
- LayerConnection ref application satisfied_by services.timeout
}
ActorClass a_HFSM_Tests {
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
index 918ec4750..52da9efb6 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
@@ -42,8 +42,8 @@ public class DynTestee_ac extends ActorClassBase {
boolean blocker;
Dyn_DC1 dc_dump;
int int_dump;
- private DynConfigLock lock_dc_i;
private DynConfigLock lock_int_i;
+ private DynConfigLock lock_dc_i;
private DynConfigLock lock_blocker;
private DynConfigLock lock_blockMe;
/*--------------------- operations ---------------------*/
@@ -73,8 +73,8 @@ public class DynTestee_ac extends ActorClassBase {
this(parent, name, port_addr, peer_addr);
this.variableService = variableService;
- lock_dc_i = new DynConfigLock();
lock_int_i = new DynConfigLock();
+ lock_dc_i = new DynConfigLock();
lock_blocker = new DynConfigLock();
lock_blockMe = new DynConfigLock();
}
@@ -93,25 +93,6 @@ public class DynTestee_ac extends ActorClassBase {
return this.int_dump;
}
- public Dyn_DC1 getDc_i(){
- if(lock_dc_i == null)
- return dc_i;
- else
- synchronized(lock_dc_i){
- return dc_i;
- }
- }
- public void setDc_i(Dyn_DC1 dc_i){
- if(lock_dc_i == null)
- this.dc_i = dc_i;
- else
- synchronized(lock_dc_i){
- this.dc_i = dc_i;
- }
- }
- public DynConfigLock getDc_iLock(){
- return lock_dc_i;
- }
public int getInt_i(){
if(lock_int_i == null)
return int_i;
@@ -131,6 +112,25 @@ public class DynTestee_ac extends ActorClassBase {
public DynConfigLock getInt_iLock(){
return lock_int_i;
}
+ public Dyn_DC1 getDc_i(){
+ if(lock_dc_i == null)
+ return dc_i;
+ else
+ synchronized(lock_dc_i){
+ return dc_i;
+ }
+ }
+ public void setDc_i(Dyn_DC1 dc_i){
+ if(lock_dc_i == null)
+ this.dc_i = dc_i;
+ else
+ synchronized(lock_dc_i){
+ this.dc_i = dc_i;
+ }
+ }
+ public DynConfigLock getDc_iLock(){
+ return lock_dc_i;
+ }
public boolean getBlocker(){
if(lock_blocker == null)
return blocker;
@@ -169,14 +169,14 @@ public class DynTestee_ac extends ActorClassBase {
public DynConfigLock getBlockMeLock(){
return lock_blockMe;
}
- public void setAndWriteInt_dump(int int_dump){
- setInt_dump(int_dump);
- variableService.write(this.getInstancePath()+"/int_dump", int_dump);
- }
public void setAndWriteDc_dump(Dyn_DC1 dc_dump){
setDc_dump(dc_dump);
variableService.write(this.getInstancePath()+"/dc_dump", dc_dump);
}
+ public void setAndWriteInt_dump(int int_dump){
+ setInt_dump(int_dump);
+ variableService.write(this.getInstancePath()+"/int_dump", int_dump);
+ }
//--------------------- port getters
public TestCommProtocolConjPort getConj_DynConfigPort (){
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
index aeb7b6193..847038252 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
@@ -56,45 +56,53 @@ public class SubSystemConfigTestVariableService extends VariableService{
}
try{
boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";
- Double _double_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";
+ long[] _long_array_i = null;
object = values.get(id);
if(object != null){
- _double_i = ensureDouble(object);
- if(!_double_i.equals((Double)getDiffMap().get(id)))
+ _long_array_i = ensureLongArray(object, 1);
+ if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/int_i";
- Integer _int_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i";
+ char[] _char_i = null;
object = values.get(id);
if(object != null){
- _int_i = ensureInt(object);
- if(!_int_i.equals((Integer)getDiffMap().get(id)))
+ _char_i = ensureCharArray(object, 10);
+ if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i";
- char[] _char_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";
+ Double _double_i = null;
object = values.get(id);
if(object != null){
- _char_i = ensureCharArray(object, 10);
- if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))
+ _double_i = ensureDouble(object);
+ if(!_double_i.equals((Double)getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";
- long[] _long_array_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/int_i";
+ Integer _int_i = null;
object = values.get(id);
if(object != null){
- _long_array_i = ensureLongArray(object, 1);
- if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))
+ _int_i = ensureInt(object);
+ if(!_int_i.equals((Integer)getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
if(changed)
synchronized(_top_testee2.getDc_iLock()){
if(_top_testee2.getDc_iLock().isUpdate()){
+ if(_long_array_i != null){
+ _top_testee2.getDc_i().setLong_array_i(_long_array_i);
+ getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", _long_array_i);
+ }
+ if(_char_i != null){
+ _top_testee2.getDc_i().getDc_i().setChar_i(_char_i);
+ getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);
+ }
if(_double_i != null){
_top_testee2.getDc_i().getDc_i().setDouble_i(_double_i);
getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _double_i);
@@ -103,14 +111,6 @@ public class SubSystemConfigTestVariableService extends VariableService{
_top_testee2.getDc_i().setInt_i(_int_i);
getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _int_i);
}
- if(_char_i != null){
- _top_testee2.getDc_i().getDc_i().setChar_i(_char_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);
- }
- if(_long_array_i != null){
- _top_testee2.getDc_i().setLong_array_i(_long_array_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", _long_array_i);
- }
}
}
}catch(IllegalArgumentException e){
@@ -168,10 +168,10 @@ public class SubSystemConfigTestVariableService extends VariableService{
protected Map<String, Object> getAttributeValues(){
Map<String, Object> values = new HashMap<String, Object>();
values.put("/SubSystemConfigTest/top/testee2/int_i", _top_testee2.getInt_i());
+ values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(_top_testee2.getDc_i().getLong_array_i()));
+ values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));
values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _top_testee2.getDc_i().getDc_i().getDouble_i());
values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _top_testee2.getDc_i().getInt_i());
- values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));
- values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(_top_testee2.getDc_i().getLong_array_i()));
values.put("/SubSystemConfigTest/top/testee2/blockMe", _top_testee2.getBlockMe());
values.put("/SubSystemConfigTest/top/testee2/blocker", _top_testee2.getBlocker());
@@ -186,15 +186,15 @@ public class SubSystemConfigTestVariableService extends VariableService{
// DataClasses write operations
- private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){
- map.put(id+"/double_i", object.getDouble_i());
- map.put(id+"/char_i", toObjectArray(object.getChar_i()));
- }
private void writeDataClass(String id, Dyn_DC1 object, Map<String, Object> map){
map.put(id+"/int_i", object.getInt_i());
map.put(id+"/long_array_i", toObjectArray(object.getLong_array_i()));
writeDataClass(id+"/dc_i", object.getDc_i(), map);
}
+ private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){
+ map.put(id+"/double_i", object.getDouble_i());
+ map.put(id+"/char_i", toObjectArray(object.getChar_i()));
+ }
@Override
protected int getPollingTimerUser(){
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java
index 99f869776..048364d68 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java
@@ -9,7 +9,6 @@ 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 room.basic.service.timing.*;
@@ -35,10 +34,9 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
// all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,110);
- Address addr_item_SystemPort_1 = new Address(0,0,111);
- Address addr_item_SystemPort_2 = new Address(0,0,112);
- Address addr_item_SystemPort_3 = new Address(0,0,113);
+ Address addr_item_SystemPort_0 = new Address(0,0,106);
+ Address addr_item_SystemPort_1 = new Address(0,0,107);
+ Address addr_item_SystemPort_2 = new Address(0,0,108);
// actor instance /SubSystem_HandlerTest/HandlerTest_Top itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -49,20 +47,14 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester = new Address(0,0,102);
// interface items of /SubSystem_HandlerTest/HandlerTest_Top/tester
Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_TestPort1 = new Address(0,0,103);
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_timer = new Address(0,0,104);
// actor instance /SubSystem_HandlerTest/HandlerTest_Top/handlerUser itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser = new Address(0,0,105);
+ Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser = new Address(0,0,104);
// interface items of /SubSystem_HandlerTest/HandlerTest_Top/handlerUser
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1 = new Address(0,0,106);
- // actor instance /SubSystem_HandlerTest/timerService itself => Systemport Address
- // TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
- Address addr_item__SubSystem_HandlerTest_timerService = new Address(0,0,107);
- // interface items of /SubSystem_HandlerTest/timerService
- Address addr_item__SubSystem_HandlerTest_timerService_timeout_0 = new Address(0,0,108);
+ Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1 = new Address(0,0,105);
// instantiate all actor instances
- instances = new ActorClassBase[4];
+ instances = new ActorClassBase[3];
instances[0] = new HandlerTest_Top(
this,
"HandlerTest_Top",
@@ -80,18 +72,12 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
new Address[][] {{addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester},
{
addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_TestPort1
- },
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_timer
}
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_1},
{
addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1
- },
- {
- addr_item__SubSystem_HandlerTest_timerService_timeout_0
}
}
);
@@ -111,24 +97,6 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
}
}
);
- instances[3] = new ATimingService(
- this,
- "timerService",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_HandlerTest_timerService},
- {
- addr_item__SubSystem_HandlerTest_timerService_timeout_0
- },
- null
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_3},
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_timer
- },
- null
- }
- );
// apply instance attribute configurations
@@ -139,15 +107,13 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
new Address[]{
addr_item_SystemPort_0,
addr_item_SystemPort_1,
- addr_item_SystemPort_2,
- addr_item_SystemPort_3
+ addr_item_SystemPort_2
},
// peer addresses
new Address[]{
addr_item__SubSystem_HandlerTest_HandlerTest_Top,
addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester,
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser,
- addr_item__SubSystem_HandlerTest_timerService
+ addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser
});
}
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 d3ca3bf85..5a1ca9acf 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
@@ -9,9 +9,7 @@ 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.*;
-import room.basic.service.timing.PTimeout.*;
import org.eclipse.etrice.integration.HandlerTest.TestProtocol.*;
@@ -24,13 +22,11 @@ public class Tester extends ActorClassBase {
protected TestProtocolConjPort TestPort1 = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
//--------------------- services
//--------------------- interface item IDs
public static final int IFITEM_TestPort1 = 1;
- public static final int IFITEM_timer = 2;
/*--------------------- attributes ---------------------*/
@@ -47,7 +43,6 @@ public class Tester extends ActorClassBase {
TestPort1 = new TestProtocolConjPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -60,9 +55,6 @@ public class Tester extends ActorClassBase {
public TestProtocolConjPort getTestPort1 (){
return this.TestPort1;
}
- public PTimeoutConjPort getTimer (){
- return this.timer;
- }
//--------------------- lifecycle functions
public void init(){
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 e428aa4d9..32dbaa627 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
@@ -11,7 +11,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
/*--------------------- begin user code ---------------------*/
@@ -29,7 +29,7 @@ public class MrPingActor extends ActorClassBase {
protected PingPongProtocolConjPort PingPongPort3 = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -60,7 +60,7 @@ public class MrPingActor extends ActorClassBase {
PingPongPort3 = new PingPongProtocolConjPort(this, "PingPongPort3", IFITEM_PingPongPort3, 0, port_addr[IFITEM_PingPongPort3][0], peer_addr[IFITEM_PingPongPort3][0]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -91,7 +91,7 @@ public class MrPingActor extends ActorClassBase {
public PingPongProtocolConjPort getPingPongPort3 (){
return this.PingPongPort3;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -118,14 +118,14 @@ public class MrPingActor extends ActorClassBase {
/* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__waitForTimer = 1;
- public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer = 2;
+ public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer = 2;
public static final int CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort = 3;
/* triggers */
public static final int POLLING = 0;
public static final int TRIG_PingPongPort2__pong = IFITEM_PingPongPort2 + EVT_SHIFT*PingPongProtocol.OUT_pong;
public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","waitForTimer",
@@ -148,9 +148,9 @@ public class MrPingActor extends ActorClassBase {
/* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
- timer.Start(10);
+ timer.startTimeout(10);
}
- protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(InterfaceItemBase ifitem) {
PingPongPort.ping();
PingPongPort2.ping();
pongCount = 0;
@@ -163,7 +163,7 @@ public class MrPingActor extends ActorClassBase {
RTServices.getInstance().getSubSystem().testFinished(0);
} else {
System.out.println(count);
- timer.Start(5);}
+ timer.startTimeout(5);}
}
/**
@@ -202,9 +202,9 @@ public class MrPingActor extends ActorClassBase {
action_TRANS_INITIAL_TO__waitForTimer();
return STATE_waitForTimer;
}
- case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer:
{
- action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(ifitem);
return STATE_waitForPong;
}
case CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort:
@@ -263,9 +263,9 @@ public class MrPingActor extends ActorClassBase {
switch (this.state) {
case STATE_waitForTimer:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java
index e2547467b..38cf143d2 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java
@@ -39,12 +39,12 @@ public class SubSystem_PingPong extends SubSystemClassBase{
// all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,116);
- Address addr_item_SystemPort_1 = new Address(0,0,117);
- Address addr_item_SystemPort_2 = new Address(0,0,118);
- Address addr_item_SystemPort_3 = new Address(0,0,119);
- Address addr_item_SystemPort_4 = new Address(0,0,120);
- Address addr_item_SystemPort_5 = new Address(0,0,121);
+ Address addr_item_SystemPort_0 = new Address(0,0,115);
+ Address addr_item_SystemPort_1 = new Address(0,0,116);
+ Address addr_item_SystemPort_2 = new Address(0,0,117);
+ Address addr_item_SystemPort_3 = new Address(0,0,118);
+ Address addr_item_SystemPort_4 = new Address(0,0,119);
+ Address addr_item_SystemPort_5 = new Address(0,0,120);
// actor instance /SubSystem_PingPong/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -77,7 +77,7 @@ public class SubSystem_PingPong extends SubSystemClassBase{
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
Address addr_item__SubSystem_PingPong_services = new Address(0,0,113);
// interface items of /SubSystem_PingPong/services
- Address addr_item__SubSystem_PingPong_services_timeout_0 = new Address(0,0,114);
+ Address addr_item__SubSystem_PingPong_services_timer_0 = new Address(0,0,114);
// instantiate all actor instances
instances = new ActorClassBase[6];
@@ -121,7 +121,7 @@ public class SubSystem_PingPong extends SubSystemClassBase{
addr_item__SubSystem_PingPong_application_MrPong3_PingPongPort
},
{
- addr_item__SubSystem_PingPong_services_timeout_0
+ addr_item__SubSystem_PingPong_services_timer_0
}
}
);
@@ -179,16 +179,14 @@ public class SubSystem_PingPong extends SubSystemClassBase{
// own interface item addresses
new Address[][] {{addr_item__SubSystem_PingPong_services},
{
- addr_item__SubSystem_PingPong_services_timeout_0
- },
- null
+ addr_item__SubSystem_PingPong_services_timer_0
+ }
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_5},
{
addr_item__SubSystem_PingPong_application_MrPing_timer
- },
- null
+ }
}
);
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 ab9a430d2..735ceb889 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
@@ -11,7 +11,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
import room.basic.service.timing.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
import org.eclipse.etrice.integration.PingPongThreadTestReplPort.PingPongProtocol.*;
/*--------------------- begin user code ---------------------*/
@@ -27,7 +27,7 @@ public class MrPingActor extends ActorClassBase {
protected PingPongProtocolConjReplPort PingPongPort = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -54,7 +54,7 @@ public class MrPingActor extends ActorClassBase {
PingPongPort = new PingPongProtocolConjReplPort(this, "PingPongPort", IFITEM_PingPongPort, port_addr[IFITEM_PingPongPort], peer_addr[IFITEM_PingPongPort]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -79,7 +79,7 @@ public class MrPingActor extends ActorClassBase {
public PingPongProtocolConjReplPort getPingPongPort (){
return this.PingPongPort;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -106,13 +106,13 @@ public class MrPingActor extends ActorClassBase {
/* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__waitForTimer = 1;
- public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer = 2;
+ public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer = 2;
public static final int CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort = 3;
/* triggers */
public static final int POLLING = 0;
public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","waitForTimer",
@@ -135,9 +135,9 @@ public class MrPingActor extends ActorClassBase {
/* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
- timer.Start(1000);
+ timer.startTimeout(1000);
}
- protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(InterfaceItemBase ifitem) {
PingPongPort.get(0).ping();
PingPongPort.get(1).ping();
PingPongPort.get(2).ping();
@@ -156,7 +156,7 @@ public class MrPingActor extends ActorClassBase {
System.out.println(pongCount);
System.out.println(count);
pongCount = 0;
- timer.Start(10);
+ timer.startTimeout(10);
}
}
@@ -196,9 +196,9 @@ public class MrPingActor extends ActorClassBase {
action_TRANS_INITIAL_TO__waitForTimer();
return STATE_waitForTimer;
}
- case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer:
{
- action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(ifitem);
return STATE_waitForPong;
}
case CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort:
@@ -257,9 +257,9 @@ public class MrPingActor extends ActorClassBase {
switch (this.state) {
case STATE_waitForTimer:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java
index 1115ffc4f..2ec27d5d2 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java
@@ -39,12 +39,12 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
// all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,116);
- Address addr_item_SystemPort_1 = new Address(0,0,117);
- Address addr_item_SystemPort_2 = new Address(0,0,118);
- Address addr_item_SystemPort_3 = new Address(0,0,119);
- Address addr_item_SystemPort_4 = new Address(0,0,120);
- Address addr_item_SystemPort_5 = new Address(0,0,121);
+ Address addr_item_SystemPort_0 = new Address(0,0,115);
+ Address addr_item_SystemPort_1 = new Address(0,0,116);
+ Address addr_item_SystemPort_2 = new Address(0,0,117);
+ Address addr_item_SystemPort_3 = new Address(0,0,118);
+ Address addr_item_SystemPort_4 = new Address(0,0,119);
+ Address addr_item_SystemPort_5 = new Address(0,0,120);
// actor instance /SubSystem_PingPongReplPort/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -77,7 +77,7 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
Address addr_item__SubSystem_PingPongReplPort_services = new Address(0,0,113);
// interface items of /SubSystem_PingPongReplPort/services
- Address addr_item__SubSystem_PingPongReplPort_services_timeout_0 = new Address(0,0,114);
+ Address addr_item__SubSystem_PingPongReplPort_services_timer_0 = new Address(0,0,114);
// instantiate all actor instances
instances = new ActorClassBase[6];
@@ -113,7 +113,7 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
addr_item__SubSystem_PingPongReplPort_application_MrPong3_PingPongPort
},
{
- addr_item__SubSystem_PingPongReplPort_services_timeout_0
+ addr_item__SubSystem_PingPongReplPort_services_timer_0
}
}
);
@@ -171,16 +171,14 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
// own interface item addresses
new Address[][] {{addr_item__SubSystem_PingPongReplPort_services},
{
- addr_item__SubSystem_PingPongReplPort_services_timeout_0
- },
- null
+ addr_item__SubSystem_PingPongReplPort_services_timer_0
+ }
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_5},
{
addr_item__SubSystem_PingPongReplPort_application_MrPing_timer
- },
- null
+ }
}
);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/SubSystemHFSMTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/SubSystemHFSMTest.java
index dd5565373..1f8d7ae00 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/SubSystemHFSMTest.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/SubSystemHFSMTest.java
@@ -9,7 +9,6 @@ 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 room.basic.service.timing.*;
@@ -35,11 +34,10 @@ public class SubSystemHFSMTest extends SubSystemClassBase{
// all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,109);
- Address addr_item_SystemPort_1 = new Address(0,0,110);
- Address addr_item_SystemPort_2 = new Address(0,0,111);
- Address addr_item_SystemPort_3 = new Address(0,0,112);
- Address addr_item_SystemPort_4 = new Address(0,0,113);
+ Address addr_item_SystemPort_0 = new Address(0,0,107);
+ Address addr_item_SystemPort_1 = new Address(0,0,108);
+ Address addr_item_SystemPort_2 = new Address(0,0,109);
+ Address addr_item_SystemPort_3 = new Address(0,0,110);
// actor instance /SubSystemHFSMTest/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -59,13 +57,9 @@ public class SubSystemHFSMTest extends SubSystemClassBase{
Address addr_item__SubSystemHFSMTest_application_HFSM_Tests_Tester = new Address(0,0,105);
// interface items of /SubSystemHFSMTest/application/HFSM_Tests/Tester
Address addr_item__SubSystemHFSMTest_application_HFSM_Tests_Tester_testee = new Address(0,0,106);
- // actor instance /SubSystemHFSMTest/services itself => Systemport Address
- // TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
- Address addr_item__SubSystemHFSMTest_services = new Address(0,0,107);
- // interface items of /SubSystemHFSMTest/services
// instantiate all actor instances
- instances = new ActorClassBase[5];
+ instances = new ActorClassBase[4];
instances[0] = new App_SubSystemHFSMTest(
this,
"application",
@@ -118,20 +112,6 @@ public class SubSystemHFSMTest extends SubSystemClassBase{
}
}
);
- instances[4] = new ATimingService(
- this,
- "services",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystemHFSMTest_services},
- null,
- null
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_4},
- null,
- null
- }
- );
// apply instance attribute configurations
@@ -143,16 +123,14 @@ public class SubSystemHFSMTest extends SubSystemClassBase{
addr_item_SystemPort_0,
addr_item_SystemPort_1,
addr_item_SystemPort_2,
- addr_item_SystemPort_3,
- addr_item_SystemPort_4
+ addr_item_SystemPort_3
},
// peer addresses
new Address[]{
addr_item__SubSystemHFSMTest_application,
addr_item__SubSystemHFSMTest_application_HFSM_Tests,
addr_item__SubSystemHFSMTest_application_HFSM_Tests_HFSM,
- addr_item__SubSystemHFSMTest_application_HFSM_Tests_Tester,
- addr_item__SubSystemHFSMTest_services
+ addr_item__SubSystemHFSMTest_application_HFSM_Tests_Tester
});
}

Back to the top