commit fb7667a10503e8c97db7dfd7411c7c2efa298c12
author Gary Gregory <garydgregory@gmail.com> Fri Mar 22 16:23:55 2024 -0400
committer Gary Gregory <garydgregory@gmail.com> Fri Mar 22 16:23:55 2024 -0400
tree e28a5b211553ebaa0123ee8327319af450ccea7a
parent 4015f7e05f3e08103000b8e2c50bf3f31d76e592

Use better JUnit API

src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java

diff --git a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
index bef56df..b905cd2 100644
--- a/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/CodeValidatorTest.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.validator.routines.checkdigit.CheckDigit;
 import org.apache.commons.validator.routines.checkdigit.EAN13CheckDigit;
@@ -42,8 +43,8 @@
         assertNull(validator.getCheckDigit(), "No CheckDigit");
         assertEquals(invalidEAN, validator.validate(invalidEAN), "No CheckDigit invalid");
         assertEquals(validEAN, validator.validate(validEAN), "No CheckDigit valid");
-        assertEquals(true, validator.isValid(invalidEAN), "No CheckDigit (is) invalid");
-        assertEquals(true, validator.isValid(validEAN), "No CheckDigit (is) valid");
+        assertTrue(validator.isValid(invalidEAN), "No CheckDigit (is) invalid");
+        assertTrue(validator.isValid(validEAN), "No CheckDigit (is) valid");
 
         // Use the EAN-13 check digit routine
         validator = new CodeValidator((String) null, -1, EAN13CheckDigit.EAN13_CHECK_DIGIT);
@@ -52,7 +53,7 @@
         assertEquals(null, validator.validate(invalidEAN), "EAN CheckDigit invalid");
         assertEquals(validEAN, validator.validate(validEAN), "EAN CheckDigit valid");
         assertEquals(false, validator.isValid(invalidEAN), "EAN CheckDigit (is) invalid");
-        assertEquals(true, validator.isValid(validEAN), "EAN CheckDigit (is) valid");
+        assertTrue(validator.isValid(validEAN), "EAN CheckDigit (is) valid");
         assertEquals(null, validator.validate("978193011099X"), "EAN CheckDigit ex");
     }
 

src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java

diff --git a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
index 43f3d33..5d58f5d 100644
--- a/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/RegexValidatorTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.regex.Pattern;
@@ -169,9 +170,9 @@
         final String[] array = { "AAC", "FDE", "321" };
 
         // isValid()
-        assertEquals(true, multiple.isValid(value), "isValid() Multiple");
+        assertTrue(multiple.isValid(value), "isValid() Multiple");
         assertEquals(false, single1.isValid(value), "isValid() 1st");
-        assertEquals(true, single2.isValid(value), "isValid() 2nd");
+        assertTrue(single2.isValid(value), "isValid() 2nd");
         assertEquals(false, single3.isValid(value), "isValid() 3rd");
 
         // validate()
@@ -211,9 +212,9 @@
         final String[] array = { "aac", "FDE", "321" };
 
         // isValid()
-        assertEquals(true, multiple.isValid(value), "Sensitive isValid() Multiple");
+        assertTrue( multiple.isValid(value), "Sensitive isValid() Multiple");
         assertEquals(false, single1.isValid(value), "Sensitive isValid() 1st");
-        assertEquals(true, single2.isValid(value), "Sensitive isValid() 2nd");
+        assertTrue( single2.isValid(value), "Sensitive isValid() 2nd");
         assertEquals(false, single3.isValid(value), "Sensitive isValid() 3rd");
 
         // validate()
@@ -256,9 +257,9 @@
         final RegexValidator insensitive = new RegexValidator(REGEX, false);
 
         // isValid()
-        assertEquals(true, sensitive.isValid("ac-DE-1"), "Sensitive isValid() valid");
+        assertTrue( sensitive.isValid("ac-DE-1"), "Sensitive isValid() valid");
         assertEquals(false, sensitive.isValid("AB-de-1"), "Sensitive isValid() invalid");
-        assertEquals(true, insensitive.isValid("AB-de-1"), "Insensitive isValid() valid");
+        assertTrue( insensitive.isValid("AB-de-1"), "Insensitive isValid() valid");
         assertEquals(false, insensitive.isValid("ABd-de-1"), "Insensitive isValid() invalid");
 
         // validate()