Merge branch 'main' into carstenartur-patch-1

carstenartur · Nov 17, 2024 · bc303ff · bc303ff
2 parents 7932f3f + 9cc4f0f
commit bc303ff
Show file tree

Hide file tree

Showing 31 changed files with 280 additions and 912 deletions.
diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
@@ -41,6 +41,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+           java-version: '21'
+           distribution: 'temurin'
+           cache: maven
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
         uses: codacy/codacy-analysis-cli-action@97bf5df3c09e75f5bcd72695998f96ebd701846e

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -47,8 +47,9 @@ jobs:
     - name: Setup Java JDK
       uses: actions/setup-java@v4
       with:
-        distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: '17'
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/artifacts.jar b/artifacts.jar
diff --git a/content.jar b/content.jar
diff --git a/features/sandbox_encoding_quickfix_feature_1.2.0.202411171602.jar b/features/sandbox_encoding_quickfix_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_extra_search_feature_1.2.0.202411171602.jar b/features/sandbox_extra_search_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_functional_converter_feature_1.2.0.202411171602.jar b/features/sandbox_functional_converter_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_jface_cleanup_feature_1.2.0.202411171602.jar b/features/sandbox_jface_cleanup_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_junit_cleanup_feature_1.2.0.202411171602.jar b/features/sandbox_junit_cleanup_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_platform_helper_feature_1.2.0.202411171602.jar b/features/sandbox_platform_helper_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_tools_feature_1.2.0.202411171602.jar b/features/sandbox_tools_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_usage_view_feature_1.2.0.202411171602.jar b/features/sandbox_usage_view_feature_1.2.0.202411171602.jar
diff --git a/features/sandbox_xml_cleanup_feature_1.2.0.202411171602.jar b/features/sandbox_xml_cleanup_feature_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_common_1.2.0.202411171602.jar b/plugins/sandbox_common_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_encoding_quickfix_1.2.0.202411171602.jar b/plugins/sandbox_encoding_quickfix_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_extra_search_1.2.0.202411171602.jar b/plugins/sandbox_extra_search_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_functional_converter_1.2.0.202411171602.jar b/plugins/sandbox_functional_converter_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_jface_cleanup_1.2.0.202411171602.jar b/plugins/sandbox_jface_cleanup_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_junit_cleanup_1.2.0.202411171602.jar b/plugins/sandbox_junit_cleanup_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_platform_helper_1.2.0.202411171602.jar b/plugins/sandbox_platform_helper_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_tools_1.2.0.202411171602.jar b/plugins/sandbox_tools_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_usage_view_1.2.0.202411171602.jar b/plugins/sandbox_usage_view_1.2.0.202411171602.jar
diff --git a/plugins/sandbox_xml_cleanup_1.2.0.202411171602.jar b/plugins/sandbox_xml_cleanup_1.2.0.202411171602.jar
diff --git a/sandbox_junit_cleanup/META-INF/MANIFEST.MF b/sandbox_junit_cleanup/META-INF/MANIFEST.MF
@@ -17,7 +17,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
  org.eclipse.ui.workbench,
  org.eclipse.jdt.core.manipulation,
- sandbox_common
+ sandbox_common,
+ org.junit,
+ org.eclipse.jdt.junit.runtime,
+ org.eclipse.jdt.junit4.runtime
 Bundle-ActivationPolicy: lazy
 Eclipse-RegisterBuddy: org.eclipse.jdt.core.manipulation
 Import-Package: org.sandbox.jdt.internal.common,

diff --git a/...t_cleanup_test/src/org/eclipse/jdt/ui/tests/quickfix/Java8/JUnitMigrationCleanUpTest.java b/...t_cleanup_test/src/org/eclipse/jdt/ui/tests/quickfix/Java8/JUnitMigrationCleanUpTest.java
@@ -17,31 +17,32 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.junit.JUnitCore;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.sandbox.jdt.internal.corext.fix2.MYCleanUpConstants;
 import org.sandbox.jdt.ui.tests.quickfix.rules.AbstractEclipseJava;
