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

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

Revision: 2996
          http://sourceforge.net/p/axsl/code/2996
Author:   victormote
Date:     2026-03-30 23:57:08 +0000 (Mon, 30 Mar 2026)
Log Message:
-----------
Minor upgrade to JUnit. Add test dependency on assertJ.

Modified Paths:
--------------
    trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java
    trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java
    trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java
    trunk/axsl/buildSrc/src/main/groovy/axsl.test-conventions.gradle
    trunk/axsl/gradle/libs.versions.toml

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-26 14:00:04 UTC (rev 2995)
+++ trunk/axsl/axsl-constants/src/test/java/org/axsl/constants/TypographicConstantsTests.java	2026-03-30 23:57:08 UTC (rev 2996)
@@ -23,7 +23,8 @@
 
 package org.axsl.constants;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
@@ -40,16 +41,16 @@
     public void testMillipointsToPoints() {
         BigDecimal expected = new BigDecimal("15.999");
         BigDecimal actual = TypographicConstants.millipointsToPoints(15_999);
-        assertEquals(expected, actual);
+        assertThat(expected).isEqualTo(actual);
 
         expected = BigDecimal.ZERO;
         actual = TypographicConstants.millipointsToPoints(0);
         /* Want to do identity equality check here, but BigDecimal actually caches 15 different zero values. */
-        assertEquals(0, expected.compareTo(actual));
+        assertThat(0).isEqualTo(expected.compareTo(actual));
 
         expected = BigDecimal.ONE;
         actual = TypographicConstants.millipointsToPoints(1000);
-        assertEquals(0, expected.compareTo(actual));
+        assertThat(0).isEqualTo(expected.compareTo(actual));
     }
 
 }

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-26 14:00:04 UTC (rev 2995)
+++ trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpBranchTfTests.java	2026-03-30 23:57:08 UTC (rev 2996)
@@ -23,7 +23,8 @@
 
 package org.axsl.kp;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Test;
 
