new approach to automated testing

This commit is contained in:
jkohnlein 2008-07-09 11:54:42 +00:00 committed by sefftinge
parent 93d432b8b9
commit 4c49a10838
4 changed files with 5 additions and 121 deletions

View file

@ -15,45 +15,4 @@ Require-Bundle: org.antlr;bundle-version="3.0.0",
org.openarchitectureware.dependencies;bundle-version="4.3.0",
org.eclipse.emf.compare,
org.eclipse.emf.compare.diff,
org.eclipse.emf.compare.match,
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
org.eclipse.emf.compare.match

View file

@ -1,40 +0,0 @@
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;
}
}

View file

@ -1,32 +0,0 @@
/*******************************************************************************
* Copyright (c) 2008 itemis AG (http://www.itemis.eu) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
*******************************************************************************/
package org.eclipse.xtext;
import junit.framework.Test;
import junit.framework.TestSuite;
import com.rcpquickstart.bundletestcollector.BundleTestCollector;
/**
* @author Jan Köhnlein - Initial contribution and API
*
*/
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;
}
}

View file

@ -6,8 +6,6 @@ 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;
@ -17,7 +15,6 @@ 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;
@ -102,10 +99,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());
}
// if(AllTests.isPluginContext) {
// set.setClasspathUriResolver(new BundleClasspathUriResolver());
// set.setClasspathURIContext(Activator.getDefault());
// }
XtextResource r = (XtextResource) set.getResource(URI.createURI(uri),true);
return r;
}