Correcting problems with tests on builder.
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/build.properties b/tests/org.eclipse.gmf.tests.xpand.migration/build.properties
index afe37de..ac5329b 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/build.properties
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/build.properties
@@ -1,5 +1,6 @@
source.. = src/,\
- src-model/
+ src-model/,\
+ resources/
output.. = bin/
bin.includes = META-INF/,\
.,\
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.ext b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.ext
index 3cf805b..3e67adf 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.ext
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.ext
@@ -5,21 +5,21 @@
;
String simpleNativeExtension(String parameter, Boolean parameter2) :
-JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativeExtension(java.lang.String, java.lang.Boolean)
+JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativeExtension(java.lang.String, java.lang.Boolean)
;
String simpleNativePolyExtension(String parameter, Boolean parameter2) :
-JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativePolyExtension(java.lang.String, java.lang.Boolean)
+JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativePolyExtension(java.lang.String, java.lang.Boolean)
;
String simpleNativePolyExtension(Object parameter, Boolean parameter2) :
-JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativePolyExtension(java.lang.String, java.lang.Boolean)
+JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativePolyExtension(java.lang.String, java.lang.Boolean)
;
ecore::EClass modelElementAsNativeExtensionParameter(ecore::EObject param1, ecore::EPackage param2) :
-JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.modelElementAsNativeExtensionParameter(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EPackage)
+JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensions.modelElementAsNativeExtensionParameter(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EPackage)
;
List[ecore::EClass] collectionsInNativeExtensions(Collection[ecore::EObject] param1, Set[ecore::EPackage] param2, List[Object] param3, List[ecore::EClassifier] param4) :
-JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.collectionsInNativeExtensions(java.util.Collection, java.util.Set, java.lang.Object.List, org.eclipse.emf.ecore.EClassifier.List)
+JAVA org.eclipse.gmf.tests.xpand.migration.NativeExtensions.collectionsInNativeExtensions(java.util.Collection, java.util.Set, java.lang.Object.List, org.eclipse.emf.ecore.EClassifier.List)
;
\ No newline at end of file
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java_
similarity index 71%
rename from tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java
rename to tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java_
index 57ac0b6..d20b610 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/resources/org/eclipse/gmf/tests/xpand/migration/JavaExtensionsContainer.java_
@@ -3,13 +3,13 @@
import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
public class NativeJavaExtensionsContainer {
@Operation(contextual = false, kind = Kind.HELPER)
-public static String simpleNativeExtension(String parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativeExtension(parameter, parameter2); }
+public static String simpleNativeExtension(String parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativeExtension(parameter, parameter2); }
@Operation(contextual = true, kind = Kind.HELPER)
-public String simpleNativePolyExtension(String parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativePolyExtension(parameter, parameter2); }
+public String simpleNativePolyExtension(String parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativePolyExtension(parameter, parameter2); }
@Operation(contextual = true, kind = Kind.HELPER)
-public String simpleNativePolyExtension(Object parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.simpleNativePolyExtension(parameter, parameter2); }
+public String simpleNativePolyExtension(Object parameter, Boolean parameter2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensions.simpleNativePolyExtension(parameter, parameter2); }
@Operation(contextual = false, kind = Kind.HELPER)
-public static org.eclipse.emf.ecore.EClass modelElementAsNativeExtensionParameter(org.eclipse.emf.ecore.EObject param1, org.eclipse.emf.ecore.EPackage param2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.modelElementAsNativeExtensionParameter(param1, param2); }
+public static org.eclipse.emf.ecore.EClass modelElementAsNativeExtensionParameter(org.eclipse.emf.ecore.EObject param1, org.eclipse.emf.ecore.EPackage param2) { return org.eclipse.gmf.tests.xpand.migration.NativeExtensions.modelElementAsNativeExtensionParameter(param1, param2); }
@Operation(contextual = false, kind = Kind.HELPER)
-public static java.util.List<org.eclipse.emf.ecore.EClass> collectionsInNativeExtensions(java.util.Collection<org.eclipse.emf.ecore.EObject> param1, java.util.Set<org.eclipse.emf.ecore.EPackage> param2, java.util.List<Object> param3, java.util.List<org.eclipse.emf.ecore.EClassifier> param4) { return org.eclipse.ocl.util.CollectionUtil.<org.eclipse.emf.ecore.EClass> createNewSequence(org.eclipse.gmf.tests.xpand.migration.NativeExtensionsContainer.collectionsInNativeExtensions(param1, param2, param3.toArray(new Object[param3.size()]), param4.toArray(new org.eclipse.emf.ecore.EClassifier[param4.size()]))); }
+public static java.util.List<org.eclipse.emf.ecore.EClass> collectionsInNativeExtensions(java.util.Collection<org.eclipse.emf.ecore.EObject> param1, java.util.Set<org.eclipse.emf.ecore.EPackage> param2, java.util.List<Object> param3, java.util.List<org.eclipse.emf.ecore.EClassifier> param4) { return org.eclipse.ocl.util.CollectionUtil.<org.eclipse.emf.ecore.EClass> createNewSequence(org.eclipse.gmf.tests.xpand.migration.NativeExtensions.collectionsInNativeExtensions(param1, param2, param3.toArray(new Object[param3.size()]), param4.toArray(new org.eclipse.emf.ecore.EClassifier[param4.size()]))); }
}
\ No newline at end of file
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/migration/XtendMigrationTest.java b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/migration/XtendMigrationTest.java
index f777dc7..6913125 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/migration/XtendMigrationTest.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xpand/migration/XtendMigrationTest.java
@@ -199,7 +199,7 @@
String classBody = facade.getNativeLibraryClassBody().toString();
assertNotNull(classBody);
- BufferedReader reader = new BufferedReader(new InputStreamReader(testResourceManager.loadFile(getResourceName(fileName), "java")));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(testResourceManager.loadFile(getResourceName(fileName), "java_")));
StringBuilder sb = new StringBuilder();
for (String nextLine = reader.readLine(); nextLine != null; nextLine = reader.readLine()) {
if (sb.length() > 0) {