@@ -114,7 +115,7 @@
     private void nodeAssertions(final String expectedText, final KpNode node) {
         if (node instanceof CharSequence) {
             final CharSequence chars = (CharSequence) node;
-            assertEquals(expectedText, chars.toString());
+            assertThat(expectedText).isEqualTo(chars.toString());
         } else {
             fail("Text node expected here.");
         }
@@ -128,7 +129,7 @@
         final KpBranchTf out = createTestPara();
 
         /* Test the /node/ count. */
-        assertEquals(39, out.qtyKpNodes());
+        assertThat(39).isEqualTo(out.qtyKpNodes());
 
         /* Test the /nodes/ at each end, and one in the middle. */
         nodeAssertions("Be",    out.kpNodeAt(0));
@@ -136,7 +137,7 @@
         nodeAssertions("born",  out.kpNodeAt(15));
 
         /* Most nodes are exactly one leaf. 3 lines each add an additional 2 leaves each, adding 6 leaves. */
-        assertEquals(50, out.qtyKpLeaves());
+        assertThat(50).isEqualTo(out.qtyKpLeaves());
 
         /* Test the /leaves/ at each end. */
         nodeAssertions("B",       out.kpLeafAt(0));

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-26 14:00:04 UTC (rev 2995)
+++ trunk/axsl/axsl-value/src/test/java/org/axsl/value/ForcePageCountTests.java	2026-03-30 23:57:08 UTC (rev 2996)
@@ -23,8 +23,8 @@
 
 package org.axsl.value;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -37,59 +37,60 @@
      */
     @Test
     public void addPageTest001() {
-        assertTrue(ForcePageCount.AUTO.addPage(31, 17, 33));             //odd,  odd,  odd
-        assertFalse(ForcePageCount.AUTO.addPage(31, 17, 32));            //odd,  odd,  even
-        assertTrue(ForcePageCount.AUTO.addPage(31, 18, 33));             //odd,  even, odd
-        assertFalse(ForcePageCount.AUTO.addPage(31, 18, 32));            //odd,  even, even
-        assertFalse(ForcePageCount.AUTO.addPage(32, 17, -1));            //even, odd,  neg
-        assertFalse(ForcePageCount.AUTO.addPage(32, 17, -1));            //even, odd,  neg
-        assertFalse(ForcePageCount.AUTO.addPage(32, 18, -1));            //even, even, neg
-        assertFalse(ForcePageCount.AUTO.addPage(32, 18, -1));            //even, even, neg
 
-        assertTrue(ForcePageCount.EVEN.addPage(31, 17, 33));             //odd,  odd,  odd
-        assertTrue(ForcePageCount.EVEN.addPage(31, 17, 32));             //odd,  odd,  even
-        assertFalse(ForcePageCount.EVEN.addPage(31, 18, 33));            //odd,  even, odd
-        assertFalse(ForcePageCount.EVEN.addPage(31, 18, 32));            //odd,  even, even
-        assertTrue(ForcePageCount.EVEN.addPage(32, 17, -1));             //even, odd,  neg
-        assertTrue(ForcePageCount.EVEN.addPage(32, 17, -1));             //even, odd,  neg
-        assertFalse(ForcePageCount.EVEN.addPage(32, 18, -1));            //even, even, neg
-        assertFalse(ForcePageCount.EVEN.addPage(32, 18, -1));            //even, even, neg
+        assertThat(ForcePageCount.AUTO.addPage(31, 17, 33)).isTrue();           //odd,  odd,  odd
+        assertThat(ForcePageCount.AUTO.addPage(31, 17, 32)).isFalse();          //odd,  odd,  even
+        assertThat(ForcePageCount.AUTO.addPage(31, 18, 33)).isTrue();           //odd,  even, odd
+        assertThat(ForcePageCount.AUTO.addPage(31, 18, 32)).isFalse();          //odd,  even, even
+        assertThat(ForcePageCount.AUTO.addPage(32, 17, -1)).isFalse();          //even, odd,  neg
+        assertThat(ForcePageCount.AUTO.addPage(32, 17, -1)).isFalse();          //even, odd,  neg
+        assertThat(ForcePageCount.AUTO.addPage(32, 18, -1)).isFalse();          //even, even, neg
+        assertThat(ForcePageCount.AUTO.addPage(32, 18, -1)).isFalse();          //even, even, neg
 
-        assertFalse(ForcePageCount.ODD.addPage(31, 17, 33));             //odd,  odd,  odd
-        assertFalse(ForcePageCount.ODD.addPage(31, 17, 32));             //odd,  odd,  even
-        assertTrue(ForcePageCount.ODD.addPage(31, 18, 33));              //odd,  even, odd
-        assertTrue(ForcePageCount.ODD.addPage(31, 18, 32));              //odd,  even, even
-        assertFalse(ForcePageCount.ODD.addPage(32, 17, -1));             //even, odd,  neg
-        assertFalse(ForcePageCount.ODD.addPage(32, 17, -1));             //even, odd,  neg
-        assertTrue(ForcePageCount.ODD.addPage(32, 18, -1));              //even, even, neg
-        assertTrue(ForcePageCount.ODD.addPage(32, 18, -1));              //even, even, neg
+        assertThat(ForcePageCount.EVEN.addPage(31, 17, 33)).isTrue();           //odd,  odd,  odd
+        assertThat(ForcePageCount.EVEN.addPage(31, 17, 32)).isTrue();           //odd,  odd,  even
+        assertThat(ForcePageCount.EVEN.addPage(31, 18, 33)).isFalse();          //odd,  even, odd
+        assertThat(ForcePageCount.EVEN.addPage(31, 18, 32)).isFalse();          //odd,  even, even
+        assertThat(ForcePageCount.EVEN.addPage(32, 17, -1)).isTrue();           //even, odd,  neg
+        assertThat(ForcePageCount.EVEN.addPage(32, 17, -1)).isTrue();           //even, odd,  neg
+        assertThat(ForcePageCount.EVEN.addPage(32, 18, -1)).isFalse();          //even, even, neg
+        assertThat(ForcePageCount.EVEN.addPage(32, 18, -1)).isFalse();          //even, even, neg
 
-        assertTrue(ForcePageCount.END_ON_EVEN.addPage(31, 17, 33));      //odd,  odd,  odd
-        assertTrue(ForcePageCount.END_ON_EVEN.addPage(31, 17, 32));      //odd,  odd,  even
-        assertTrue(ForcePageCount.END_ON_EVEN.addPage(31, 18, 33));      //odd,  even, odd
-        assertTrue(ForcePageCount.END_ON_EVEN.addPage(31, 18, 32));      //odd,  even, even
-        assertFalse(ForcePageCount.END_ON_EVEN.addPage(32, 17, -1));     //even, odd,  neg
-        assertFalse(ForcePageCount.END_ON_EVEN.addPage(32, 17, -1));     //even, odd,  neg
-        assertFalse(ForcePageCount.END_ON_EVEN.addPage(32, 18, -1));     //even, even, neg
-        assertFalse(ForcePageCount.END_ON_EVEN.addPage(32, 18, -1));     //even, even, neg
+        assertThat(ForcePageCount.ODD.addPage(31, 17, 33)).isFalse();           //odd,  odd,  odd
+        assertThat(ForcePageCount.ODD.addPage(31, 17, 32)).isFalse();           //odd,  odd,  even
+        assertThat(ForcePageCount.ODD.addPage(31, 18, 33)).isTrue();            //odd,  even, odd
+        assertThat(ForcePageCount.ODD.addPage(31, 18, 32)).isTrue();            //odd,  even, even
+        assertThat(ForcePageCount.ODD.addPage(32, 17, -1)).isFalse();           //even, odd,  neg
+        assertThat(ForcePageCount.ODD.addPage(32, 17, -1)).isFalse();           //even, odd,  neg
+        assertThat(ForcePageCount.ODD.addPage(32, 18, -1)).isTrue();            //even, even, neg
+        assertThat(ForcePageCount.ODD.addPage(32, 18, -1)).isTrue();            //even, even, neg
 
-        assertFalse(ForcePageCount.END_ON_ODD.addPage(31, 17, 33));      //odd,  odd,  odd
-        assertFalse(ForcePageCount.END_ON_ODD.addPage(31, 17, 32));      //odd,  odd,  even
-        assertFalse(ForcePageCount.END_ON_ODD.addPage(31, 18, 33));      //odd,  even, odd
-        assertFalse(ForcePageCount.END_ON_ODD.addPage(31, 18, 32));      //odd,  even, even
-        assertTrue(ForcePageCount.END_ON_ODD.addPage(32, 17, -1));       //even, odd,  neg
-        assertTrue(ForcePageCount.END_ON_ODD.addPage(32, 17, -1));       //even, odd,  neg
-        assertTrue(ForcePageCount.END_ON_ODD.addPage(32, 18, -1));       //even, even, neg
-        assertTrue(ForcePageCount.END_ON_ODD.addPage(32, 18, -1));       //even, even, neg
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(31, 17, 33)).isTrue();    //odd,  odd,  odd
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(31, 17, 32)).isTrue();    //odd,  odd,  even
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(31, 18, 33)).isTrue();    //odd,  even, odd
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(31, 18, 32)).isTrue();    //odd,  even, even
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(32, 17, -1)).isFalse();   //even, odd,  neg
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(32, 17, -1)).isFalse();   //even, odd,  neg
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(32, 18, -1)).isFalse();   //even, even, neg
+        assertThat(ForcePageCount.END_ON_EVEN.addPage(32, 18, -1)).isFalse();   //even, even, neg
 
