[generator.java.tests] activated persistency tests

Change-Id: I9d2c0ca48f40c325334cb6dff5ef7494473b97ab

11 files changed, 20 insertions, 30 deletions

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')