Re-enable JUnit 4 and JUnit 3 unit tests (#3273)

When JUnit 5 support was added to the project, the "JUnit Vintage Engine"
artifact wasn't added. Without this artifact, the JUnit 5 engine ignores
any tests written for JUnit 4 or JUnit 3, i.e. the majority of the tests.

Author: csaboka

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+### Fix
+
+- Re-enable accidentally disabled unit tests
+
 ## 6.4.0 - 2024-02-22
 
 ## Added 

bundle/pom.xml

@@ -500,7 +500,12 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

bundle/src/test/java/com/adobe/acs/commons/packagegarbagecollector/PackageGarbageCollectionJobTest.java

@@ -48,6 +48,7 @@
 import static com.adobe.acs.commons.testutil.LogTester.assertLogText;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -134,7 +135,7 @@ JcrPackage mockPackage(Integer daysAgo, Integer lastUnpackedDaysAgo, String pack
         JcrPackageDefinition definition = mock(JcrPackageDefinition.class);
         when(definition.getLastUnpacked()).thenReturn(getDate(lastUnpackedDaysAgo));
         when(definition.getLastUnwrapped()).thenReturn(getDate(daysAgo));
-        when(definition.getCreated()).thenReturn(null);
+        lenient().when(definition.getCreated()).thenReturn(null);
         when(definition.getNode()).thenReturn(packageNode);
         PackageId pid = mock(PackageId.class);
         when(pid.getName()).thenReturn(name);

bundle/src/test/java/com/adobe/acs/commons/remoteassets/impl/RemoteAssetsConfigImplTest.java

@@ -69,6 +69,7 @@ public Distribution getDistribution() {
           }
         };
         context.registerService(RequireAem.class, requireAem, "distribution","classic");
+        LogTester.reset();
     }
 
     @Test

pom.xml

@@ -89,6 +89,7 @@
         <aem.sdk.api.version>2023.1.10675.20230113T110236Z-220900</aem.sdk.api.version>
 
         <jacoco.version>0.8.7</jacoco.version>
+        <junit.jupiter.version>5.10.0</junit.jupiter.version> <!-- >= 5.x requires Java 11 -->
         <!-- affects both m-compiler-p and m-javadoc-p-->
         <maven.compiler.release>8</maven.compiler.release>
         <!-- for reproducible builds (https://maven.apache.org/guides/mini/guide-reproducible-builds.html), automatically adjusted during release -->
@@ -138,6 +139,18 @@
                     <configuration>
                         <trimStackTrace>false</trimStackTrace>
                     </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.junit.jupiter</groupId>
+                            <artifactId>junit-jupiter-engine</artifactId>
+                            <version>${junit.jupiter.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.junit.vintage</groupId>
+                            <artifactId>junit-vintage-engine</artifactId>
+                            <version>${junit.jupiter.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
@@ -605,10 +618,11 @@ Service-Component: OSGI-INF/*.xml
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>5.10.0</version>
-                <scope>test</scope>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>