migrate to junit5

Issue #1058

Signed-off-by: etrandafir93 <[email protected]>

Author: etrandafir93

test-support/build.gradle

@@ -21,8 +21,8 @@ dependencies {
     optional "org.apache.directory.shared:shared-ldap"
     optional "com.unboundid:unboundid-ldapsdk"
 
-    provided "junit:junit"
-    testImplementation platform('org.junit:junit-bom')
-    testImplementation "org.junit.vintage:junit-vintage-engine"
+    provided "org.junit.jupiter:junit-jupiter-api"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
     testImplementation "org.assertj:assertj-core"
 }

test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java

@@ -22,9 +22,8 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import junit.framework.Assert;
-
 import org.springframework.ldap.core.AttributesMapper;
+import org.springframework.util.Assert;
 
 /**
  * Dummy AttributesMapper for testing purposes to check that the received Attributes are
@@ -41,16 +40,18 @@ public class AttributeCheckAttributesMapper implements AttributesMapper<Object>
 	private String[] absentAttributes = new String[0];
 
 	public Object mapFromAttributes(Attributes attributes) throws NamingException {
-		Assert.assertEquals("Values and attributes need to have the same length ", this.expectedAttributes.length,
-				this.expectedValues.length);
+		Assert.isTrue(this.expectedAttributes.length == this.expectedValues.length,
+				"Values and attributes need to have the same length");
 		for (int i = 0; i < this.expectedAttributes.length; i++) {
 			Attribute attribute = attributes.get(this.expectedAttributes[i]);
-			Assert.assertNotNull("Attribute " + this.expectedAttributes[i] + " was not present", attribute);
-			Assert.assertEquals(this.expectedValues[i], attribute.get());
+			Assert.notNull(attribute, "Attribute " + this.expectedAttributes[i] + " was not present");
+			Object value = attribute.get();
+			Assert.isTrue(this.expectedValues[i].equals(value),
+					"Expected '" + this.expectedValues[i] + "' but got '" + value + "'");
 		}
 
 		for (String absentAttribute : this.absentAttributes) {
-			Assert.assertNull(attributes.get(absentAttribute));
+			Assert.isNull(attributes.get(absentAttribute), "Attribute '" + absentAttribute + "' should not be present");
 		}
 
 		return new Object();

test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java

@@ -18,10 +18,9 @@
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
-
 import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.util.Assert;
 
 /**
  * Dummy ContextMapper for testing purposes to check that the received Attributes are the
@@ -39,16 +38,18 @@ public class AttributeCheckContextMapper implements ContextMapper<DirContextAdap
 
 	public DirContextAdapter mapFromContext(Object ctx) {
 		DirContextAdapter adapter = (DirContextAdapter) ctx;
-		Assert.assertEquals("Values and attributes need to have the same length ", this.expectedAttributes.length,
-				this.expectedValues.length);
+		Assert.isTrue(this.expectedAttributes.length == this.expectedValues.length,
+				"Values and attributes need to have the same length");
 		for (int i = 0; i < this.expectedAttributes.length; i++) {
 			String attributeValue = adapter.getStringAttribute(this.expectedAttributes[i]);
-			Assert.assertNotNull("Attribute " + this.expectedAttributes[i] + " was not present", attributeValue);
-			Assert.assertEquals(this.expectedValues[i], attributeValue);
+			Assert.notNull(attributeValue, "Attribute " + this.expectedAttributes[i] + " was not present");
+			Assert.isTrue(this.expectedValues[i].equals(attributeValue),
+					"Expected '" + this.expectedValues[i] + "' but got '" + attributeValue + "'");
 		}
 
 		for (String absentAttribute : this.absentAttributes) {
-			Assert.assertNull(adapter.getStringAttribute(absentAttribute));
+			Assert.isNull(adapter.getStringAttribute(absentAttribute),
+					"Attribute '" + absentAttribute + "' should not be present");
 		}
 
 		return adapter;

test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java

@@ -21,7 +21,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ldap.core.AttributesMapper;

test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java

@@ -21,8 +21,8 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ldap.core.AttributesMapper;
@@ -35,7 +35,7 @@ public class EmbeddedLdapServerFactoryBeanTests {
 
 	ClassPathXmlApplicationContext ctx;
 
-	@After
+	@AfterEach
 	public void setup() {
 		if (this.ctx != null) {
 			this.ctx.close();

test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java

@@ -28,8 +28,8 @@
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
 import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
 import com.unboundid.ldap.listener.InMemoryListenerConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapTemplate;
@@ -43,7 +43,7 @@ public class EmbeddedLdapServerTests {
 
 	private int port;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws IOException {
 		this.port = getFreePort();
 	}

test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java

@@ -21,8 +21,8 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ldap.core.AttributesMapper;
@@ -35,7 +35,7 @@ public class TestContextSourceFactoryBeanTests {
 
 	ClassPathXmlApplicationContext ctx;
 
-	@After
+	@AfterEach
 	public void setup() {
 		if (this.ctx != null) {
 			this.ctx.close();