diff options
Diffstat (limited to 'tests')
21 files changed, 49 insertions, 46 deletions
diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF index 3543fafdc..d4891d3c3 100644 --- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: eTrice Room Core Tests
Bundle-SymbolicName: org.eclipse.etrice.core.room.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index e3fdd1d9b..f50a5d85e 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: eTrice Generator Model Tests
Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
diff --git a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec b/tests/org.eclipse.etrice.integration.tests/buckminster.cspec index e4be950e1..045c79c6e 100644 --- a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec +++ b/tests/org.eclipse.etrice.integration.tests/buckminster.cspec @@ -1,2 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.integration.tests" componentType="buckminster" version="1.0.0"/>
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.integration.tests" componentType="buckminster" version="1.0.0">
+ <cs:actions>
+ <cs:public name="generate" actor="ant">
+ <cs:actorProperties>
+ <cs:property key="buildFile" value="generate.xml"/>
+ <cs:property key="targets" value="generate"/>
+ </cs:actorProperties>
+ </cs:public>
+ </cs:actions>
+</cs:cspec>
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java index 0f1da6f01..2b13c12f8 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java @@ -82,9 +82,9 @@ public class CPTester extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__state0() {
TestPort1.msg1();
System.out.println("msg1 sent ");
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java index 66e1f88b6..15b62eee1 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java @@ -105,7 +105,7 @@ public class CPUser extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_state0() {
System.out.println("state0: entry code");
crcGen.update(12);
@@ -132,7 +132,7 @@ public class CPUser extends ActorClassBase { crcGen.update(23);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__cp0() {
System.out.println("Top Level init transition");
crcGen.update(10);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java index 5d8424300..2c4512456 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java @@ -126,7 +126,7 @@ public class HandlerUser extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_state0() {
System.out.println("state 0 entry action");
crcGen.update(13);
@@ -168,7 +168,7 @@ public class HandlerUser extends ActorClassBase { crcGen.update(112);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_tp0_TO_tp0_BY_msg1TestPort1_tr0(InterfaceItemBase ifitem, int p1) {
System.out.println("top level handler action no guard ");
crcGen.update(11);
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 1364e1a2d..808c88c3e 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 @@ -87,9 +87,9 @@ public class Tester extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__state0() {
TestPort1.msg1(2);
System.out.println("msg1(2) sent ");
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 c7e56440c..996ddad81 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 @@ -107,9 +107,9 @@ public class MrPingActor extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
timer.Start(10);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java index c438e1240..b8f859b02 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java @@ -84,9 +84,9 @@ public class MrPongActor1 extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
PingPongPort.pong();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java index 2c5365077..c91a684e0 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java @@ -84,9 +84,9 @@ public class MrPongActor2 extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForPing() {
// simulate blocking call e.g. Queue
try{
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 1d36c714a..cf8ca89dc 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 @@ -100,9 +100,9 @@ public class MrPingActor extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
timer.Start(1000);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java index e5e8e9aed..656905aa4 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java @@ -84,9 +84,9 @@ public class MrPongActor1 extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
PingPongPort.pong();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java index dc3afc68c..00bf2740a 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java @@ -126,9 +126,9 @@ public class MrPing extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForPong() {
int i;
int[] intArray;
@@ -215,9 +215,11 @@ public class MrPing extends ActorClassBase { int[] intArray = data.getOwnType().getArrayFromInt32();
for (int i=0;i<intArray.length;i++) {intArray[i] = 10+i;}
data.getOwnType().setArrayFromInt32(intArray);
+ int[] intArrayShort=data.getArrayFromInt32();
+ for (int j=0;j<intArrayShort.length;j++) {intArray[j] = 10+j;}
// use convenient function
- PingPongPort.ping((byte)45,(short)34,80,'c',(float)3.14,7.12345,"Hase !",intArray,data.getOwnType());
+ PingPongPort.ping((byte)45,(short)34,80,'c',(float)3.14,7.12345,"Hase !",intArrayShort,data.getOwnType());
crcGen.update(13);
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java index c77b137ce..510919d98 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java @@ -98,9 +98,9 @@ public class MrPong extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_reply_TO_reply_BY_pingPingPongPort_tr0(InterfaceItemBase ifitem, PingPongData p) {
p.setI8Val((byte)(p.getI8Val()+1));
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java index 97e4ea456..b3956d14b 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java @@ -116,10 +116,12 @@ public class PingPongData { copy.f32Val = f32Val;
copy.f64Val = f64Val;
copy.stringVal = stringVal;
- for (int i=0;i<5;i++){
+ for (int i=0;i<arrayFromInt32.length;i++){
copy.arrayFromInt32[i] = arrayFromInt32[i];
}
- copy.ownType = ownType.deepCopy();
+ if (ownType!=null) {
+ copy.ownType = ownType.deepCopy();
+ }
return copy;
}
};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java index 06b104188..5936010e4 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java @@ -73,17 +73,7 @@ public class PingPongDataDeep { super();
// initialize attributes
- i8Val = 0;
- i16Val = 0;
- i32Val = 0;
- charVal = 0;
- f32Val = 0;
- f64Val = 0;
- stringVal = "";
arrayFromInt32 = new int[10];
- for (int i=0;i<10;i++){
- arrayFromInt32[i] = 0;
- }
}
// constructor using fields
@@ -110,7 +100,7 @@ public class PingPongDataDeep { copy.f32Val = f32Val;
copy.f64Val = f64Val;
copy.stringVal = stringVal;
- for (int i=0;i<10;i++){
+ for (int i=0;i<arrayFromInt32.length;i++){
copy.arrayFromInt32[i] = arrayFromInt32[i];
}
return copy;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java index 133f70e25..86c53d95c 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java @@ -112,7 +112,7 @@ public class a_HFSM extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_State1() {
fct.s1_entry();
}
@@ -150,7 +150,7 @@ public class a_HFSM extends ActorClassBase { fct.s4_exit();
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__State1() {
fct.init_action();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java index d01ddf266..d8e69a429 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java @@ -113,12 +113,12 @@ public class a_HFSM_Tester extends ActorClassBase { this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_TestPass() {
RTServices.getInstance().getSubSystem().testFinished(0);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_State2_TO_State3_BY_s1_entrytestee(InterfaceItemBase ifitem) {
testee.m1();
}
diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF index c327f06dc..bdd169147 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: eTrice Behavior Diagram Tests
Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.ui,
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF index 08f2c811d..988f89481 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: eTrice Structure Diagram Tests
Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.junit4;bundle-version="[4.8.1,4.9.0)",
diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF index 984aa66c1..1f567254d 100644 --- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: eTrice Diagram Test Base Classes
Bundle-SymbolicName: org.eclipse.etrice.ui.tests.base
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Require-Bundle: org.junit4;bundle-version="[4.8.1,4.9.0)",
org.eclipse.core.runtime,
org.eclipse.etrice.core.room;bundle-version="0.1.0",
|