[aXSL-commit] SF.net SVN: axsl:[3001] trunk/axsl

[<vic...@us...>]

Revision: 3001
          http://sourceforge.net/p/axsl/code/3001
Author:   victormote
Date:     2026-03-31 12:55:14 +0000 (Tue, 31 Mar 2026)
Log Message:
-----------
Enforce use of assertJ assertions.

Modified Paths:
--------------
    trunk/axsl/axsl-00-dev/config/checkstyle/checkstyle-config.xml
    trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java
    trunk/axsl/axsl-constants/src/test/java/org/axsl/unicode/UnicodeScriptExtendedTests.java
    trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java
    trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java
    trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpLeafIteratorTests.java
    trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java

Modified: trunk/axsl/axsl-00-dev/config/checkstyle/checkstyle-config.xml
===================================================================
--- trunk/axsl/axsl-00-dev/config/checkstyle/checkstyle-config.xml	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-00-dev/config/checkstyle/checkstyle-config.xml	2026-03-31 12:55:14 UTC (rev 3001)
@@ -160,12 +160,17 @@
     </module>
 
     <module name="ImportOrder">
-      <property name="option" value="above"/>
-      <property name="groups" value="org.axsl,org,/^(org.junit|org.mockito)/,java,javax"/>
+      <property name="option" value="inflow"/>
+      <property name="groups" value="org.axsl,org,/^(org.junit|org.assertj|org.mockito)/,java,javax"/>
       <property name="separated" value="true"/>
       <property name="ordered" value="true"/>
     </module>
 
+    <module name="IllegalImport">
+      <!-- Force use of assertJ assertions. -->
+      <property name="illegalPkgs" value="org.junit.jupiter.api.Assertions" />
+    </module>
+
     <!-- Don't allow non-private instance variables. -->
     <module name="VisibilityModifier"/>
 

Modified: trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java
===================================================================
--- trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -24,7 +24,6 @@
 package org.axsl.constants;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;

Modified: trunk/axsl/axsl-constants/src/test/java/org/axsl/unicode/UnicodeScriptExtendedTests.java
===================================================================
--- trunk/axsl/axsl-constants/src/test/java/org/axsl/unicode/UnicodeScriptExtendedTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-constants/src/test/java/org/axsl/unicode/UnicodeScriptExtendedTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -22,7 +22,7 @@
  */
 package org.axsl.unicode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.jupiter.api.Test;
 
 import java.lang.Character.UnicodeScript;
@@ -37,16 +37,16 @@
      */
     @Test
     public void retrievalTest() {
-        assertEquals(2, UnicodeScriptExtended.getQtyRanges(UnicodeScript.JAVANESE));
+        assertThat(2).isEqualTo(UnicodeScriptExtended.getQtyRanges(UnicodeScript.JAVANESE));
 
-        assertEquals(236, UnicodeScriptExtended.getRangeIndex(UnicodeScript.JAVANESE, 0));
-        assertEquals(238, UnicodeScriptExtended.getRangeIndex(UnicodeScript.JAVANESE, 1));
+        assertThat(236).isEqualTo(UnicodeScriptExtended.getRangeIndex(UnicodeScript.JAVANESE, 0));
+        assertThat(238).isEqualTo(UnicodeScriptExtended.getRangeIndex(UnicodeScript.JAVANESE, 1));
 
-        assertEquals(0xA980, UnicodeScriptExtended.getRangeStart(236));
-        assertEquals(0xA9CF - 1, UnicodeScriptExtended.getRangeEnd(236));
+        assertThat(0xA980).isEqualTo(UnicodeScriptExtended.getRangeStart(236));
+        assertThat(0xA9CF - 1).isEqualTo(UnicodeScriptExtended.getRangeEnd(236));
 
-        assertEquals(0xA9D0, UnicodeScriptExtended.getRangeStart(238));
-        assertEquals(0xA9E0 - 1, UnicodeScriptExtended.getRangeEnd(238));
+        assertThat(0xA9D0).isEqualTo(UnicodeScriptExtended.getRangeStart(238));
+        assertThat(0xA9E0 - 1).isEqualTo(UnicodeScriptExtended.getRangeEnd(238));
     }
 
 }

