Correcting problems with tests on builder.
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/.classpath b/tests/org.eclipse.gmf.tests.xpand.migration/.classpath
index 8aab91c..77a089e 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/.classpath
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src-model"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src-model"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="resources"/>
+ <classpathentry kind="src" path="resources/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionAnalyzationTest.java b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionAnalyzationTest.java
index 59474b3..ad4e77b 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionAnalyzationTest.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionAnalyzationTest.java
@@ -24,6 +24,7 @@
import org.eclipse.gmf.internal.xpand.expression.AnalysationIssue;
import org.eclipse.gmf.internal.xpand.expression.ExecutionContext;
import org.eclipse.gmf.internal.xpand.expression.ExecutionContextImpl;
+import org.eclipse.gmf.internal.xpand.util.ClassLoadContext;
import org.eclipse.gmf.internal.xpand.xtend.ast.ExpressionExtensionStatement;
import org.eclipse.gmf.internal.xpand.xtend.ast.Extension;
import org.eclipse.gmf.internal.xpand.xtend.ast.ExtensionFile;
@@ -37,6 +38,7 @@
@Override
protected void setUp() throws Exception {
ec = new ExecutionContextImpl(null);
+ ec.setContextClassLoader(new ClassLoadContext.Naive(this.getClass().getClassLoader()));
issues = new HashSet<AnalysationIssue>();
}
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionEvaluationTest.java b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionEvaluationTest.java
index 886ba7a..2c576ea 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionEvaluationTest.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src/org/eclipse/gmf/tests/xtend/ExtensionEvaluationTest.java
@@ -24,6 +24,7 @@
import org.eclipse.gmf.internal.xpand.BuiltinMetaModel;
import org.eclipse.gmf.internal.xpand.expression.ExecutionContext;
import org.eclipse.gmf.internal.xpand.expression.ExecutionContextImpl;
+import org.eclipse.gmf.internal.xpand.util.ClassLoadContext;
import org.eclipse.gmf.internal.xpand.xtend.ast.ExtensionFile;
import org.eclipse.gmf.internal.xpand.xtend.ast.Extension;
@@ -37,6 +38,7 @@
@Override
protected void setUp() throws Exception {
ec = new ExecutionContextImpl(null);
+ ec.setContextClassLoader(new ClassLoadContext.Naive(this.getClass().getClassLoader()));
}
public final void testWithEverything() {
