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: Junit4Fragment2 added dependencies for .tests project

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-10 17:36:28 +01:00
parent 448b025395
commit d65d1f1dd6
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -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<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 +80,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());