diff options
| author | Henrik Rentz-Reichert | 2012-09-20 14:40:03 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-09-20 14:40:03 +0000 |
| commit | 59c455dc5d7c98aae9494ad10130175f84afd344 (patch) | |
| tree | f3fbd1d3ce5346ec87a05f1f554127ad42d611dc /tests | |
| parent | 600d6db78bc56304df8cd49cae878423650f0bc7 (diff) | |
| download | org.eclipse.etrice-59c455dc5d7c98aae9494ad10130175f84afd344.tar.gz org.eclipse.etrice-59c455dc5d7c98aae9494ad10130175f84afd344.tar.xz org.eclipse.etrice-59c455dc5d7c98aae9494ad10130175f84afd344.zip | |
[common.tests] changes to make models target language independent
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room | 4 | ||||
| -rw-r--r-- | tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room | 6 |
2 files changed, 5 insertions, 5 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 58997f659..2a352e17d 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room @@ -31,7 +31,7 @@ RoomModel ChoicePointTest { } Behavior { Operation CPUser() { - "caseId = etUnit_openAll(\"tmp\", \"ChoicePointTest.etu\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTest\", \"ChoicePointTest_case\");" + "caseId = etUnit_openAll(\"tmp\", \"ChoicePointTest\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTest\", \"ChoicePointTest_case\");" } Operation ~CPUser() { "etUnit_closeAll(caseId);" @@ -40,7 +40,7 @@ RoomModel ChoicePointTest { Transition init: initial -> cp cp0 { action { "counter = 0;" - "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};" + "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(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 7aba7f2f9..956d83133 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room @@ -33,7 +33,7 @@ RoomModel HandlerTest { }
Behavior {
Operation HandlerUser() {
- "caseId = etUnit_openAll(\"tmp\", \"HandlerTest.etu\", \"org.eclipse.etrice.generator.common.tests.HandlerTest\", \"HandlerTest_case\");"
+ "caseId = etUnit_openAll(\"tmp\", \"HandlerTest\", \"org.eclipse.etrice.generator.common.tests.HandlerTest\", \"HandlerTest_case\");"
}
Operation ~HandlerUser() {
"etUnit_closeAll(caseId);"
@@ -59,8 +59,8 @@ RoomModel HandlerTest { }
Transition init: initial -> tp2 of state0 {
action {
- "int 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, list.length);"
+ "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);"
}
}
Transition tr9: state0 -> cp cp1 {
|