integration.tests : repaired HFSM integration test

8 files changed, 85 insertions, 84 deletions

diff --git a/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
index 1e51648d3..bb7705123 100644
--- a/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: eTrice Integration Tests
-Bundle-SymbolicName: org.eclipse.etrice.integration.tests
-Bundle-Version: 0.1.0
-Export-Package: org.eclipse.etrice.integration.tests
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.etrice.generator.java;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
- org.eclipse.emf.mwe.utils;bundle-version="1.0.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15",
- org.apache.commons.logging;bundle-version="1.0.4",
- org.eclipse.jface.text;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0",
- org.eclipse.xtend.util.stdlib;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.junit4;bundle-version="4.8.1",
- org.eclipse.xtext.generator;bundle-version="1.0.0"
-Bundle-Vendor: eTrice (Incubation)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: eTrice Integration Tests

+Bundle-SymbolicName: org.eclipse.etrice.integration.tests

+Bundle-Version: 0.1.0

+Export-Package: org.eclipse.etrice.integration.tests

+Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",

+ org.eclipse.etrice.modellib;bundle-version="0.1.0",

+ org.eclipse.etrice.generator.java;bundle-version="0.1.0",

+ org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,

+ org.eclipse.emf.mwe.utils;bundle-version="1.0.0";visibility:=reexport,

+ org.apache.log4j;bundle-version="1.2.15",

+ org.apache.commons.logging;bundle-version="1.0.4",

+ org.eclipse.jface.text;bundle-version="3.6.0",

+ org.eclipse.jdt.core;bundle-version="3.6.0",

+ org.eclipse.xtend.util.stdlib;bundle-version="1.0.0",

+ org.eclipse.core.runtime;bundle-version="3.6.0",

+ org.eclipse.core.resources;bundle-version="3.6.0",

+ org.junit4;bundle-version="4.8.1",

+ org.eclipse.xtext.generator;bundle-version="1.0.0"

+Bundle-Vendor: eTrice (Incubation)

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch b/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch
index ff6e82aaa..bfab9db40 100644
--- a/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch
+++ b/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch
@@ -13,6 +13,7 @@
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">

 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;org.eclipse.etrice.integration.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>

 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>

+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.modellib/models&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>

 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;org.eclipse.etrice.integration.tests&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>

 </listAttribute>

 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

diff --git a/tests/org.eclipse.etrice.integration.tests/model/IntegrationTestFSMGenerator.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
index 6b2abdde5..856285d87 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/IntegrationTestFSMGenerator.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
@@ -1,5 +1,7 @@
 RoomModel org.eclipse.etrice.integration.tests {

 

+	import room.basic.service.timing.*

+

 	DataClass d_Packet {

 			Attribute data : int32

 	}

@@ -81,7 +83,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 				State State1 {

 					entry {

 						"fct.s1_entry();"

-						""

 					}

 					exit {

 						"fct.s1_exit();"

@@ -118,7 +119,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 						Transition tr0: my tp0 -> State1 {

 							action {

 								"fct.s2_m1_s2s1_action();"

-								""

 							}

 						}

 						Transition tr1: State1 -> State2 {

@@ -127,7 +127,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 							}

 							action {

 								"fct.s2s1_m2_s2s2_action();"

-								""

 							}

 						}

 						Transition tr2: State2 -> my tp1 {

@@ -136,7 +135,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 							}

 							action {

 								"fct.s2s2_m3_action();"

-								""

 							}

 						}

 						Transition tr3: my tp3 -> my tp3 {

@@ -145,7 +143,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 							}

 							action {

 								"fct.s2_m5_s2_action();"

-								""

 							}

 						}

 						Transition tr4: my tp4 -> my tp4 {

@@ -154,7 +151,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 							}

 							action {

 								"fct.s2_m6_s2_action();"

-								""

 							}

 						}

 					}