Modified: trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java
===================================================================
--- trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -24,8 +24,7 @@
 package org.axsl.kp;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
 
 /**

Modified: trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java
===================================================================
--- trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -23,7 +23,7 @@
 
 package org.axsl.kp;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -36,14 +36,14 @@
      */
     @Test
     public void testInitialState() {
-        assertEquals(4, KpFitnessClass.values().length);
-        assertEquals(KpFitnessClass.TIGHT,
+        assertThat(4).isEqualTo(KpFitnessClass.values().length);
+        assertThat(KpFitnessClass.TIGHT).isEqualTo(
                 KpFitnessClass.fromNumericValue(KpFitnessClass.TIGHT.getNumericValue()));
-        assertEquals(KpFitnessClass.NORMAL,
+        assertThat(KpFitnessClass.NORMAL).isEqualTo(
                 KpFitnessClass.fromNumericValue(KpFitnessClass.NORMAL.getNumericValue()));
-        assertEquals(KpFitnessClass.LOOSE,
+        assertThat(KpFitnessClass.LOOSE).isEqualTo(
                 KpFitnessClass.fromNumericValue(KpFitnessClass.LOOSE.getNumericValue()));
-        assertEquals(KpFitnessClass.VERY_LOOSE,
+        assertThat(KpFitnessClass.VERY_LOOSE).isEqualTo(
                 KpFitnessClass.fromNumericValue(KpFitnessClass.VERY_LOOSE.getNumericValue()));
     }
 

Modified: trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpLeafIteratorTests.java
===================================================================
--- trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpLeafIteratorTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpLeafIteratorTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -23,8 +23,9 @@
 
 package org.axsl.kp;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
 
 import java.util.NoSuchElementException;
@@ -46,11 +47,11 @@
     private void iteratorAssertions(final KpLeafIterator iterator, final boolean expectedHasNext,
             final boolean expectedHasPrevious, final int expectedNextIndex, final int expectedPreviousIndex,
             final int expectedDepth) {
-        assertEquals(expectedHasNext, iterator.hasNext());
-        assertEquals(expectedHasPrevious, iterator.hasPrevious());
-        assertEquals(expectedNextIndex, iterator.nextIndex());
-        assertEquals(expectedPreviousIndex, iterator.previousIndex());
-        assertEquals(expectedDepth, iterator.depth());
+        assertThat(expectedHasNext).isEqualTo(iterator.hasNext());
+        assertThat(expectedHasPrevious).isEqualTo(iterator.hasPrevious());
+        assertThat(expectedNextIndex).isEqualTo(iterator.nextIndex());
+        assertThat(expectedPreviousIndex).isEqualTo(iterator.previousIndex());
+        assertThat(expectedDepth).isEqualTo(iterator.depth());
     }
 
     /**
@@ -61,7 +62,7 @@
     private void leafNodeAssertions(final String expectedText, final KpLeaf leaf) {
         if (leaf instanceof CharSequence) {
             final CharSequence chars = (CharSequence) leaf;
-            assertEquals(expectedText, chars.toString());
+            assertThat(expectedText).isEqualTo(chars.toString());
         } else {
             fail("Expected text node here.");
         }
@@ -146,13 +147,10 @@
 
         /* We just retrieved the first node using previous(). The cursor is sitting before index 0. Another previous()
          * should throw an exception. */
-        try {
+        assertThatThrownBy(() -> {
             out.previous();
-            fail("Exception expected here.");
-        } catch (final NoSuchElementException e) {
-            /* This is the expected case. */
-            assertEquals("There is no \"previous\" leaf.", e.getMessage());
-        }
+        }).isInstanceOf(NoSuchElementException.class)
+              .hasMessageMatching("There is no \"previous\" leaf.");
     }
 
     /**
@@ -164,13 +162,10 @@
         final KpLeafIterator out = new KpLeafIterator(para);
         iteratorAssertions(out, true, false, 0, -1, 1);
 
-        try {
+        assertThatThrownBy(() -> {
             out.previous();
-            fail("Exception expected here.");
-        } catch (final NoSuchElementException e) {
-            /* This is the expected case. */
-            assertEquals("There is no \"previous\" leaf.", e.getMessage());
-        }
+        }).isInstanceOf(NoSuchElementException.class)
+            .hasMessageMatching("There is no \"previous\" leaf.");
     }
 
     /**
@@ -190,13 +185,10 @@
         /* Make sure we are where we think we are. */
         iteratorAssertions(out, false, true, 50, 49, 2);
 
-        try {
+        assertThatThrownBy(() -> {
             out.next();
-            fail("Exception expected here.");
-        } catch (final NoSuchElementException e) {
-            /* This is the expected case. */
-            assertEquals("There is no \"next\" leaf.", e.getMessage());
-        }
+        }).isInstanceOf(NoSuchElementException.class)
+            .hasMessageMatching("There is no \"next\" leaf.");
     }
 
 }

Modified: trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java
===================================================================
--- trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java	2026-03-31 12:02:31 UTC (rev 3000)
+++ trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java	2026-03-31 12:55:14 UTC (rev 3001)
@@ -24,7 +24,6 @@
 package org.axsl.value;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.