Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-20 16:28:20 +0000
committerHenrik Rentz-Reichert2012-09-20 16:28:20 +0000
commit9a2224098f7dca6c3161421ea707fe1ead803bf9 (patch)
treea5b9e5239a5fea928a009df164c266d4e17f16dd /tests
parentc35b804780f182b40df5508dd904ad224cf8c1e1 (diff)
downloadorg.eclipse.etrice-9a2224098f7dca6c3161421ea707fe1ead803bf9.tar.gz
org.eclipse.etrice-9a2224098f7dca6c3161421ea707fe1ead803bf9.tar.xz
org.eclipse.etrice-9a2224098f7dca6c3161421ea707fe1ead803bf9.zip
[generator.common.tests] moving list for expect order to attributes
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room4
-rw-r--r--tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room4
2 files changed, 4 insertions, 4 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 2a352e17d..02cf9eaa9 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room
@@ -27,6 +27,7 @@ RoomModel ChoicePointTest {
external Port TestPort1
Attribute counter: int32
Attribute caseId: int32
+ Attribute resultlist[29]: int16 = "{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}"
}
Behavior {
@@ -40,8 +41,7 @@ RoomModel ChoicePointTest {
Transition init: initial -> cp cp0 {
action {
"counter = 0;"
- "short 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_START(caseId,resultlist,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 956d83133..aef762867 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room
@@ -30,6 +30,7 @@ RoomModel HandlerTest {
external Port TestPort1
Attribute counter: int32
Attribute caseId: int32
+ Attribute resultlist[44]: int16 = "{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}"
}
Behavior {
Operation HandlerUser() {
@@ -59,8 +60,7 @@ RoomModel HandlerTest {
}
Transition init: initial -> tp2 of state0 {
action {
- "short 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, 44);"
+ "EXPECT_ORDER_START(caseId, resultlist, 44);"
}
}
Transition tr9: state0 -> cp cp1 {

Back to the top