@@ -181,7 +177,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 				Transition tr0: initial -> State1 {

 					action {

 						"fct.init_action();"

-						""

 					}

 				}

 				Transition tr1: State1 -> tp0 of State2 {

@@ -190,13 +185,11 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"fct.s1_m1_s2_action();"

-						""

 					}

 				}

 				Transition tr2: tp1 of State2 -> State3 {

 					action {

 						"fct.s2__s3_action();"

-						""

 					}

 				}

 				Transition tr3: State2 -> State4 {

@@ -205,7 +198,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"fct.s2_m4_s4_action();"

-						""

 					}

 				}

 				Transition tr4: my tp0 -> State1 {

@@ -214,7 +206,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"fct.top_reset_s2_action();"

-						""

 					}

 				}

 				Transition tr5: State2 -> State2 {

@@ -223,7 +214,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"fct.s2_m7_s2_action();"

-						""

 					}

 				}

 				Transition tr6: my tp1 -> my tp1 {

@@ -232,7 +222,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"fct.top_s8_top_action();"

-						""

 					}

 				}

 				Transition tr7: my tp2 -> my tp2 {

@@ -280,7 +269,6 @@ RoomModel org.eclipse.etrice.integration.tests {
 					}

 					action {

 						"testee.m1();"

-						""

 					}

 				}

 				Transition tr3: State3 -> State4 {

@@ -312,8 +300,23 @@ RoomModel org.eclipse.etrice.integration.tests {
 		}

 	}

 

-	SubSystemClass ComponentMain {

+	LogicalSystem SystemHFSMTest {

+		SubSystemRef subsystem : SubSystemHFSMTest

+	}

+

+	SubSystemClass SubSystemHFSMTest {

+		ActorRef application : App_SubSystemHFSMTest

+		ActorRef services : ATimingService

+

+		LayerConnection ref application satisfied_by services.timer

+		LayerConnection ref application satisfied_by services.timeout

+	}

+

+	// automatically inserted App_SubSystemHFSMTest

+	ActorClass App_SubSystemHFSMTest {

+		Structure {

 			ActorRef HFSM_Tests : a_HFSM_Tests

+		}

 	}

 

 }

diff --git a/tests/org.eclipse.etrice.integration.tests/model/IntegrationTestFSMGenerator.trp b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.trp
index 3c2864617..aa86d08d1 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/IntegrationTestFSMGenerator.trp
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.trp
@@ -3662,9 +3662,10 @@ t
 f

 f

 0

-1285144822

+1292974899

 5

--ComponentClassBase.getInstance().terminate();

++SubSystemClassBase.getInstance().terminate();

+-

 -

 -1

 -1

@@ -4104,11 +4105,11 @@ t
 <20100916105801-328

 -bs_ActorClass

 3

--ComponentMain

+-SubSystemHFSMTest

 f

 f

 0

-1285144862

+1292973071

 0

 0

 8

@@ -4139,7 +4140,7 @@ f
 1

 -SAP

 0

-1285144862

+1292973070

 0

 f

 t

@@ -4160,16 +4161,16 @@ t
 f

 f

 0

-1284746557

+1292973234

 1

 -bs_ActorCoord

 0

-0.412917

-0.6945

+0.468125

+0.632875

 -bs_SizeFactors

 0

-2.99625

-0.995625

+2.99938

+0.99875

 -bs_CompPortRefList

 1

 -PortInstListDummyName

@@ -4426,7 +4427,7 @@ t
 <20100917200516-363

 -bs_ActorInstance

 3

--ComponentMain

+-SubSystemHFSMTest

 f

 f

 0

@@ -4471,7 +4472,7 @@ f
 1

 -GUIItemListDummyName

 0

-1285144862

+1292973070

 0

 f

 t

@@ -4483,7 +4484,7 @@ t
 <20100917200516-369

 -bs_ActorInstance

 3

--ComponentMain/HFSM_Tests

+-SubSystemHFSMTest/HFSM_Tests

 f

 f

 0

@@ -4540,7 +4541,7 @@ t
 <20100917200516-375

 -bs_ActorInstance

 3

--ComponentMain/HFSM_Tests/HFSM

+-SubSystemHFSMTest/HFSM_Tests/HFSM

 f

 f

 0

@@ -4597,7 +4598,7 @@ t
 <20100917200516-381

 -bs_ActorInstance

 3

