[#2029] remove old test plugins from wizard, add new ones

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
eclipse · Nov 23, 2022 · 56b6a86 · 56b6a86
1 parent 340dbb5
commit 56b6a86
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 38 deletions.
diff --git a/...ts/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF b/...ts/testdata/wizard-expectations/eclipsePlugin/eclipsePlugin.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: eclipsePlugin.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePlugin.ui.tests
diff --git a/...estdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF b/...estdata/wizard-expectations/eclipsePluginP2/eclipsePluginP2.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: eclipsePluginP2.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: eclipsePluginP2.ui.tests
diff --git a/...xt.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF b/...xt.tests/testdata/wizard-expectations/full/full.parent/full.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: full.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: full.ui.tests
diff --git a/...wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF b/...wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: mavenTycho.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: mavenTycho.ui.tests
diff --git a/...pectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF b/...pectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.ui.tests/META-INF/MANIFEST.MF
@@ -7,8 +7,9 @@ Bundle-SymbolicName: mavenTychoJ17.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: mavenTychoJ17.ui,
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Import-Package: org.junit.jupiter.api;version="[5.1.0,6.0.0)",
  org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/...-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF b/...-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: mavenTychoP2.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: mavenTychoP2.ui.tests
diff --git a/...ions/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF b/...ions/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.ui.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: mavenTychoP2J17.ui,
  org.junit;bundle-version="4.12.0",
  org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.junit
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: mavenTychoP2J17.ui.tests
diff --git a/...pse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend b/...pse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -30,10 +30,11 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 	@Inject FileAccessFactory fileAccessFactory
 
 	@Accessors(PUBLIC_SETTER)
-	boolean useDeprecatedClasses
+	@Deprecated(forRemoval=true,since="2.30")
+	boolean useDeprecatedClasses = false
 
 	@Accessors(PUBLIC_SETTER)
-	boolean skipXbaseTestingPackage
+	boolean skipXbaseTestingPackage = false
 
 	JUnitVersion junitVersion = JUnitVersion.JUNIT_4
 
@@ -72,7 +73,9 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 	protected def String getXbaseUiTestingPackage() {
 		if (skipXbaseTestingPackage)
 			return ""
-		"org.eclipse.xtext.xbase.junit"
+		if (useDeprecatedClasses)
+			return "org.eclipse.xtext.xbase.junit"
+		return "org.eclipse.xtext.xbase.ui.testing"
 	}
 
 	override generate() {

diff --git a/...text.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java b/...text.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -46,10 +46,11 @@ public class JUnitFragment extends AbstractStubGeneratingFragment {
   private FileAccessFactory fileAccessFactory;
 
   @Accessors(AccessorType.PUBLIC_SETTER)
-  private boolean useDeprecatedClasses;
+  @Deprecated(forRemoval = true, since = "2.30")
+  private boolean useDeprecatedClasses = false;
 
   @Accessors(AccessorType.PUBLIC_SETTER)
-  private boolean skipXbaseTestingPackage;
+  private boolean skipXbaseTestingPackage = false;
 
   private JUnitVersion junitVersion = JUnitVersion.JUNIT_4;
 
@@ -93,14 +94,13 @@ protected String getXbaseTestingPackage() {
   }
 
   protected String getXbaseUiTestingPackage() {
-    String _xblockexpression = null;
-    {
-      if (this.skipXbaseTestingPackage) {
-        return "";
-      }
-      _xblockexpression = "org.eclipse.xtext.xbase.junit";
+    if (this.skipXbaseTestingPackage) {
+      return "";
     }
-    return _xblockexpression;
+    if (this.useDeprecatedClasses) {
+      return "org.eclipse.xtext.xbase.junit";
+    }
+    return "org.eclipse.xtext.xbase.ui.testing";
   }
 
   @Override
@@ -760,6 +760,7 @@ protected TypeReference uiInjectorProvider() {
     return new TypeReference(_eclipsePluginTestBasePackage, _plus);
   }
 
+  @Deprecated
   public void setUseDeprecatedClasses(final boolean useDeprecatedClasses) {
     this.useDeprecatedClasses = useDeprecatedClasses;
   }

diff --git a/...clipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java b/...clipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/UiTestProjectDescriptor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -11,8 +11,6 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.eclipse.xtext.util.JUnitVersion;
-
 public class UiTestProjectDescriptor extends TestProjectDescriptor {
 
 	public UiTestProjectDescriptor(TestedProjectDescriptor testedProject) {
@@ -26,17 +24,15 @@ public Set<ExternalDependency> getExternalDependencies() {
 		ExternalDependency xtextTesting = ExternalDependency.createXtextDependency("org.eclipse.xtext.testing");
 		xtextTesting.getMaven().setScope(Scope.TESTCOMPILE);
 		deps.add(xtextTesting);
+		ExternalDependency xtextUiTesting = ExternalDependency.createXtextDependency("org.eclipse.xtext.ui.testing");
+		xtextUiTesting.getMaven().setScope(Scope.TESTCOMPILE);
+		deps.add(xtextUiTesting);
 		ExternalDependency xbaseTesting = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.testing");
 		xbaseTesting.getMaven().setScope(Scope.TESTCOMPILE);
 		deps.add(xbaseTesting);
-		if (JUnitVersion.JUNIT_4 == getConfig().getJunitVersion()) {
-			ExternalDependency xtextJunit4 = ExternalDependency.createXtextDependency("org.eclipse.xtext.junit4");
-			xtextJunit4.getMaven().setScope(Scope.TESTCOMPILE);
-			deps.add(xtextJunit4);
-		}
-		ExternalDependency xbaseJunit = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.junit");
-		xbaseJunit.getMaven().setScope(Scope.TESTCOMPILE);
-		deps.add(xbaseJunit);
+		ExternalDependency xbaseUiTesting = ExternalDependency.createXtextDependency("org.eclipse.xtext.xbase.ui.testing");
+		xbaseUiTesting.getMaven().setScope(Scope.TESTCOMPILE);
+		deps.add(xbaseUiTesting);
 		return deps;
 	}