-import org.sandbox.jdt.ui.tests.quickfix.rules.EclipseJava8;
+import org.sandbox.jdt.ui.tests.quickfix.rules.EclipseJava17;
 
 
 public class JUnitMigrationCleanUpTest {
 
 	@RegisterExtension
-	AbstractEclipseJava context4junit4= new EclipseJava8();
+	AbstractEclipseJava context4junit4= new EclipseJava17();
 
 	@RegisterExtension
-	AbstractEclipseJava context4junit5= new EclipseJava8();
+	AbstractEclipseJava context4junit5= new EclipseJava17();
 
 	IPackageFragmentRoot fRootJUnit4;
 	IPackageFragmentRoot fRootJUnit5;
 
 	@BeforeEach
 	public void setup() throws CoreException {
-		fRootJUnit4= context4junit4.createClasspathForJUnit("4");
-		fRootJUnit5= context4junit5.createClasspathForJUnit("5");
+		fRootJUnit4= context4junit4.createClasspathForJUnit(JUnitCore.JUNIT4_CONTAINER_PATH);
+		fRootJUnit5= context4junit5.createClasspathForJUnit(JUnitCore.JUNIT5_CONTAINER_PATH);
 	}
 
 	enum JUnitCleanupCases{
@@ -801,8 +802,21 @@ public void test3() throws IOException{
 	@EnumSource(JUnitCleanupCases.class)
 	public void testJUnitCleanupParametrized(JUnitCleanupCases test) throws CoreException {
 		IPackageFragment pack= fRootJUnit4.createPackageFragment("test", true, null);
-		ICompilationUnit cu= pack.createCompilationUnit("MyTest.java", test.given, false, null); //$NON-NLS-1$
+		ICompilationUnit cu= pack.createCompilationUnit("MyTest.java", test.given, true, null); //$NON-NLS-1$
 		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSERT);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSUME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_SUITE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORECLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTERCLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_IGNORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_TEST);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETEMPORARYFOLDER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETESTNAME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_EXTERNALRESOURCE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RUNWITH);
 		context4junit4.assertRefactoringResultAsExpected(new ICompilationUnit[] {cu}, new String[] {test.expected}, null);
 	}
 
@@ -902,6 +916,19 @@ public start(){
 }
 """, false, null); //$NON-NLS-1$
 		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSERT);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSUME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_SUITE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORECLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTERCLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_IGNORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_TEST);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETEMPORARYFOLDER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETESTNAME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_EXTERNALRESOURCE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RUNWITH);
 		context4junit4.assertRefactoringResultAsExpected(new ICompilationUnit[] {cu,cu2}, new String[] {
 """
 package test;
@@ -989,6 +1016,19 @@ public start(){
 }
 """, false, null); //$NON-NLS-1$
 		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSERT);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSUME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_SUITE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORECLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTERCLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_IGNORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_TEST);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETEMPORARYFOLDER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETESTNAME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_EXTERNALRESOURCE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RUNWITH);
 		context4junit4.assertRefactoringResultAsExpected(new ICompilationUnit[] {cu,cu2}, new String[] {
 """
 package test;
@@ -1082,6 +1122,19 @@ protected void after() {
 }
 """, false, null); //$NON-NLS-1$
 		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSERT);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_ASSUME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_SUITE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_BEFORECLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_AFTERCLASS);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_IGNORE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_TEST);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETEMPORARYFOLDER);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RULETESTNAME);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_EXTERNALRESOURCE);
+		context4junit4.enable(MYCleanUpConstants.JUNIT_CLEANUP_4_RUNWITH);
 		context4junit4.assertRefactoringResultAsExpected(new ICompilationUnit[] {cu,cu2,cu3}, new String[] {
 """
 package test;

diff --git a/sandbox_junit_cleanup_test/testresources/rtstubs_17.jar b/sandbox_junit_cleanup_test/testresources/rtstubs_17.jar