-        assertFalse(ForcePageCount.NO_FORCE.addPage(31, 17, 33));        //odd,  odd,  odd
-        assertFalse(ForcePageCount.NO_FORCE.addPage(31, 17, 32));        //odd,  odd,  even
-        assertFalse(ForcePageCount.NO_FORCE.addPage(31, 18, 33));        //odd,  even, odd
-        assertFalse(ForcePageCount.NO_FORCE.addPage(31, 18, 32));        //odd,  even, even
-        assertFalse(ForcePageCount.NO_FORCE.addPage(32, 17, -1));        //even, odd,  neg
-        assertFalse(ForcePageCount.NO_FORCE.addPage(32, 17, -1));        //even, odd,  neg
-        assertFalse(ForcePageCount.NO_FORCE.addPage(32, 18, -1));        //even, even, neg
-        assertFalse(ForcePageCount.NO_FORCE.addPage(32, 18, -1));        //even, even, neg
+        assertThat(ForcePageCount.END_ON_ODD.addPage(31, 17, 33)).isFalse();    //odd,  odd,  odd
+        assertThat(ForcePageCount.END_ON_ODD.addPage(31, 17, 32)).isFalse();    //odd,  odd,  even
+        assertThat(ForcePageCount.END_ON_ODD.addPage(31, 18, 33)).isFalse();    //odd,  even, odd
+        assertThat(ForcePageCount.END_ON_ODD.addPage(31, 18, 32)).isFalse();    //odd,  even, even
+        assertThat(ForcePageCount.END_ON_ODD.addPage(32, 17, -1)).isTrue();     //even, odd,  neg
+        assertThat(ForcePageCount.END_ON_ODD.addPage(32, 17, -1)).isTrue();     //even, odd,  neg
+        assertThat(ForcePageCount.END_ON_ODD.addPage(32, 18, -1)).isTrue();     //even, even, neg
+        assertThat(ForcePageCount.END_ON_ODD.addPage(32, 18, -1)).isTrue();     //even, even, neg
+
+        assertThat(ForcePageCount.NO_FORCE.addPage(31, 17, 33)).isFalse();      //odd,  odd,  odd
+        assertThat(ForcePageCount.NO_FORCE.addPage(31, 17, 32)).isFalse();      //odd,  odd,  even
+        assertThat(ForcePageCount.NO_FORCE.addPage(31, 18, 33)).isFalse();      //odd,  even, odd
+        assertThat(ForcePageCount.NO_FORCE.addPage(31, 18, 32)).isFalse();      //odd,  even, even
+        assertThat(ForcePageCount.NO_FORCE.addPage(32, 17, -1)).isFalse();      //even, odd,  neg
+        assertThat(ForcePageCount.NO_FORCE.addPage(32, 17, -1)).isFalse();      //even, odd,  neg
+        assertThat(ForcePageCount.NO_FORCE.addPage(32, 18, -1)).isFalse();      //even, even, neg
+        assertThat(ForcePageCount.NO_FORCE.addPage(32, 18, -1)).isFalse();      //even, even, neg
     }
 
 }

