diff options
author | Adolfo SBH | 2016-10-21 12:02:11 +0000 |
---|---|---|
committer | Ed Willink | 2016-10-22 14:16:50 +0000 |
commit | 2a5f7db4022c0a2056624be8ead62cde328c839d (patch) | |
tree | 3f079e8bdcc0f3d3856825acdf8b17b9c67446fb | |
parent | 74f5b1747b6e3a52bf3b570cc42ecf86dbac1ba7 (diff) | |
download | org.eclipse.qvtd-2a5f7db4022c0a2056624be8ead62cde328c839d.tar.gz org.eclipse.qvtd-2a5f7db4022c0a2056624be8ead62cde328c839d.tar.xz org.eclipse.qvtd-2a5f7db4022c0a2056624be8ead62cde328c839d.zip |
[cs2as] - Removing the dependency on Xtext JUnit framework
9 files changed, 82 insertions, 210 deletions
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.classpath b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.classpath index 9081d4f70..213e409f9 100644 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.classpath +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/.classpath @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/META-INF/MANIFEST.MF index 3ee88a991..cc5b33d28 100644 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-SymbolicName: org.eclipse.qvtd.doc.minioclcs.xtext.tests; singleton:=true Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.qvtd.doc.minioclcs.xtext,
org.junit;bundle-version="4.7.0",
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.lib;bundle-version="2.10.0",
+ org.eclipse.qvtd.xtext.qvtbase.tests;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.qvtd.doc.minioclcs.xtext.tests
Import-Package: org.junit;version="4.5.0",
diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSInjectorProvider.java b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSInjectorProvider.java deleted file mode 100644 index 53e6a212d..000000000 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSInjectorProvider.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * generated by Xtext 2.10.0 - */ -package org.eclipse.qvtd.doc.minioclcs.xtext.tests; - -import com.google.inject.Guice; -import com.google.inject.Injector; -import org.eclipse.qvtd.doc.MiniOCLCSRuntimeModule; -import org.eclipse.qvtd.doc.MiniOCLCSStandaloneSetup; -import org.eclipse.xtext.junit4.GlobalRegistries; -import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento; -import org.eclipse.xtext.junit4.IInjectorProvider; -import org.eclipse.xtext.junit4.IRegistryConfigurator; - -public class MiniOCLCSInjectorProvider implements IInjectorProvider, IRegistryConfigurator { - - protected GlobalStateMemento stateBeforeInjectorCreation; - protected GlobalStateMemento stateAfterInjectorCreation; - protected Injector injector; - - static { - GlobalRegistries.initializeDefaults(); - } - - @Override - public Injector getInjector() { - if (injector == null) { - stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); - this.injector = internalCreateInjector(); - stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState(); - } - return injector; - } - - protected Injector internalCreateInjector() { - return new MiniOCLCSStandaloneSetup() { - @Override - public Injector createInjector() { - return Guice.createInjector(createRuntimeModule()); - } - }.createInjectorAndDoEMFRegistration(); - } - - protected MiniOCLCSRuntimeModule createRuntimeModule() { - // make it work also with Maven/Tycho and OSGI - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672 - return new MiniOCLCSRuntimeModule() { - @Override - public ClassLoader bindClassLoaderToInstance() { - return MiniOCLCSInjectorProvider.class - .getClassLoader(); - } - }; - } - - @Override - public void restoreRegistry() { - stateBeforeInjectorCreation.restoreGlobalState(); - } - - @Override - public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); - } -} diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.xtend b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.xtend index 502e067ea..899893370 100644 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.xtend +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.xtend @@ -3,63 +3,40 @@ */ package org.eclipse.qvtd.doc.minioclcs.xtext.tests -import com.google.inject.Inject -import org.eclipse.xtext.junit4.InjectWith -import org.eclipse.xtext.junit4.XtextRunner -import org.eclipse.xtext.junit4.util.ParseHelper +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.qvtd.doc.MiniOCLCSStandaloneSetup +import org.eclipse.qvtd.doc.minioclcs.RootCS +import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase import org.junit.Assert import org.junit.Test -import org.junit.runner.RunWith -import org.eclipse.qvtd.doc.minioclcs.RootCS -import junit.framework.TestCase - -@RunWith(XtextRunner) -@InjectWith(MiniOCLCSInjectorProvider) -class MiniOCLCSParsingTest extends TestCase { +import org.junit.Before - @Inject - ParseHelper<RootCS> parseHelper +class MiniOCLCSParsingTest extends LoadTestCase { + + @Before + override protected setUp() throws Exception { + super.setUp(); + MiniOCLCSStandaloneSetup.doSetup(); + } + + + def protected parse(String fileName) { + val fileURI = getProjectFileURI(fileName); + val rSet = new ResourceSetImpl(); + val resoure = rSet.getResource(fileURI, true); + return resoure.contents.get(0) as RootCS; + } + @Test def void testSimpleMiniOCL_PackagesDef() { - val result = parseHelper.parse(''' - package ocl { - - class String {} - } - - package package1 { - - class c1 { - prop a : ocl::String; - op getA() : ocl::String = a; - } - } - - ''') + val result = parse('models/simple_packages.mocl'); Assert.assertNotNull(result) } @Test def void testSimpleMiniOCL_Invariant() { - val result = parseHelper.parse(''' - package package1 { - - class c1 { - - prop a : String; - - op giveMeA() : String = self.c1; - - op testA() : Boolean = giveMeA().size() <> 0; - } - } - - context package1::c1 { - inv : a = giveMeA(); - inv : testA(); - } - ''') + val result = parse('models/simple_invariants.mocl'); Assert.assertNotNull(result) } diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_invariants.mocl b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_invariants.mocl new file mode 100644 index 000000000..e4f2fc548 --- /dev/null +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_invariants.mocl @@ -0,0 +1,16 @@ +package package1 { + + class c1 { + + prop a : String; + + op giveMeA() : String = self.c1; + + op testA() : Boolean = giveMeA().size() <> 0; + } +} + +context package1::c1 { + inv : a = giveMeA(); + inv : testA(); +}
\ No newline at end of file diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_packages.mocl b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_packages.mocl new file mode 100644 index 000000000..039345d94 --- /dev/null +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/src/org/eclipse/qvtd/doc/minioclcs/xtext/tests/models/simple_packages.mocl @@ -0,0 +1,12 @@ +package ocl { + + class String {} +} + +package package1 { + + class c1 { + prop a : ocl::String; + op getA() : ocl::String = a; + } +}
\ No newline at end of file diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.MiniOCLCSParsingTest.xtendbin b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.MiniOCLCSParsingTest.xtendbin Binary files differdeleted file mode 100644 index 8919ddde6..000000000 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.MiniOCLCSParsingTest.xtendbin +++ /dev/null diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.gitignore b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.gitignore index 2226a607e..1b24eecd6 100644 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.gitignore +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/.gitignore @@ -1 +1,2 @@ /.MiniOCLCSParsingTest.java._trace +/.MiniOCLCSParsingTest.xtendbin diff --git a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java index 71cc80c46..c5bd9943e 100644 --- a/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java +++ b/tests/org.eclipse.qvtd.doc.minioclcs.xtext.tests/xtend-gen/org/eclipse/qvtd/doc/minioclcs/xtext/tests/MiniOCLCSParsingTest.java @@ -3,112 +3,45 @@ */ package org.eclipse.qvtd.doc.minioclcs.xtext.tests; -import com.google.inject.Inject; -import junit.framework.TestCase; +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.resource.Resource; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.qvtd.doc.MiniOCLCSStandaloneSetup; import org.eclipse.qvtd.doc.minioclcs.RootCS; -import org.eclipse.qvtd.doc.minioclcs.xtext.tests.MiniOCLCSInjectorProvider; -import org.eclipse.xtend2.lib.StringConcatenation; -import org.eclipse.xtext.junit4.InjectWith; -import org.eclipse.xtext.junit4.XtextRunner; -import org.eclipse.xtext.junit4.util.ParseHelper; -import org.eclipse.xtext.xbase.lib.Exceptions; +import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(XtextRunner.class) -@InjectWith(MiniOCLCSInjectorProvider.class) @SuppressWarnings("all") -public class MiniOCLCSParsingTest extends TestCase { - @Inject - private ParseHelper<RootCS> parseHelper; +public class MiniOCLCSParsingTest extends LoadTestCase { + @Before + @Override + protected void setUp() throws Exception { + super.setUp(); + MiniOCLCSStandaloneSetup.doSetup(); + } + + protected RootCS parse(final String fileName) { + final URI fileURI = this.getProjectFileURI(fileName); + final ResourceSetImpl rSet = new ResourceSetImpl(); + final Resource resoure = rSet.getResource(fileURI, true); + EList<EObject> _contents = resoure.getContents(); + EObject _get = _contents.get(0); + return ((RootCS) _get); + } @Test public void testSimpleMiniOCL_PackagesDef() { - try { - StringConcatenation _builder = new StringConcatenation(); - _builder.append("package ocl {"); - _builder.newLine(); - _builder.append("\t"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("class String {}"); - _builder.newLine(); - _builder.append("}"); - _builder.newLine(); - _builder.newLine(); - _builder.append("package package1 {"); - _builder.newLine(); - _builder.append("\t"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("class c1 {\t\t"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("prop a : ocl::String;"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("op getA() : ocl::String = a;"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("}"); - _builder.newLine(); - _builder.append("}"); - _builder.newLine(); - _builder.newLine(); - final RootCS result = this.parseHelper.parse(_builder); - Assert.assertNotNull(result); - } catch (Throwable _e) { - throw Exceptions.sneakyThrow(_e); - } + final RootCS result = this.parse("models/simple_packages.mocl"); + Assert.assertNotNull(result); } @Test public void testSimpleMiniOCL_Invariant() { - try { - StringConcatenation _builder = new StringConcatenation(); - _builder.append("package package1 {"); - _builder.newLine(); - _builder.append("\t"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("class c1 {"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("prop a : String;"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("op giveMeA() : String = self.c1;"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("op testA() : Boolean = giveMeA().size() <> 0; "); - _builder.newLine(); - _builder.append("\t"); - _builder.append("}"); - _builder.newLine(); - _builder.append("}"); - _builder.newLine(); - _builder.newLine(); - _builder.append("context package1::c1 {"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("inv : a = giveMeA();"); - _builder.newLine(); - _builder.append("\t"); - _builder.append("inv : testA();"); - _builder.newLine(); - _builder.append("}"); - _builder.newLine(); - final RootCS result = this.parseHelper.parse(_builder); - Assert.assertNotNull(result); - } catch (Throwable _e) { - throw Exceptions.sneakyThrow(_e); - } + final RootCS result = this.parse("models/simple_invariants.mocl"); + Assert.assertNotNull(result); } } |