[generator.fsm, abstractexec.behavior] abstract execution validation for state machines now independent of ROOM

Change-Id: I90d258c9167605eb287f1e88456b1d0966c37726

7 files changed, 14 insertions, 4 deletions

diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
index 61d2ff5e2..b9f6c2b9a 100644
--- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for Behavior Tests
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests
-Bundle-Version: 0.2.0.qualifier
+Bundle-Version: 0.5.0.qualifier
 Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator
 Bundle-Vendor: Eclipse eTrice (Incubation)
 Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="0.5.0",
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
index 8ab039ac5..c7ef1a568 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
@@ -31,13 +31,13 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.fsm.base.ILogger;
 import org.eclipse.etrice.core.genmodel.fsm.fsmgen.IDiagnostician;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.etrice.core.room.RoomModel;
 import org.eclipse.etrice.core.fsm.fSM.StateGraphItem;
-import org.eclipse.etrice.core.genmodel.base.ILogger;
 import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
 
 public class TestInstanceModelBuilderBase {
diff --git a/tests/org.eclipse.etrice.generator.c.tests/make.xml b/tests/org.eclipse.etrice.generator.c.tests/make.xml
index 1f4e08758..b056987c4 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.c.tests/make.xml
@@ -111,9 +111,10 @@
 		<mkdir dir="${output}"/>
 		<path id="clspath">
 			<pathelement location="../../plugins/org.eclipse.etrice.generator.c/bin"/>
+			<pathelement location="../../plugins/org.eclipse.etrice.generator.config/bin"/>
 			<pathelement location="../../plugins/org.eclipse.etrice.generator.doc/bin"/>
+			<pathelement location="../../plugins/org.eclipse.etrice.generator.fsm/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.generator/bin"/>
-			<pathelement location="../../plugins/org.eclipse.etrice.generator.config/bin"/>
 			<pathelement location="../../plugins/org.eclipse.etrice.core.common/bin"/>
 			<pathelement location="../../plugins/org.eclipse.etrice.core.fsm/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.core.room/bin"/>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index 0264918f8..f7fc6aa39 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -84,6 +84,7 @@
 			<pathelement location="../../plugins/org.eclipse.etrice.generator.java/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.generator.config/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.generator.doc/bin" />
+			<pathelement location="../../plugins/org.eclipse.etrice.generator.fsm/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.generator/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.core.common/bin" />
 			<pathelement location="../../plugins/org.eclipse.etrice.core.fsm/bin" />
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 ce9459d49..b7297c13f 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="0.5.0",
  org.eclipse.etrice.core.fsm;bundle-version="0.5.0",
  org.eclipse.etrice.core.room;bundle-version="0.5.0",
  org.eclipse.etrice.generator;bundle-version="0.5.0",
+ org.eclipse.etrice.generator.fsm;bundle-version="0.5.0",
  org.junit;bundle-version="4.8.1",
  org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.xtext;bundle-version="2.1.1",
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestDetailCodeTranslator.java b/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestDetailCodeTranslator.java
index 19acfed85..cf5fb4c91 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestDetailCodeTranslator.java
+++ b/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestDetailCodeTranslator.java
@@ -28,6 +28,8 @@ import org.eclipse.etrice.core.common.base.BaseFactory;
 import org.eclipse.etrice.core.common.base.IntLiteral;
 import org.eclipse.etrice.core.room.ActorClass;
 import org.eclipse.etrice.core.room.Attribute;
+import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem;
+import org.eclipse.etrice.core.fsm.fSM.AbstractMessage;
 import org.eclipse.etrice.core.fsm.fSM.DetailCode;
 import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
 import org.eclipse.etrice.core.fsm.util.FSMHelpers;
@@ -91,7 +93,7 @@ public class TestDetailCodeTranslator {
 		}
 
 		@Override
-		public String getInterfaceItemMessageText(InterfaceItem item, Message msg, ArrayList<String> args, String index, String orig) {
+		public String getInterfaceItemMessageText(AbstractInterfaceItem item, AbstractMessage msg, ArrayList<String> args, String index, String orig) {
 			if (index==null)
 				return ">"+item.getName()+"."+msg.getName()+"("+getArgList(args)+")<";
 			else
diff --git a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestGenFileTreeBuilder.java b/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestGenFileTreeBuilder.java
index f0bd9ef49..81e5ad6b8 100644
--- a/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestGenFileTreeBuilder.java
+++ b/tests/org.eclipse.etrice.generator.tests/src/org/eclipse/etrice/generator/base/TestGenFileTreeBuilder.java
@@ -18,6 +18,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
+import org.eclipse.etrice.generator.fsm.base.FolderFilter;
+import org.eclipse.etrice.generator.fsm.base.GenDir;
+import org.eclipse.etrice.generator.fsm.base.GenFile;
+import org.eclipse.etrice.generator.fsm.base.GenFileTreeBuilder;
+import org.eclipse.etrice.generator.fsm.base.GenItem;
 import org.junit.Test;
 
 /**