Modified: trunk/axsl/buildSrc/src/main/groovy/axsl.test-conventions.gradle
===================================================================
--- trunk/axsl/buildSrc/src/main/groovy/axsl.test-conventions.gradle	2026-03-26 14:00:04 UTC (rev 2995)
+++ trunk/axsl/buildSrc/src/main/groovy/axsl.test-conventions.gradle	2026-03-30 23:57:08 UTC (rev 2996)
@@ -10,6 +10,7 @@
     testRuntimeOnly         libs.junit.jupiter
     testRuntimeOnly         libs.junit.platform.launcher
 
+    testImplementation      libs.assertj.core
 }
 
 test {

Modified: trunk/axsl/gradle/libs.versions.toml
===================================================================
--- trunk/axsl/gradle/libs.versions.toml	2026-03-26 14:00:04 UTC (rev 2995)
+++ trunk/axsl/gradle/libs.versions.toml	2026-03-30 23:57:08 UTC (rev 2996)
@@ -6,7 +6,8 @@
 xmlApisExt =                    "1.3.04"        # Latest is 1.3.04      as of 2026-02-17.
 mathMlDom =                     "2.0"
 
-junit =                         "5.13.1"        # Latest is 5.13.1      as of 2025-06-15.
+junit =                         "5.14.3"        # Latest is 6.0.3       as of 2026-03-30.
+assertJ =                       "3.27.7"        # Latest is 3.27.7      as of 2026-03-30.
 mockito =                       "4.11.0"        # Latest is 5.18.0      as of 2025-06-04. See Note 2.
 
 ##### Build-time-only dependencies that should never be permanently used in build.gradle files. #####
@@ -60,6 +61,7 @@
 junit-jupiter =     { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
 junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
 junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
+assertj-core =      { group = "org.assertj", name = "assertj-core", version.ref = "assertJ" }
 
 mockito =           { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 

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