--ComponentMain/HFSM_Tests/Tester

+-SubSystemHFSMTest/HFSM_Tests/Tester

 f

 f

 0

@@ -4658,8 +4659,32 @@ f
 1

 -ViewMemento

 0

-1292421958

+1292975199

+0

+t

+<20101222004639-2

+-bs_RefCounter

+0

+<20101222004639-3

+-bs_ViewMemento

+3

+-

+f

+f

 0

+1292975199

+1

+2

+1

+100

+100

+742

+489

+>20100829182239-355

+>20100829182239-356

+>20100829182239-372

+>20100829182239-373

+-TOP

 f

 f

 >20100917200516-354

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/.gitignore b/tests/org.eclipse.etrice.integration.tests/src-gen/.gitignore
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
index 22b378d3e..1a41a0c41 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
@@ -16,7 +16,7 @@ package org.eclipse.etrice.integration.tests;
 import static org.junit.Assert.assertEquals;

 

 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher;

-import org.eclipse.etrice.integration.tests.ComponentMain;

+import org.eclipse.etrice.integration.tests.SubSystemHFSMTest;

 import org.eclipse.etrice.integration.tests.a_HFSM_Tester;

 import org.junit.After;

 import org.junit.Before;

@@ -43,13 +43,13 @@ public class IntegrationTestFSMGenerator {
 	

 	@Test(timeout=1000)

 	public void testHFSM(){

-		ComponentMain main_component = new ComponentMain(null,"MainComponent");

+		SubSystemHFSMTest main_component = new SubSystemHFSMTest(null,"MainComponent");

 		main_component.init(); // lifecycle init

 		main_component.start(); // lifecycle start

 		

 		main_component.waitTerminate();

 		

-		assertEquals(a_HFSM_Tester.STATE_TestPass ,main_component.getInstance("/MainComponent/HFSM_Tests/Tester").getState());

+		assertEquals(a_HFSM_Tester.STATE_TestPass ,main_component.getInstance("/MainComponent/application/HFSM_Tests/Tester").getState());

 		

 		// end the lifecycle

 		main_component.stop(); // lifecycle stop

diff --git a/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Async.seq b/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Async.seq
deleted file mode 100644
index 58a2c1029..000000000
--- a/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Async.seq
+++ /dev/null
@@ -1,27 +0,0 @@
-#generated MSC for Trace2UML

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester init_action

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s1_entry

-	/MainComponent/HFSM_Tests/HFSM >>> State1

-	/MainComponent/HFSM_Tests/Tester >>> State1

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester init_action

-	/MainComponent/HFSM_Tests/Tester >>> State2

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s1_entry

-	/MainComponent/HFSM_Tests/Tester >-- /MainComponent/HFSM_Tests/HFSM m1

-	/MainComponent/HFSM_Tests/Tester >>> State3

-	/MainComponent/HFSM_Tests/Tester --> /MainComponent/HFSM_Tests/HFSM m1

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s1_exit

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s1_m1_s2_action

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s2_entry

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s2_m1_s2s1_action

-	/MainComponent/HFSM_Tests/HFSM >-- /MainComponent/HFSM_Tests/Tester s2s1_entry

-	/MainComponent/HFSM_Tests/HFSM >>> State2_State1

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s1_exit

-	/MainComponent/HFSM_Tests/Tester >>> State4

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s1_m1_s2_action

-	/MainComponent/HFSM_Tests/Tester >>> State5

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s2_entry

-	/MainComponent/HFSM_Tests/Tester >>> State6

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s2_m1_s2s1_action

-	/MainComponent/HFSM_Tests/Tester >>> State7

-	/MainComponent/HFSM_Tests/HFSM --> /MainComponent/HFSM_Tests/Tester s2s1_entry

-	/MainComponent/HFSM_Tests/Tester >>> TestPass

diff --git a/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Sync.seq b/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Sync.seq
deleted file mode 100644
index 50058ecdd..000000000
--- a/tests/org.eclipse.etrice.integration.tests/tmp/log/MainComponent_Sync.seq
+++ /dev/null
@@ -1 +0,0 @@
-#generated MSC for Trace2UML