From 98c0aa4c94420a779949d146ad8dfba411f58962 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 16 Jan 2017 11:08:39 +0100 Subject: [PATCH 1/3] 244: .xtext.junit4 .xbase.junit added to ui.tests by the project wizard Task-Url: https://github.com/eclipse/xtext-core/issues/244 Signed-off-by: Lorenzo Bettini --- .../xtext/wizard/UiTestProjectDescriptor.xtend | 2 ++ .../xtext/wizard/UiTestProjectDescriptor.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend index 3cc91aed7..d790bc4d1 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend @@ -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 } diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java index eb61f9c31..cf79a4c65 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java @@ -43,6 +43,20 @@ public class UiTestProjectDescriptor extends TestProjectDescriptor { }; ExternalDependency _doubleArrow_1 = ObjectExtensions.operator_doubleArrow(_createXtextDependency_1, _function_1); deps.add(_doubleArrow_1); + ExternalDependency _createXtextDependency_2 = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4"); + final Procedure1 _function_2 = (ExternalDependency it) -> { + ExternalDependency.MavenCoordinates _maven = it.getMaven(); + _maven.setScope(Scope.TESTCOMPILE); + }; + ExternalDependency _doubleArrow_2 = ObjectExtensions.operator_doubleArrow(_createXtextDependency_2, _function_2); + deps.add(_doubleArrow_2); + ExternalDependency _createXtextDependency_3 = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.junit"); + final Procedure1 _function_3 = (ExternalDependency it) -> { + ExternalDependency.MavenCoordinates _maven = it.getMaven(); + _maven.setScope(Scope.TESTCOMPILE); + }; + ExternalDependency _doubleArrow_3 = ObjectExtensions.operator_doubleArrow(_createXtextDependency_3, _function_3); + deps.add(_doubleArrow_3); _xblockexpression = deps; } return _xblockexpression; From 8c4eda2e92fa0978a20f4ced67c8d2fb2b0701c0 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 16 Jan 2017 11:10:10 +0100 Subject: [PATCH 2/3] 244: updated wizard test expectations Task-Url: https://github.com/eclipse/xtext-core/issues/244 Signed-off-by: Lorenzo Bettini --- .../META-INF/MANIFEST.MF | 4 +++- .../META-INF/MANIFEST.MF | 4 +++- .../org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF | 4 +++- .../META-INF/MANIFEST.MF | 4 +++- .../META-INF/MANIFEST.MF | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF index d3a0fdfe7..d359ea5a9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin.ui.tests/META-INF/MANIFEST.MF @@ -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 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF index e324cb0c9..961491993 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF @@ -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 diff --git a/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 b/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 index 2c31f2828..67d3e6030 100644 --- a/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 +++ b/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 @@ -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 diff --git a/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 b/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 index c47d9bc9c..b826a6bd1 100644 --- a/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 +++ b/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 @@ -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 diff --git a/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 b/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 index 7ddcc3f97..56b06482c 100644 --- a/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 +++ b/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 @@ -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 From da3d6d9e751bbe2e3d60444ec4ea339f03d103d8 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 16 Jan 2017 11:45:38 +0100 Subject: [PATCH 3/3] 244: .xtext.junit4 .xbase.junit added to ui.tests by mwe2 Task-Url: https://github.com/eclipse/xtext-core/issues/244 Signed-off-by: Lorenzo Bettini --- .../generator/junit/Junit4Fragment2.xtend | 16 ++++++++++++-- .../generator/junit/Junit4Fragment2.java | 21 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 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 b7dbd4622..c00786123 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 @@ -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" ) 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 f282aa41b..a2825c617 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 @@ -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.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());