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

Merge pull request #232 from eclipse/task_230-Junit4Fragment2_added

Browse source 
230: Junit4Fragment2 added dependencies for .tests project
This commit is contained in:
Lorenzo Bettini 2017-01-12 19:12:09 +01:00 committed by GitHub
commit 28613d56dd
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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"
@ -27,11 +30,21 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
"org.eclipse.xtext.testing"
}
def protected getXbaseTestingPackage() {
if (skipXbaseTestingPackage)
return ""
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 +54,7 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
projectConfig.eclipsePluginTest.manifest => [
requiredBundles.addAll(
testingPackage,
xbaseTestingPackage,
"org.eclipse.core.runtime",
"org.eclipse.ui.workbench;resolution:=optional"
)

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) {
@ -46,6 +49,23 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
return _xifexpression;
}
protected String getXbaseTestingPackage() {
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 _xblockexpression;
}
@Override
public void generate() {
ManifestAccess _manifest = this.getProjectConfig().getRuntimeTest().getManifest();
@ -55,6 +75,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
final Procedure1<ManifestAccess> _function = (ManifestAccess it) -> {
CollectionExtensions.<String>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 +90,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
final Procedure1<ManifestAccess> _function_1 = (ManifestAccess it) -> {
CollectionExtensions.<String>addAll(it.getRequiredBundles(),
this.getTestingPackage(),
this.getXbaseTestingPackage(),
"org.eclipse.core.runtime",
"org.eclipse.ui.workbench;resolution:=optional");
String _eclipsePluginTestBasePackage = this._xtextGeneratorNaming.getEclipsePluginTestBasePackage(this.getGrammar());
@ -473,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;
}
}