From 0f95ed92b9181f448327efb9c27ac5c3bb505fd5 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Thu, 12 Jan 2017 13:27:48 +0100 Subject: [PATCH] 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; + } }