(ws-axiom) branch master updated: Migrate spring-ws-tests to JUnit 5 and AssertJ

[veithen]

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new a115bdc43 Migrate spring-ws-tests to JUnit 5 and AssertJ
a115bdc43 is described below

commit a115bdc4325e8872293444e1dd682f81932cfbc6
Author: Andreas Veithen-Knowles <andreas.veit...@gmail.com>
AuthorDate: Fri Mar 13 23:09:45 2026 +0000

    Migrate spring-ws-tests to JUnit 5 and AssertJ
---
 systests/spring-ws-tests/pom.xml                           | 13 ++++---------
 .../systest/springws/AxiomSoapMessageFactoryTest.java      | 12 ++++++------
 .../axiom/systest/springws/AxiomSoapMessageTest.java       | 14 +++++++-------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/systests/spring-ws-tests/pom.xml b/systests/spring-ws-tests/pom.xml
index 13061f0cb..29f5900a1 100644
--- a/systests/spring-ws-tests/pom.xml
+++ b/systests/spring-ws-tests/pom.xml
@@ -57,18 +57,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageFactoryTest.java
 
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageFactoryTest.java
index 1bf04e819..93ae00564 100644
--- 
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageFactoryTest.java
+++ 
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageFactoryTest.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.systest.springws;
 
-import junit.framework.TestCase;
-
 import org.apache.axiom.soap.SOAPMessage;
+import org.junit.jupiter.api.Test;
 import org.springframework.ws.soap.axiom.AxiomSoapMessage;
 import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 
-public class AxiomSoapMessageFactoryTest extends TestCase {
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AxiomSoapMessageFactoryTest {
     /**
      * Regression test for <a 
href="https://issues.apache.org/jira/browse/AXIOM-444";>AXIOM-444</a>.
-     *
-     * @throws Exception
      */
+    @Test
     public void testCreateWebServiceMessage() throws Exception {
         AxiomSoapMessageFactory mf = new AxiomSoapMessageFactory();
         mf.afterPropertiesSet();
@@ -37,6 +37,6 @@ public class AxiomSoapMessageFactoryTest extends TestCase {
         SOAPMessage message = swsMessage.getAxiomMessage();
         // Spring-WS uses SOAPFactory#createSOAPMessage(OMXMLParserWrapper) 
with a null argument.
         // We need to make sure that we nevertheless get a SOAPMessage that is 
in state complete.
-        assertTrue(message.isComplete());
+        assertThat(message.isComplete()).isTrue();
     }
 }
diff --git 
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageTest.java
 
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageTest.java
index a1f5a0da0..23aa79e77 100644
--- 
a/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageTest.java
+++ 
b/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/AxiomSoapMessageTest.java
@@ -23,23 +23,23 @@ import java.util.Iterator;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import junit.framework.TestCase;
-
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
+import org.junit.jupiter.api.Test;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.axiom.AxiomSoapMessage;
 import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 import org.w3c.dom.Document;
 
-public class AxiomSoapMessageTest extends TestCase {
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AxiomSoapMessageTest {
     /**
      * Tests that {@link AxiomSoapMessage#setDocument(Document)} works 
correctly. There have been
      * issues with that method because Spring-WS instantiates {@link 
SOAPFactory} implementations
      * directly instead of using {@link OMAbstractFactory}.
-     *
-     * @throws Exception
      */
+    @Test
     public void testSetDocument() throws Exception {
         AxiomSoapMessageFactory mf = new AxiomSoapMessageFactory();
         mf.afterPropertiesSet();
@@ -55,8 +55,8 @@ public class AxiomSoapMessageTest extends TestCase {
         message.setDocument(document);
         Iterator<SoapHeaderElement> it =
                 message.getEnvelope().getHeader().examineAllHeaderElements();
-        assertTrue(it.hasNext());
+        assertThat(it.hasNext()).isTrue();
         SoapHeaderElement headerElement = it.next();
-        assertEquals(new QName("urn:test", "myHeader"), 
headerElement.getName());
+        assertThat(headerElement.getName()).isEqualTo(new QName("urn:test", 
"myHeader"));
     }
 }