[generator.java.tests] activated persistency tests

Change-Id: I9d2c0ca48f40c325334cb6dff5ef7494473b97ab

37 files changed, 46 insertions, 106 deletions

diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle b/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
index 274dc2b9c..f85643e51 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.common/build.gradle b/plugins/org.eclipse.etrice.core.common/build.gradle
index 4901a7213..a7f391845 100644
--- a/plugins/org.eclipse.etrice.core.common/build.gradle
+++ b/plugins/org.eclipse.etrice.core.common/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.config/build.gradle b/plugins/org.eclipse.etrice.core.config/build.gradle
index 52d8bcc13..0212fd1ab 100644
--- a/plugins/org.eclipse.etrice.core.config/build.gradle
+++ b/plugins/org.eclipse.etrice.core.config/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.etmap/build.gradle b/plugins/org.eclipse.etrice.core.etmap/build.gradle
index 2570e0de4..3941075b6 100644
--- a/plugins/org.eclipse.etrice.core.etmap/build.gradle
+++ b/plugins/org.eclipse.etrice.core.etmap/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.etphys/build.gradle b/plugins/org.eclipse.etrice.core.etphys/build.gradle
index a40730e53..df10849f2 100644
--- a/plugins/org.eclipse.etrice.core.etphys/build.gradle
+++ b/plugins/org.eclipse.etrice.core.etphys/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.fsm/build.gradle b/plugins/org.eclipse.etrice.core.fsm/build.gradle
index 709db0841..c2990effc 100644
--- a/plugins/org.eclipse.etrice.core.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.core.fsm/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle b/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
index 8b106a6c8..47043d9b8 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.genmodel/build.gradle b/plugins/org.eclipse.etrice.core.genmodel/build.gradle
index 44d8a29a0..cec4cbf94 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/build.gradle
+++ b/plugins/org.eclipse.etrice.core.genmodel/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.core.room/build.gradle b/plugins/org.eclipse.etrice.core.room/build.gradle
index 27b540e1d..65c27312e 100644
--- a/plugins/org.eclipse.etrice.core.room/build.gradle
+++ b/plugins/org.eclipse.etrice.core.room/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.etunit.converter/build.gradle b/plugins/org.eclipse.etrice.etunit.converter/build.gradle
index ff480f35f..d360d108f 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/build.gradle
+++ b/plugins/org.eclipse.etrice.etunit.converter/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'application'
-}
+apply plugin: 'application'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.c/build.gradle b/plugins/org.eclipse.etrice.generator.c/build.gradle
index 403b5d312..9b30ce947 100644
--- a/plugins/org.eclipse.etrice.generator.c/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.c/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'application'
-}
+apply plugin: 'application'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.config/build.gradle b/plugins/org.eclipse.etrice.generator.config/build.gradle
index c466fd882..e515771f8 100644
--- a/plugins/org.eclipse.etrice.generator.config/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.config/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.cpp/build.gradle b/plugins/org.eclipse.etrice.generator.cpp/build.gradle
index 97b4f81b9..3e8f4dc88 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.cpp/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'application'
-}
+apply plugin: 'application'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.doc/build.gradle b/plugins/org.eclipse.etrice.generator.doc/build.gradle
index 22e1f4c90..ae948a25c 100644
--- a/plugins/org.eclipse.etrice.generator.doc/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.doc/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.fsm/build.gradle b/plugins/org.eclipse.etrice.generator.fsm/build.gradle
index 6846e2b40..54c69c79e 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.fsm/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/build.gradle b/plugins/org.eclipse.etrice.generator.gnuplot/build.gradle
index 8191b1ce1..cc039f1c1 100644
--- a/plugins/org.eclipse.etrice.generator.gnuplot/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.gnuplot/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.java/build.gradle b/plugins/org.eclipse.etrice.generator.java/build.gradle
index b087602e1..623d2729e 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.java/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'application'
-}
+apply plugin: 'application'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend
index c0457740e..6e248ab2f 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend
@@ -38,7 +38,7 @@ class ActorClassDataGen {
 	def doGenerate(Root root) {
 		val HashMap<ActorClass, WiredActorClass> ac2wired = new HashMap<ActorClass, WiredActorClass>
 		root.wiredInstances.filter(w|w instanceof WiredActorClass).forEach[w|ac2wired.put((w as WiredActorClass).actorClass, w as WiredActorClass)]
-		for (xpac: root.xpActorClasses.filter(cl|cl.actorClass.isValidGenerationLocation)) {
+		for (xpac: root.actorClasses.filter[isValidGenerationLocation].map[root.getExpandedActorClass(it)]) {
 			val wired = ac2wired.get(xpac.actorClass)
 			val path = xpac.actorClass.generationTargetPath+xpac.actorClass.getPath
 			val infopath = xpac.actorClass.generationInfoPath+xpac.actorClass.getPath
diff --git a/plugins/org.eclipse.etrice.generator/build.gradle b/plugins/org.eclipse.etrice.generator/build.gradle
index 5fd317151..65d2e65c7 100644
--- a/plugins/org.eclipse.etrice.generator/build.gradle
+++ b/plugins/org.eclipse.etrice.generator/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/plugins/org.eclipse.etrice.ui.runtime/build.gradle b/plugins/org.eclipse.etrice.ui.runtime/build.gradle
index 91ceac59a..89e51bff1 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/build.gradle
+++ b/plugins/org.eclipse.etrice.ui.runtime/build.gradle
@@ -1,8 +1,6 @@
 !!!! This script is currently not in use, see maven pom instead !!!!
 
-plugins {
-	id 'base'
-}
+apply plugin: 'base'
 
 def projects = [
 	'org.eclipse.etrice.runtime.c': '../../runtime',
diff --git a/runtime/org.eclipse.etrice.modellib.c/build.gradle b/runtime/org.eclipse.etrice.modellib.c/build.gradle
index 255601442..b20559e81 100644
--- a/runtime/org.eclipse.etrice.modellib.c/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.c/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'c'
-}
+apply plugin: 'c'
 
 apply from: "$rootDir/gradle/etGenerator.gradle"
 
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
index 8ae584694..2233bd102 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.cpp/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'cpp'
-}
+apply plugin: 'cpp'
 
 apply from: "$rootDir/gradle/etGenerator.gradle"
 
diff --git a/runtime/org.eclipse.etrice.modellib.java/build.gradle b/runtime/org.eclipse.etrice.modellib.java/build.gradle
index 9d3ddffb5..4d49f6b64 100644
--- a/runtime/org.eclipse.etrice.modellib.java/build.gradle
+++ b/runtime/org.eclipse.etrice.modellib.java/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 apply from: "$rootDir/gradle/etGenerator.gradle"
 
diff --git a/runtime/org.eclipse.etrice.runtime.c/build.gradle b/runtime/org.eclipse.etrice.runtime.c/build.gradle
index 27ae8fc4d..c694dd157 100644
--- a/runtime/org.eclipse.etrice.runtime.c/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.c/build.gradle
@@ -1,8 +1,6 @@
 import static org.apache.tools.ant.taskdefs.condition.Os.*
 
-plugins {
-	id 'c'
-}
+apply plugin: 'c'
 
 def platform = ''
 if(isFamily(FAMILY_WINDOWS)) { platform = 'MT_WIN_MinGW' }
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/build.gradle b/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
index 63e95beac..f07341997 100644
--- a/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.cpp/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'cpp'
-}
+apply plugin: 'cpp'
 
 model {
 	components {
diff --git a/runtime/org.eclipse.etrice.runtime.java/build.gradle b/runtime/org.eclipse.etrice.runtime.java/build.gradle
index a38c8a95f..643372bff 100644
--- a/runtime/org.eclipse.etrice.runtime.java/build.gradle
+++ b/runtime/org.eclipse.etrice.runtime.java/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 sourceSets {
 	main {
diff --git a/tests/org.eclipse.etrice.generator.c.tests/build.gradle b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
index e5ed184c3..54b58ac41 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.c.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'c'
-}
+apply plugin: 'c'
 
 apply from: "$rootDir/gradle/etTest.gradle"
 
diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
index 9fd487354..36ed20e47 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
@@ -1,8 +1,6 @@
-plugins {
-	id 'c'
-	id 'cpp'
-	id 'java-base'
-}
+apply plugin: 'c'
+apply plugin: 'cpp'
+apply plugin: 'java-base'
 
 apply from: "$rootDir/gradle/etTest.gradle"
 
diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
index aede47920..d7796b293 100644
--- a/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.cpp.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'cpp'
-}
+apply plugin: 'cpp'
 
 apply from: "$rootDir/gradle/etTest.gradle"
 
diff --git a/tests/org.eclipse.etrice.generator.java.tests/.classpath b/tests/org.eclipse.etrice.generator.java.tests/.classpath
index 65add28fb..11a04dd05 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/.classpath
+++ b/tests/org.eclipse.etrice.generator.java.tests/.classpath
@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="src/storeRestoreTest"/>
 	<classpathentry kind="src" path="src/staticConfigTest"/>
 	<classpathentry kind="src" path="src/dynamicConfigTest"/>
-	<classpathentry kind="lib" path="build/libs/org.eclipse.etrice.generator.java.tests.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/>
diff --git a/tests/org.eclipse.etrice.generator.java.tests/build.gradle b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
index 0c8b984e7..5fe852151 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.java.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java-base'
-}
+apply plugin: 'java-base'
 
 apply from: "$rootDir/gradle/etTest.gradle"
 
@@ -19,11 +17,16 @@ createTest('java', 'dynamicActorTest6', ['models/DynamicActorTest6.room', generi
 
 createTest('java', 'tCPTest', ['models/TCPTest.room', genericPhysical])
 
-/* These are not working yet (problem when genererating with -persistable -storeObjects the Modellib is overriden)	:((
 def genOptions = ['-persistable', '-storeDataObj']
 createTest('java', 'dynamicActorTest7', ['models/DynamicActorTest7.etmap', 'models/DynamicActorTest7.room'], genOptions)
 sourceSets.dynamicActorTest7.java.srcDir 'src/dynamicActorTest7'
-createTest('java', 'dynamicConfigTest', ['models/DynamicConfigTest.etmap', 'models/DynamicConfigTest.room'], genOptions)
+createTest('java', 'dynamicConfigTest', ['models/DynamicConfigTest.etmap', 'models/DynamicConfigTest.room', 'models/DynamicConfigTest.config'], genOptions)
 sourceSets.dynamicConfigTest.java.srcDir 'src/dynamicConfigTest'
 createTest('java', 'storeRestoreTest', ['models/StoreRestoreTest.room', genericPhysical], genOptions)
-sourceSets.storeRestoreTest.java.srcDir 'src/storeRestoreTest'	*/
\ No newline at end of file
+sourceSets.storeRestoreTest.java.srcDir 'src/storeRestoreTest'
+
+task copyRTConfig(type: Copy) {
+	from 'models/DynamicConfigTest.rt-config'
+	into 'log/dynamicConfigTestJava'
+}
+runDynamicConfigTestJava.dependsOn copyRTConfig
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
index 3ec15a8f2..6cb2c523e 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.etmap
@@ -1,7 +1,7 @@
 MappingModel DynamicConfigTest {
 
 	import DynamicConfigTest.* from "DynamicConfigTest.room"
-	import room.generic.physical.* from "GenericPhysical.etphys"
+	import room.generic.physical.* from "../../org.eclipse.etrice.generator.common.tests/models/GenericPhysical.etphys"
 
 	Mapping System_DynamicConfigTest -> GenericPhysicalSystem {
 			SubSystemMapping main -> node {}
diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
index 7fab6d5cc..939f5c211 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
+++ b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room
@@ -17,7 +17,7 @@ RoomModel StoreRestoreTest {
 			Port prt: PC
 		}
 		Structure {
-			usercode1 { "import StoreRestore.ObjectHolder;" }
+			usercode1 { "import StoreRestoreTest.ObjectHolder;" }
 			
 			external Port prt
 			
diff --git a/tests/org.eclipse.etrice.generator.java.tests/src/dynamicConfigTest/DynamicConfigTest/ConfigSourceTestInstance.java b/tests/org.eclipse.etrice.generator.java.tests/src/dynamicConfigTest/DynamicConfigTest/ConfigSourceTestInstance.java
index 5d7b3f846..4dc9d76f0 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/src/dynamicConfigTest/DynamicConfigTest/ConfigSourceTestInstance.java
+++ b/tests/org.eclipse.etrice.generator.java.tests/src/dynamicConfigTest/DynamicConfigTest/ConfigSourceTestInstance.java
@@ -9,7 +9,7 @@ public class ConfigSourceTestInstance {
 	
 	public static IConfigSource getInstance(){
 		if(instance == null){
-			instance = new ConfigSourceFile("models/DynamicConfigTest_Java.rt-config");
+			instance = new ConfigSourceFile("DynamicConfigTest.rt-config");
 		}
 		return instance;
 	}
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
index 32ebe4192..b6ae64f85 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle
@@ -1,8 +1,6 @@
 import static org.apache.tools.ant.taskdefs.condition.Os.*
 
-plugins {
-	id 'c'
-}
+apply plugin: 'c'
 
 apply from: "$rootDir/gradle/etUnitConverter.gradle"
 
diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
index c3bcbb50b..717da9ee7 100644
--- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle
@@ -1,8 +1,6 @@
 import static org.apache.tools.ant.taskdefs.condition.Os.*
 
-plugins {
-	id 'cpp'
-}
+apply plugin: 'cpp'
 
 apply from: "$rootDir/gradle/etUnitConverter.gradle"
 
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
index ad80588e9..9491de183 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
+++ b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java'
-}
+apply plugin: 'java'
 
 dependencies {
 	testCompile project(':runtime:org.eclipse.etrice.runtime.java')