From 488cb57e4de0da85ae20fc7b3a658197fbc703ae Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Fri, 16 Nov 2012 17:28:33 +0100
Subject: [generator.*.tests] model and class path adjustments
for new etphys and etmap models and changed grammar---
tests/org.eclipse.etrice.generator.c.tests/make.xml | 4 +++-
.../models/PingPongThreadReplPortTest.room | 13 +++++++++----
.../models/PingPongThreadTest.room | 15 ++++++++++-----
tests/org.eclipse.etrice.generator.java.tests/make.xml | 4 +++-
4 files changed, 25 insertions(+), 11 deletions(-)
(limited to 'tests')
diff --git a/tests/org.eclipse.etrice.generator.c.tests/make.xml b/tests/org.eclipse.etrice.generator.c.tests/make.xml
index 9e49f5c3e..3100791b0 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.c.tests/make.xml
@@ -89,9 +89,11 @@
-
+
+
+
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 2cffc8378..301c5e9b5 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room
@@ -11,10 +11,15 @@ RoomModel PingPongThreadTestReplPort {
ActorRef application: PingPongTop
ActorRef services: ATimingService
LayerConnection ref application satisfied_by services.timer
- LogicalThread mrPingThread prio=5 {application.MrPing}
- LogicalThread mrPong1Thread prio=5 {application.MrPong1}
- LogicalThread mrPong2Thread prio=5 {application.MrPong2}
- LogicalThread mrPong3Thread prio=5 {application.MrPong3}
+
+ LogicalThread mrPingThread
+ LogicalThread mrPong1Thread
+ LogicalThread mrPong2Thread
+ LogicalThread mrPong3Thread
+ ActorInstanceMapping application/MrPing -> mrPingThread
+ ActorInstanceMapping application/MrPong1 -> mrPong1Thread
+ ActorInstanceMapping application/MrPong2 -> mrPong2Thread
+ ActorInstanceMapping application/MrPong3 -> mrPong3Thread
}
ActorClass PingPongTop {
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 8d2592f43..8f83b54b4 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room
@@ -11,10 +11,15 @@ RoomModel PingPongThreadTest {
ActorRef application: PingPongTop
ActorRef services: ATimingService
LayerConnection ref application satisfied_by services.timer
- LogicalThread mrPingThread prio=5 {application.MrPing}
- LogicalThread mrPong1Thread prio=5 {application.MrPong1}
- LogicalThread mrPong2Thread prio=5 {application.MrPong2}
- LogicalThread mrPong3Thread prio=5 {application.MrPong3}
+
+ LogicalThread mrPingThread
+ LogicalThread mrPong1Thread
+ LogicalThread mrPong2Thread
+ LogicalThread mrPong3Thread
+ ActorInstanceMapping application/MrPing -> mrPingThread
+ ActorInstanceMapping application/MrPong1 -> mrPong1Thread
+ ActorInstanceMapping application/MrPong2 -> mrPong2Thread
+ ActorInstanceMapping application/MrPong3 -> mrPong3Thread
}
ActorClass PingPongTop {
@@ -152,4 +157,4 @@ RoomModel PingPongThreadTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index 5de63390f..1b0efdce4 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -83,9 +83,11 @@
-
+
+
+
--
cgit v1.2.3