Update Ldif Tests to JUnit 5

Issue gh-1058

Author: jzheaux

ldif/ldif-core/build.gradle

@@ -6,13 +6,20 @@ dependencies {
     management platform(project(":spring-ldap-dependencies"))
     api project(":spring-ldap-core")
 
+
     testImplementation platform('org.junit:junit-bom')
-    testImplementation "org.junit.vintage:junit-vintage-engine"
-    testImplementation "junit:junit"
     testImplementation "org.assertj:assertj-core"
+    testImplementation "org.junit.jupiter:junit-jupiter-api"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation "org.junit.jupiter:junit-jupiter-params"
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation ("log4j:log4j:1.2.17") {
         exclude group: 'javax.jms'
         exclude group: 'com.sun.jdmk'
         exclude group: 'com.sun.jmx'
     }
 }
+
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}

ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java

@@ -21,10 +21,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,7 +42,6 @@
  * @author Keith Barlow
  *
  */
-@RunWith(Parameterized.class)
 public class DefaultAttributeValidationPolicyTests {
 
 	private static Logger log = LoggerFactory.getLogger(DefaultAttributeValidationPolicyTests.class);
@@ -75,7 +72,6 @@ private enum AttributeType {
 	 * The data set to parse.
 	 * @return
 	 */
-	@Parameters
 	public static Collection<Object[]> data() {
 		return Arrays.asList(new Object[][] {
 				// Format: line, id, options, value, type
@@ -146,7 +142,7 @@ public static Collection<Object[]> data() {
 	 * @param value The value expected from successful parsing.
 	 * @param type The attribute type: one of enum AttributeType.
 	 */
-	public DefaultAttributeValidationPolicyTests(String line, String id, String options, String value,
+	public void initDefaultAttributeValidationPolicyTests(String line, String id, String options, String value,
 			AttributeType type) {
 		this.line = line;
 		this.id = id;
@@ -159,8 +155,10 @@ public DefaultAttributeValidationPolicyTests(String line, String id, String opti
 	 * The test case: parses passed in parameters and validates the outcome against the
 	 * expected results.
 	 */
-	@Test
-	public void parseAttribute() {
+	@MethodSource("data")
+	@ParameterizedTest
+	public void parseAttribute(String line, String id, String options, String value, AttributeType type) {
+		initDefaultAttributeValidationPolicyTests(line, id, options, value, type);
 		try {
 			LdapAttribute attribute = (LdapAttribute) policy.parse(this.line);
 

ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java

@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.ldap.ldif.parser.LdifParser;
 import org.springframework.ldap.schema.BasicSchemaSpecification;

ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java

@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,7 +66,7 @@ public LdifParserTests() {
 	/**
 	 * Setup: opens file.
 	 */
-	@Before
+	@BeforeEach
 	public void openLdif() {
 		try {
 			this.parser.open();
@@ -122,7 +122,7 @@ public void parseLdif() {
 	/**
 	 * Cleanup: closes file.
 	 */
-	@After
+	@AfterEach
 	public void closeLdif() {
 		try {
 			this.parser.close();