Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Belle2019-08-22 11:43:15 -0400
committerJan Belle2019-08-22 12:13:47 -0400
commite326d323c79e2d1c50f282db89af3e5c5a2f38b2 (patch)
treebf9e8ffb236d38b06c2d4dce07b9282776ceb54a /tests
parent80259b2e0d62d416c02834edd2283b1e24760a7b (diff)
downloadorg.eclipse.etrice-e326d323c79e2d1c50f282db89af3e5c5a2f38b2.tar.gz
org.eclipse.etrice-e326d323c79e2d1c50f282db89af3e5c5a2f38b2.tar.xz
org.eclipse.etrice-e326d323c79e2d1c50f282db89af3e5c5a2f38b2.zip
[modellib] Restructure and rename models to conform naming convention
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room16
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room24
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/model-gen/ContractMonitor_monitors.room2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room16
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room4
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room12
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room16
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room8
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room6
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room4
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room10
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room10
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room2
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room4
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room8
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room8
-rw-r--r--tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room16
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room4
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room4
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room6
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room6
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room6
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room6
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room16
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room24
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room16
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room24
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room2
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room18
40 files changed, 168 insertions, 168 deletions
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room
index b1cb1bc9d..46df9f6c0 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room
@@ -1,13 +1,13 @@
RoomModel SendingDataTest {
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.language.languageIndicator
- import room.basic.test.TestInstance
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.language.languageIndicator
+ import etrice.api.annotations.TestInstance
ActorClass SendingDataTop {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap
index 2fd5a28df..b20a3beca 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.etmap
@@ -1,7 +1,7 @@
MappingModel StaticConfigTest {
import StaticConfigTest.System_StaticConfigTest
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping System_StaticConfigTest -> GenericPhysicalSystem {
SubSystemMapping main -> node {
diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room
index 53151deb9..fe886ae5d 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room
@@ -1,16 +1,16 @@
RoomModel StaticConfigTest {
- import room.basic.types.boolean
- import room.basic.types.char
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.types.string
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.boolean
+ import etrice.api.types.char
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.types.string
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
LogicalSystem System_StaticConfigTest {
SubSystemRef main: SubSystem_StaticConfigTest
@@ -19,7 +19,7 @@ RoomModel StaticConfigTest {
SubSystemClass SubSystem_StaticConfigTest {
LayerConnection ref top satisfied_by timer.timer
ActorRef top: Top_ac
- ActorRef timer: ATimingService
+ ActorRef timer: ATimerService
LogicalThread defaultThread
}
diff --git a/tests/org.eclipse.etrice.generator.common.tests/model-gen/ContractMonitor_monitors.room b/tests/org.eclipse.etrice.generator.common.tests/model-gen/ContractMonitor_monitors.room
index 6fe971b91..c891f36c4 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/model-gen/ContractMonitor_monitors.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/model-gen/ContractMonitor_monitors.room
@@ -2,7 +2,7 @@
RoomModel ContractMonitor_monitors {
- import room.basic.types.*
+ import etrice.api.types.*
import etrice.api.contracts.definitions.*
import ContractMonitor.*
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
index 0d624e139..ce652356a 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room
@@ -1,18 +1,18 @@
RoomModel ActorCommunicationTest {
- import room.basic.types.boolean
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.boolean
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
ActorClass ActorCommunicationTest_Top {
@TestInstance
Structure {
ActorRef singleThread_Appl: Appl
- ActorRef timing: ATimingService
+ ActorRef timing: ATimerService
LayerConnection ref singleThread_Appl satisfied_by timing.timer
}
}
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 5bfaed535..9f92417e7 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
@@ -1,8 +1,8 @@
RoomModel ChoicePointTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
ActorClass CPTest_Top {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
index 9d6e0ffd5..8e1e7aaf1 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room
@@ -1,8 +1,8 @@
RoomModel ChoicePointTestExtended {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
ActorClass ChoicePointTestExtended_Top {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room
index 2646da962..560ca4663 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTest.room
@@ -1,7 +1,7 @@
RoomModel CompileTest {
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
import DetailExpressionTest.DetailExpressionTest
import StatemachineInterfaceTest.StatemachineInterfaceTest
import StatemachineInterfaceInheritedTest.StatemachineInterfaceInheritedTest
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
index eee0e744e..f96afca9c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ContinuationTransitionTest.room
@@ -1,8 +1,8 @@
RoomModel ContinuationTransitionTest {
- import room.basic.types.boolean
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.boolean
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
ActorClass ContinuationTransitionTest {
Structure {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room b/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room
index e3d9685e6..6a84ac665 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitor.room
@@ -1,6 +1,6 @@
RoomModel ContractMonitor {
- import room.basic.types.*
+ import etrice.api.types.*
import etrice.api.contracts.definitions.*
ProtocolClass PLoginProtocol {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room
index 6c518e9cc..0b46da9f9 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ContractMonitorTest.room
@@ -1,11 +1,11 @@
RoomModel ContractMonitorTest {
- import room.basic.service.timing.PTimer
- import room.basic.types.*
- import room.basic.test.TestInstance
- import ContractMonitor.*
- import room.basic.service.timing.ATimingService
+ import etrice.api.timer.PTimer
+ import etrice.api.types.*
+ import etrice.api.annotations.TestInstance
+ import etrice.api.timer.ATimerService
import etrice.api.contracts.monitors.PContractMonitorControl
+ import ContractMonitor.*
import ContractMonitor_monitors.LoginProtocolMonitor
ProtocolClass PClientTest {
@@ -22,7 +22,7 @@ RoomModel ContractMonitorTest {
@TestInstance
Structure {
ActorRef appl: Appl
- ActorRef timing: ATimingService
+ ActorRef timing: ATimerService
LayerConnection ref appl satisfied_by timing.timer
}
}
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
index 5b99bff1e..b5889c9f2 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room
@@ -1,18 +1,18 @@
RoomModel DataDrivenTest {
- import room.basic.types.float32
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
- import room.basic.test.TestInstance
+ import etrice.api.types.float32
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
+ import etrice.api.annotations.TestInstance
ActorClass DataDrivenTest_Top {
@TestInstance
Structure {
ActorRef appl: Appl
- ActorRef timing: ATimingService
+ ActorRef timing: ATimerService
LayerConnection ref appl satisfied_by timing.timer
}
}
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 8fa777157..ed01c9bd8 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
@@ -1,9 +1,9 @@
RoomModel DetailExpressionTest {
- import room.basic.types.boolean
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.boolean
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
import DetailExpressionEnum.PEnumProtocol
ActorClass DetailExpressionCompileTest {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
index b3dd275fb..e82f763ce 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room
@@ -1,8 +1,8 @@
RoomModel EnumTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
ActorClass EnumTest_Top {
@TestInstance
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 0aebcb9fd..7bf88bd26 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
@@ -1,8 +1,8 @@
RoomModel HandlerTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
ActorClass HandlerTest_Top {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
index 9520754f3..43af16a0d 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room
@@ -1,7 +1,7 @@
RoomModel OperationInheritanceTest {
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
async ActorClass OperationInheritanceTest extends BaseActor {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
index 062ded6cd..669e232be 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
@@ -1,9 +1,9 @@
RoomModel PingPongThreadReplPortTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
LogicalSystem System_PingPongReplPort {
@@ -12,7 +12,7 @@ RoomModel PingPongThreadReplPortTest {
SubSystemClass SubSystem_PingPongReplPort {
ActorRef application: PingPongTop
- ActorRef services: ATimingService
+ ActorRef services: ATimerService
LayerConnection ref application satisfied_by services.timer
LogicalThread mrPingThread
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
index 116664d4c..343b9275b 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
@@ -1,9 +1,9 @@
RoomModel PingPongThreadTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
LogicalSystem System_PingPong {
SubSystemRef main: SubSystem_PingPong
@@ -11,7 +11,7 @@ RoomModel PingPongThreadTest {
SubSystemClass SubSystem_PingPong {
ActorRef application: PingPongTop
- ActorRef services: ATimingService
+ ActorRef services: ATimerService
LayerConnection ref application satisfied_by services.timer
LogicalThread mrPingThread
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room
index f424be669..f74e1e38c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/StatemachineInterfaceTest.room
@@ -1,6 +1,6 @@
RoomModel StatemachineInterfaceTest {
- import room.basic.types.boolean
+ import etrice.api.types.boolean
ActorClass StatemachineInterfaceTest {
Structure {
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room
index 71ff99dd5..ddf1dc258 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/SubSystemUserCodeTest.room
@@ -1,7 +1,7 @@
RoomModel SubSystemUserCodeTest {
- import room.basic.annotations.SubSystemUserCode
- import room.basic.test.TestInstance
+ import etrice.api.annotations.SubSystemUserCode
+ import etrice.api.annotations.TestInstance
ActorClass AGeneratedUserCode {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room
index 12933cbce..e65593f12 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/VarargsTest.room
@@ -1,9 +1,9 @@
RoomModel VarargsTest {
- import room.basic.types.boolean
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.boolean
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
ActorClass AVarargs {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room
index dc3b671a8..bf5912119 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room
@@ -1,9 +1,9 @@
RoomModel InitializationTest {
- import room.basic.types.boolean
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.test.TestInstance
+ import etrice.api.types.boolean
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.annotations.TestInstance
async ActorClass InitializationTest {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room
index 349fa45bd..a753f7e22 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room
@@ -1,13 +1,13 @@
RoomModel SendingDataTest {
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.test.TestInstance
- import room.basic.language.languageIndicator
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.annotations.TestInstance
+ import etrice.api.language.languageIndicator
ActorClass SendingDataTop {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap
index 70952d30f..6e1772412 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.etmap
@@ -1,7 +1,7 @@
MappingModel DynamicActorTest1 {
import DynamicActorTest1.JavaGenTests
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping JavaGenTests -> GenericPhysicalSystem {
SubSystemMapping da1Test -> node {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room
index fa0c36d5a..d9343b18c 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room
@@ -1,7 +1,7 @@
RoomModel DynamicActorTest1 {
- import room.basic.types.int32
- import room.basic.types.string
+ import etrice.api.types.int32
+ import etrice.api.types.string
LogicalSystem JavaGenTests {
SubSystemRef da1Test: SubSystem_DynamicActorTest1
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap
index af042ed33..ae1a627e6 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.etmap
@@ -1,6 +1,6 @@
MappingModel DynamicActorTest1 {
import DynamicActorTest2.JavaGenTests
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping JavaGenTests -> GenericPhysicalSystem {
SubSystemMapping da2Test -> node {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room
index a11f065b0..aa6aad1bf 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room
@@ -1,7 +1,7 @@
RoomModel DynamicActorTest2 {
- import room.basic.types.int32
- import room.basic.types.string
+ import etrice.api.types.int32
+ import etrice.api.types.string
LogicalSystem JavaGenTests {
SubSystemRef da2Test: SubSystem_DynamicActorTest2
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room
index 1c39154ca..9c36bcb75 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room
@@ -1,8 +1,8 @@
RoomModel DynamicActorTest3 {
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
ActorClass Appl {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room
index 9f05cef55..1314a0cfb 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room
@@ -1,8 +1,8 @@
RoomModel DynamicActorTest4 {
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
ActorClass Appl {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room
index 0c642c800..c2558a7b4 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room
@@ -1,8 +1,8 @@
RoomModel DynamicActorTest5 {
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
ActorClass Appl {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room
index 3a10ce5a4..fe95b068f 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room
@@ -1,8 +1,8 @@
RoomModel DynamicActorTest6 {
- import room.basic.types.int32
- import room.basic.types.string
- import room.basic.test.TestInstance
+ import etrice.api.types.int32
+ import etrice.api.types.string
+ import etrice.api.annotations.TestInstance
ActorClass Appl {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap
index a2738a1ea..e53423a3a 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.etmap
@@ -1,7 +1,7 @@
MappingModel DynamicActorTest1 {
import DynamicActorTest7.JavaGenTests
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping JavaGenTests -> GenericPhysicalSystem {
SubSystemMapping da7Test -> node {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room
index f57cde472..731adfb7c 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room
@@ -1,13 +1,13 @@
RoomModel DynamicActorTest7 {
- import room.basic.types.boolean
- import room.basic.types.char
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.types.string
+ import etrice.api.types.boolean
+ import etrice.api.types.char
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.types.string
LogicalSystem JavaGenTests {
SubSystemRef da7Test: SubSystem_DynamicActorTest7
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
index c6423cad5..95f5759ef 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
@@ -1,7 +1,7 @@
MappingModel DynamicConfigTest {
import DynamicConfigTest.System_DynamicConfigTest
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping System_DynamicConfigTest -> GenericPhysicalSystem {
SubSystemMapping main -> node {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room
index 9fe63210a..8ee892757 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room
@@ -1,16 +1,16 @@
RoomModel DynamicConfigTest {
- import room.basic.types.char
- import room.basic.types.boolean
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.types.string
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.char
+ import etrice.api.types.boolean
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.types.string
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
LogicalSystem System_DynamicConfigTest {
SubSystemRef main: SubSystem_DynamicConfigTest
@@ -18,7 +18,7 @@ RoomModel DynamicConfigTest {
SubSystemClass SubSystem_DynamicConfigTest {
ActorRef testee: Testee_ac
- ActorRef timingService: ATimingService
+ ActorRef timingService: ATimerService
LayerConnection ref testee satisfied_by timingService.timer
LogicalThread defaultThread
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room
index 0e8f5f734..f1726d37b 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room
@@ -1,13 +1,13 @@
RoomModel SendingDataTest {
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.test.TestInstance
- import room.basic.language.languageIndicator
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.annotations.TestInstance
+ import etrice.api.language.languageIndicator
ActorClass SendingDataTop {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap
index 2fd5a28df..b20a3beca 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.etmap
@@ -1,7 +1,7 @@
MappingModel StaticConfigTest {
import StaticConfigTest.System_StaticConfigTest
- import room.generic.physical.GenericPhysicalSystem
+ import GenericPhysical.GenericPhysicalSystem
Mapping System_StaticConfigTest -> GenericPhysicalSystem {
SubSystemMapping main -> node {
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room
index a23ad8535..03b26ac9a 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room
@@ -1,16 +1,16 @@
RoomModel StaticConfigTest {
- import room.basic.types.boolean
- import room.basic.types.char
- import room.basic.types.int8
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.types.int64
- import room.basic.types.float32
- import room.basic.types.float64
- import room.basic.types.string
- import room.basic.service.timing.PTimer
- import room.basic.service.timing.ATimingService
+ import etrice.api.types.boolean
+ import etrice.api.types.char
+ import etrice.api.types.int8
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.types.int64
+ import etrice.api.types.float32
+ import etrice.api.types.float64
+ import etrice.api.types.string
+ import etrice.api.timer.PTimer
+ import etrice.api.timer.ATimerService
LogicalSystem System_StaticConfigTest {
SubSystemRef main: SubSystem_StaticConfigTest
@@ -19,7 +19,7 @@ RoomModel StaticConfigTest {
SubSystemClass SubSystem_StaticConfigTest {
LayerConnection ref top satisfied_by timer.timer
ActorRef top: Top_ac
- ActorRef timer: ATimingService
+ ActorRef timer: ATimerService
LogicalThread defaultThread
}
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
index e2b90eea7..b6db66550 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
@@ -1,6 +1,6 @@
RoomModel StoreRestoreTest {
- import room.basic.test.TestInstance
+ import etrice.api.annotations.TestInstance
ActorClass StoreRestore_Top {
@TestInstance
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room
index fa510c573..e9529a8a1 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room
@@ -1,14 +1,14 @@
RoomModel TCPTest {
- import room.basic.types.int16
- import room.basic.types.int32
- import room.basic.service.tcp.DTcpPayload
- import room.basic.service.tcp.DTcpControl
- import room.basic.service.tcp.PTcpPayload
- import room.basic.service.tcp.PTcpControl
- import room.basic.service.tcp.ATcpClient
- import room.basic.service.tcp.ATcpServer
- import room.basic.test.TestInstance
+ import etrice.api.types.int16
+ import etrice.api.types.int32
+ import etrice.api.tcp.DTcpPayload
+ import etrice.api.tcp.DTcpControl
+ import etrice.api.tcp.PTcpPayload
+ import etrice.api.tcp.PTcpControl
+ import etrice.api.tcp.ATcpClient
+ import etrice.api.tcp.ATcpServer
+ import etrice.api.annotations.TestInstance
ActorClass TCPTestTop {
@TestInstance

Back to the top