sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

230: added flag skipXbaseTestingPackage

Browse source 
Task-Url: https://github.com/eclipse/xtext-core/issues/230
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
This commit is contained in:
Lorenzo Bettini 2017-01-12 13:27:48 +01:00
parent 4db60c8130
commit 0f95ed92b9
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.xtend
View file

@ -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

26
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/Junit4Fragment2.java
View file

@ -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;
}
}