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 #246 from eclipse/lb-task_244-Junit4Fragment2

Browse source 
Lb task 244 junit4 fragment2
This commit is contained in:
Lorenzo Bettini 2017-01-16 15:45:52 +01:00 committed by GitHub
commit 847cb05e02
9 changed files with 64 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -8,5 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.eclipsePlugin.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -8,5 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.eclipsePluginP2.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -8,5 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.full.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -8,5 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTycho.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.ui.tests/META-INF/MANIFEST.MF vendored
View file

@ -8,5 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.xtext.example.mavenTychoP2.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

@ -25,20 +25,30 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
def protected getTestingPackage() {
if (useDeprecatedClasses)
"org.eclipse.xtext.junit4"
getUiTestingPackage()
else
"org.eclipse.xtext.testing"
}
protected def String getUiTestingPackage() {
"org.eclipse.xtext.junit4"
}
def protected getXbaseTestingPackage() {
if (skipXbaseTestingPackage)
return ""
if (useDeprecatedClasses)
"org.eclipse.xtext.xbase.junit"
getXbaseUiTestingPackage()
else
"org.eclipse.xtext.xbase.testing"
}
protected def String getXbaseUiTestingPackage() {
if (skipXbaseTestingPackage)
return ""
"org.eclipse.xtext.xbase.junit"
}
override generate() {
if (projectConfig.runtimeTest.manifest !== null) {
projectConfig.runtimeTest.manifest => [
@ -55,6 +65,8 @@ class Junit4Fragment2 extends AbstractStubGeneratingFragment {
requiredBundles.addAll(
testingPackage,
xbaseTestingPackage,
uiTestingPackage,
xbaseUiTestingPackage,
"org.eclipse.core.runtime",
"org.eclipse.ui.workbench;resolution:=optional"
)

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

@ -42,13 +42,17 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
protected String getTestingPackage() {
String _xifexpression = null;
if (this.useDeprecatedClasses) {
_xifexpression = "org.eclipse.xtext.junit4";
_xifexpression = this.getUiTestingPackage();
} else {
_xifexpression = "org.eclipse.xtext.testing";
}
return _xifexpression;
}
protected String getUiTestingPackage() {
return "org.eclipse.xtext.junit4";
}
protected String getXbaseTestingPackage() {
String _xblockexpression = null;
{
@ -57,7 +61,7 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
}
String _xifexpression = null;
if (this.useDeprecatedClasses) {
_xifexpression = "org.eclipse.xtext.xbase.junit";
_xifexpression = this.getXbaseUiTestingPackage();
} else {
_xifexpression = "org.eclipse.xtext.xbase.testing";
}
@ -66,6 +70,17 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
return _xblockexpression;
}
protected String getXbaseUiTestingPackage() {
String _xblockexpression = null;
{
if (this.skipXbaseTestingPackage) {
return "";
}
_xblockexpression = "org.eclipse.xtext.xbase.junit";
}
return _xblockexpression;
}
@Override
public void generate() {
ManifestAccess _manifest = this.getProjectConfig().getRuntimeTest().getManifest();
@ -91,6 +106,8 @@ public class Junit4Fragment2 extends AbstractStubGeneratingFragment {
CollectionExtensions.<String>addAll(it.getRequiredBundles(),
this.getTestingPackage(),
this.getXbaseTestingPackage(),
this.getUiTestingPackage(),
this.getXbaseUiTestingPackage(),
"org.eclipse.core.runtime",
"org.eclipse.ui.workbench;resolution:=optional");
String _eclipsePluginTestBasePackage = this._xtextGeneratorNaming.getEclipsePluginTestBasePackage(this.getGrammar());

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend
View file

@ -19,6 +19,8 @@ class UiTestProjectDescriptor extends TestProjectDescriptor {
deps += super.externalDependencies
deps += createXtextDependency("org.eclipse.xtext.testing") => [maven.scope = Scope.TESTCOMPILE]
deps += createXtextDependency("org.eclipse.xtext.xbase.testing") => [maven.scope = Scope.TESTCOMPILE]
deps += createXtextDependency("org.eclipse.xtext.junit4") => [maven.scope = Scope.TESTCOMPILE]
deps += createXtextDependency("org.eclipse.xtext.xbase.junit") => [maven.scope = Scope.TESTCOMPILE]
deps
}

14
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java
View file

@ -43,6 +43,20 @@ public class UiTestProjectDescriptor extends TestProjectDescriptor {
};
ExternalDependency _doubleArrow_1 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_1, _function_1);
deps.add(_doubleArrow_1);
ExternalDependency _createXtextDependency_2 = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4");
final Procedure1<ExternalDependency> _function_2 = (ExternalDependency it) -> {
ExternalDependency.MavenCoordinates _maven = it.getMaven();
_maven.setScope(Scope.TESTCOMPILE);
};
ExternalDependency _doubleArrow_2 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_2, _function_2);
deps.add(_doubleArrow_2);
ExternalDependency _createXtextDependency_3 = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.junit");
final Procedure1<ExternalDependency> _function_3 = (ExternalDependency it) -> {
ExternalDependency.MavenCoordinates _maven = it.getMaven();
_maven.setScope(Scope.TESTCOMPILE);
};
ExternalDependency _doubleArrow_3 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_createXtextDependency_3, _function_3);
deps.add(_doubleArrow_3);
_xblockexpression = deps;
}
return _xblockexpression;