From fb8f005e069d61046cbd190b85aca4131303f93a Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 11 Jul 2016 11:25:09 +0200 Subject: [PATCH 1/2] 30: ui.tests depends on the new testing bundle Task-Url: https://github.com/eclipse/xtext-core/issues/30 Signed-off-by: Lorenzo Bettini --- .../eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.xtend | 2 +- .../org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9c2422e70..957540d6a 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 @@ -17,7 +17,7 @@ class UiTestProjectDescriptor extends TestProjectDescriptor { override getExternalDependencies() { val deps = newLinkedHashSet deps += super.externalDependencies - deps += createXtextDependency("org.eclipse.xtext.junit4") => [maven.scope = Scope.TESTCOMPILE] + deps += createXtextDependency("org.eclipse.xtext.testing") => [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 65069d314..92b47daa9 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 @@ -29,7 +29,7 @@ public class UiTestProjectDescriptor extends TestProjectDescriptor { final LinkedHashSet deps = CollectionLiterals.newLinkedHashSet(); Set _externalDependencies = super.getExternalDependencies(); Iterables.addAll(deps, _externalDependencies); - ExternalDependency _createXtextDependency = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4"); + ExternalDependency _createXtextDependency = ExternalDependency.createXtextDependency("org.eclipse.xtext.testing"); final Procedure1 _function = (ExternalDependency it) -> { ExternalDependency.MavenCoordinates _maven = it.getMaven(); _maven.setScope(Scope.TESTCOMPILE); From 3275b7530293fb51f6bef514fc860b4b4c42b647 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 11 Jul 2016 11:26:33 +0200 Subject: [PATCH 2/2] 30: updated CliWizardIntegrationTest expectations Task-Url: https://github.com/eclipse/xtext-core/issues/30 Signed-off-by: Lorenzo Bettini --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.xtext.example.full.ui.tests/META-INF/MANIFEST.MF | 2 +- .../org.xtext.example.mavenTycho.ui.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 5 files changed, 5 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 71777fc51..0d402b623 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 @@ -7,6 +7,6 @@ Bundle-SymbolicName: org.xtext.example.eclipsePlugin.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.xtext.example.eclipsePlugin.ui, org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, + org.eclipse.xtext.testing, 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 8673cb9c7..bfde5c8d0 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 @@ -7,6 +7,6 @@ Bundle-SymbolicName: org.xtext.example.eclipsePluginP2.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.xtext.example.eclipsePluginP2.ui, org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, + org.eclipse.xtext.testing, 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 f7c1c9dd4..a819f678f 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 @@ -7,6 +7,6 @@ Bundle-SymbolicName: org.xtext.example.full.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.xtext.example.full.ui, org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, + org.eclipse.xtext.testing, 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 a40929fd3..ecd565233 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 @@ -7,6 +7,6 @@ Bundle-SymbolicName: org.xtext.example.mavenTycho.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.xtext.example.mavenTycho.ui, org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, + org.eclipse.xtext.testing, 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 30b06b3d9..6267b3b26 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 @@ -7,6 +7,6 @@ Bundle-SymbolicName: org.xtext.example.mavenTychoP2.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.xtext.example.mavenTychoP2.ui, org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, + org.eclipse.xtext.testing, org.eclipse.xtext.xbase.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.8