From d65d1f1dd6f84f9ec98aad13fead4f2c57b43b53 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Tue, 10 Jan 2017 17:36:28 +0100 Subject: [PATCH 1/2] 230: Junit4Fragment2 added dependencies for .tests project Task-Url: https://github.com/eclipse/xtext-core/issues/230 Signed-off-by: Lorenzo Bettini --- .../xtext/generator/junit/Junit4Fragment2.xtend | 9 +++++++++ .../xtext/xtext/generator/junit/Junit4Fragment2.java | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend index 458b8b204..e89fee579 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend @@ -27,11 +27,19 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment { "org.eclipse.xtext.testing" } + def protected getXbaseTestingPackage() { + if (useDeprecatedClasses) + "org.eclipse.xtext.xbase.junit" + else + "org.eclipse.xtext.xbase.testing" + } + override generate() { if (projectConfig.runtimeTest.manifest !== null) { projectConfig.runtimeTest.manifest => [ requiredBundles.addAll( testingPackage, + xbaseTestingPackage, "org.eclipse.xtext.xbase.lib" ) exportedPackages.add(grammar.runtimeTestBasePackage+";x-internal=true") @@ -41,6 +49,7 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment { projectConfig.eclipsePluginTest.manifest => [ requiredBundles.addAll( testingPackage, + xbaseTestingPackage, "org.eclipse.core.runtime", "org.eclipse.ui.workbench;resolution:=optional" ) diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java index 1e4b54aa0..65ee68521 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java @@ -46,6 +46,16 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { return _xifexpression; } + protected String getXbaseTestingPackage() { + String _xifexpression = null; + if (this.useDeprecatedClasses) { + _xifexpression = "org.eclipse.xtext.xbase.junit"; + } else { + _xifexpression = "org.eclipse.xtext.xbase.testing"; + } + return _xifexpression; + } + @Override public void generate() { ManifestAccess _manifest = this.getProjectConfig().getRuntimeTest().getManifest(); @@ -55,6 +65,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { final Procedure1 _function = (ManifestAccess it) -> { CollectionExtensions.addAll(it.getRequiredBundles(), this.getTestingPackage(), + this.getXbaseTestingPackage(), "org.eclipse.xtext.xbase.lib"); String _runtimeTestBasePackage = this._xtextGeneratorNaming.getRuntimeTestBasePackage(this.getGrammar()); String _plus = (_runtimeTestBasePackage + ";x-internal=true"); @@ -69,6 +80,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { final Procedure1 _function_1 = (ManifestAccess it) -> { CollectionExtensions.addAll(it.getRequiredBundles(), this.getTestingPackage(), + this.getXbaseTestingPackage(), "org.eclipse.core.runtime", "org.eclipse.ui.workbench;resolution:=optional"); String _eclipsePluginTestBasePackage = this._xtextGeneratorNaming.getEclipsePluginTestBasePackage(this.getGrammar()); From 0f95ed92b9181f448327efb9c27ac5c3bb505fd5 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 12 Jan 2017 13:27:48 +0100 Subject: [PATCH 2/2] 230: added flag skipXbaseTestingPackage Task-Url: https://github.com/eclipse/xtext-core/issues/230 Signed-off-by: Lorenzo Bettini --- .../generator/junit/Junit4Fragment2.xtend | 5 ++++ .../generator/junit/Junit4Fragment2.java | 26 ++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend index e89fee579..b7dbd4622 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend @@ -20,6 +20,9 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment { @Accessors(PUBLIC_SETTER) boolean useDeprecatedClasses + @Accessors(PUBLIC_SETTER) + boolean skipXbaseTestingPackage + def protected getTestingPackage() { if (useDeprecatedClasses) "org.eclipse.xtext.junit4" @@ -28,6 +31,8 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment { } def protected getXbaseTestingPackage() { + if (skipXbaseTestingPackage) + return "" if (useDeprecatedClasses) "org.eclipse.xtext.xbase.junit" else diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java index 65ee68521..f282aa41b 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java @@ -36,6 +36,9 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { @Accessors(AccessorType.PUBLIC_SETTER) private boolean useDeprecatedClasses; + @Accessors(AccessorType.PUBLIC_SETTER) + private boolean skipXbaseTestingPackage; + protected String getTestingPackage() { String _xifexpression = null; if (this.useDeprecatedClasses) { @@ -47,13 +50,20 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { } protected String getXbaseTestingPackage() { - String _xifexpression = null; - if (this.useDeprecatedClasses) { - _xifexpression = "org.eclipse.xtext.xbase.junit"; - } else { - _xifexpression = "org.eclipse.xtext.xbase.testing"; + String _xblockexpression = null; + { + if (this.skipXbaseTestingPackage) { + return ""; + } + String _xifexpression = null; + if (this.useDeprecatedClasses) { + _xifexpression = "org.eclipse.xtext.xbase.junit"; + } else { + _xifexpression = "org.eclipse.xtext.xbase.testing"; + } + _xblockexpression = _xifexpression; } - return _xifexpression; + return _xblockexpression; } @Override @@ -485,4 +495,8 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment { public void setUseDeprecatedClasses(final boolean useDeprecatedClasses) { this.useDeprecatedClasses = useDeprecatedClasses; } + + public void setSkipXbaseTestingPackage(final boolean skipXbaseTestingPackage) { + this.skipXbaseTestingPackage = skipXbaseTestingPackage; + } }