(ws-axiom) branch master updated: Migrate plain JUnit assertions to AssertJ in saaj-testsuite

[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 8e5b93d43 Migrate plain JUnit assertions to AssertJ in saaj-testsuite
8e5b93d43 is described below

commit 8e5b93d43f319c3fb7aa34d56becf5bf0ea58554
Author: Andreas Veithen-Knowles <andreas.veit...@gmail.com>
AuthorDate: Sun Feb 22 10:00:53 2026 +0000

    Migrate plain JUnit assertions to AssertJ in saaj-testsuite
---
 docs/adr/0004-prefer-assertj-over-google-truth.md                 | 7 ++++++-
 .../org/apache/axiom/ts/saaj/element/TestSetParentElement.java    | 8 +++++---
 .../ts/saaj/header/TestExamineMustUnderstandHeaderElements.java   | 8 +++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/adr/0004-prefer-assertj-over-google-truth.md 
b/docs/adr/0004-prefer-assertj-over-google-truth.md
index e7e5d5915..ea1cf7c08 100644
--- a/docs/adr/0004-prefer-assertj-over-google-truth.md
+++ b/docs/adr/0004-prefer-assertj-over-google-truth.md
@@ -23,7 +23,8 @@ Prefer AssertJ over Google Truth
 ## Decision
 
 New test code must use [AssertJ](https://assertj.github.io/doc/) as the 
assertion library.
-Existing usages of Google Truth should be migrated to AssertJ when the 
opportunity arises.
+Existing usages of Google Truth and plain JUnit assertions (`assertTrue`, 
`assertEquals`,
+`assertSame`, etc.) should be migrated to AssertJ when the opportunity arises.
 
 ## Rationale
 
@@ -37,3 +38,7 @@ Existing usages of Google Truth should be migrated to AssertJ 
when the opportuni
 
 *   AssertJ integrates well with IDEs and provides better error messages, 
making test
     failures easier to diagnose.
+
+*   AssertJ's fluent `assertThat` style is more expressive than JUnit's 
traditional
+    `assertEquals(expected, actual)` or `assertTrue(condition)` forms, which 
improves
+    readability and reduces the risk of swapping expected/actual arguments.
diff --git 
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
 
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
index 086abc7d0..44d9899a0 100644
--- 
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
+++ 
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.ts.saaj.element;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import javax.xml.namespace.QName;
 import jakarta.xml.soap.SOAPElement;
 
@@ -39,8 +41,8 @@ public class TestSetParentElement extends SAAJTestCase {
                 (SOAPElement) parent.getOwnerDocument().createElementNS(null, 
"child2");
         child2.setParentElement(parent);
         NodeList children = parent.getChildNodes();
-        assertEquals(2, children.getLength());
-        assertSame(child1, children.item(0));
-        assertSame(child2, children.item(1));
+        assertThat(children.getLength()).isEqualTo(2);
+        assertThat(children.item(0)).isSameAs(child1);
+        assertThat(children.item(1)).isSameAs(child2);
     }
 }
diff --git 
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
 
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
index db0390f39..8d6c926b0 100644
--- 
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
+++ 
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
@@ -18,6 +18,8 @@
  */
 package org.apache.axiom.ts.saaj.header;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.InputStream;
 import java.util.Iterator;
 
@@ -46,9 +48,9 @@ public class TestExamineMustUnderstandHeaderElements extends 
SAAJTestCase {
             SOAPMessage message = 
newMessageFactory().createMessage(mimeHeaders, in);
             SOAPHeader header = message.getSOAPHeader();
             Iterator<?> it = header.examineMustUnderstandHeaderElements(null);
-            assertTrue(it.hasNext());
-            assertTrue(it.next() instanceof SOAPHeaderElement);
-            assertFalse(it.hasNext());
+            assertThat(it.hasNext()).isTrue();
+            assertThat(it.next()).isInstanceOf(SOAPHeaderElement.class);
+            assertThat(it.hasNext()).isFalse();
         } finally {
             in.close();
         }