From 93d432b8b9e9afecc446ce868df88c4782b4cba3 Mon Sep 17 00:00:00 2001
From: jkohnlein <jkohnlein>
Date: Wed, 9 Jul 2008 09:46:30 +0000
Subject: [PATCH] made tests executable on build server

---
 .../META-INF/MANIFEST.MF                      | 42 ++++++++++++++++++-
 .../src/org/eclipse/xtext/Activator.java      | 40 ++++++++++++++++++
 .../src/org/eclipse/xtext/AllTests.java       |  3 ++
 .../grammarinheritance/ToEcoreTrafoTest.java  |  7 ++++
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/Activator.java

diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index 82a885688..45f8dfb6e 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -16,4 +16,44 @@ Require-Bundle: org.antlr;bundle-version="3.0.0",
  org.eclipse.emf.compare,
  org.eclipse.emf.compare.diff,
  org.eclipse.emf.compare.match,
- com.rcpquickstart.bundletestcollector;bundle-version="1.0.0"
+ com.rcpquickstart.bundletestcollector;bundle-version="1.0.0",
+ org.eclipse.xtext.ui;bundle-version="1.0.0"
+Export-Package: org.eclipse.xtext,
+ org.eclipse.xtext.dummy,
+ org.eclipse.xtext.dummy.parser,
+ org.eclipse.xtext.dummy.parser.internal,
+ org.eclipse.xtext.dummy.parsetree.reconstr,
+ org.eclipse.xtext.dummy.services,
+ org.eclipse.xtext.generator.resource,
+ org.eclipse.xtext.grammarinheritance,
+ org.eclipse.xtext.grammarinheritance.parser,
+ org.eclipse.xtext.grammarinheritance.parser.internal,
+ org.eclipse.xtext.grammarinheritance.parsetree.reconstr,
+ org.eclipse.xtext.grammarinheritance.services,
+ org.eclipse.xtext.lexer,
+ org.eclipse.xtext.metamodelreferencing.tests,
+ org.eclipse.xtext.metamodelreferencing.tests.parser,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.internal,
+ org.eclipse.xtext.metamodelreferencing.tests.parsetree.reconstr,
+ org.eclipse.xtext.metamodelreferencing.tests.services,
+ org.eclipse.xtext.parseerrorhandling,
+ org.eclipse.xtext.parser,
+ org.eclipse.xtext.parser.internal,
+ org.eclipse.xtext.parsetree,
+ org.eclipse.xtext.parsetree.reconstr,
+ org.eclipse.xtext.parsetree.reconstr.parser,
+ org.eclipse.xtext.parsetree.reconstr.parser.internal,
+ org.eclipse.xtext.parsetree.reconstr.parsetree.reconstr,
+ org.eclipse.xtext.parsetree.reconstr.services,
+ org.eclipse.xtext.reference,
+ org.eclipse.xtext.services,
+ org.eclipse.xtext.testlanguages,
+ org.eclipse.xtext.testlanguages.parser,
+ org.eclipse.xtext.testlanguages.parser.internal,
+ org.eclipse.xtext.testlanguages.parsetree.reconstr,
+ org.eclipse.xtext.testlanguages.services,
+ org.eclipse.xtext.tests,
+ org.eclipse.xtext.typeresolution,
+ org.eclipse.xtext.xtext2ecore
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.xtext.Activator
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/Activator.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/Activator.java
new file mode 100644
index 000000000..fb1eadaa2
--- /dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/Activator.java
@@ -0,0 +1,40 @@
+package org.eclipse.xtext;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.xtext.generator.tests";
+
+	// The shared instance
+	private static Activator plugin;
+
+	public Activator() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		setDefault(this);
+	}
+
+	private static void setDefault(Activator activator) {
+		plugin = activator;
+	}
+
+	public void stop(BundleContext context) throws Exception {
+		setDefault(null);
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
index f48bfaccf..3e510e9e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/AllTests.java
@@ -20,9 +20,12 @@ import com.rcpquickstart.bundletestcollector.BundleTestCollector;
  */
 public class AllTests {
 
+	public static boolean isPluginContext = false;
+	
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Test for org.eclipse.xtext");
 		new BundleTestCollector().collectTests(suite, "org.eclipse.xtext.generator.tests", "", "*");
+		isPluginContext = true;
 		return suite;
 	}
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java
index 8ff61ef1f..f659116ba 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ToEcoreTrafoTest.java
@@ -6,6 +6,8 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Activator;
+import org.eclipse.xtext.AllTests;
 import org.eclipse.xtext.Grammar;
 import org.eclipse.xtext.GrammarUtil;
 import org.eclipse.xtext.LexerRule;
@@ -15,6 +17,7 @@ import org.eclipse.xtext.parsetree.SyntaxError;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.tests.AbstractGeneratorTest;
+import org.eclipse.xtext.ui.util.BundleClasspathUriResolver;
 import org.eclipse.xtext.xtextutil.AbstractType;
 import org.eclipse.xtext.xtextutil.ComplexType;
 import org.eclipse.xtext.xtextutil.Feature;
@@ -99,6 +102,10 @@ public class ToEcoreTrafoTest extends AbstractGeneratorTest {
 
 	private XtextResource getResource(String uri) {
 		XtextResourceSet set = new XtextResourceSet();
+		if(AllTests.isPluginContext) {
+			set.setClasspathUriResolver(new BundleClasspathUriResolver());
+			set.setClasspathURIContext(Activator.getDefault());
+		}
 		XtextResource r = (XtextResource) set.getResource(URI.createURI(uri),true);
 		return r;
 	}