This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
commit 7eee2066ec329de7d6bd9fd1bc4e70b894190cc7
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Mon Nov 18 11:08:57 2024 +0100
Simplify the test assertions
- assertTrue(!expression) -> assertFalse(expression)
- assertTrue(a.equals(b) -> assertEquals(a, b)
- assertTrue(!a.equals(b) -> assertNotEquals(a, b)
- assertTrue(a == b) -> assertSame(a, b)
- assertTrue(a != b) -> assertNotSame(a, b)
- assertTrue(a instanceof T) -> assertInstanceOf(T.class, a)
---
.../apache/commons/validator/ExceptionTest.java | 6 ++---
.../apache/commons/validator/ExtensionTest.java | 27 +++++++++++----------
.../validator/GenericTypeValidatorTest.java | 28 +++++++++++-----------
.../commons/validator/MultipleConfigFilesTest.java | 13 +++++-----
.../org/apache/commons/validator/MultipleTest.java | 25 +++++++++----------
.../apache/commons/validator/RequiredIfTest.java | 5 ++--
.../apache/commons/validator/RequiredNameTest.java | 17 ++++++-------
.../apache/commons/validator/ValidatorTest.java | 2 +-
.../validator/routines/CalendarValidatorTest.java | 26 ++++++++++----------
.../validator/routines/DateValidatorTest.java | 3 ++-
.../apache/commons/validator/util/FlagsTest.java | 4 ++--
11 files changed, 82 insertions(+), 74 deletions(-)
diff --git a/src/test/java/org/apache/commons/validator/ExceptionTest.java
b/src/test/java/org/apache/commons/validator/ExceptionTest.java
index a7e8af04..e66789c2 100644
--- a/src/test/java/org/apache/commons/validator/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExceptionTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.validator;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
@@ -76,7 +76,7 @@ public class ExceptionTest extends AbstractCommonTest {
} catch (final ValidatorException expected) {
fail("Checked exceptions are not wrapped in ValidatorException in
Validator 1.x.");
} catch (final Exception e) {
- assertTrue("CHECKED-EXCEPTION".equals(e.getMessage()));
+ assertEquals("CHECKED-EXCEPTION", e.getMessage());
}
// This will be true in Validator 2.0
@@ -139,7 +139,7 @@ public class ExceptionTest extends AbstractCommonTest {
validator.validate();
fail("ValidatorException should occur here!");
} catch (final ValidatorException expected) {
- assertTrue("VALIDATOR-EXCEPTION".equals(expected.getMessage()));
+ assertEquals("VALIDATOR-EXCEPTION", expected.getMessage());
}
}
}
diff --git a/src/test/java/org/apache/commons/validator/ExtensionTest.java
b/src/test/java/org/apache/commons/validator/ExtensionTest.java
index 9259d98a..097592ef 100644
--- a/src/test/java/org/apache/commons/validator/ExtensionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExtensionTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.validator;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -94,15 +95,15 @@ public class ExtensionTest {
Field fieldFirstName = form.getFields().get(0);
// get the second field
Field fieldLastName = form.getFields().get(1);
- assertTrue(fieldFirstName.getKey().equals("firstName"), "firstName in
" + FORM_KEY + " should be the first in the list");
- assertTrue(fieldLastName.getKey().equals("lastName"), "lastName in " +
FORM_KEY + " should be the first in the list");
+ assertEquals("firstName", fieldFirstName.getKey(), "firstName in " +
FORM_KEY + " should be the first in the list");
+ assertEquals("lastName", fieldLastName.getKey(), "lastName in " +
FORM_KEY + " should be the first in the list");
// get the second field
fieldLastName = form2.getFields().get(0);
// get the first field
fieldFirstName = form2.getFields().get(1);
- assertTrue(fieldFirstName.getKey().equals("firstName"), "firstName in
" + FORM_KEY2 + " should be the first in the list");
- assertTrue(fieldLastName.getKey().equals("lastName"), "lastName in " +
FORM_KEY2 + " should be the first in the list");
+ assertEquals("firstName", fieldFirstName.getKey(), "firstName in " +
FORM_KEY2 + " should be the first in the list");
+ assertEquals("lastName", fieldLastName.getKey(), "lastName in " +
FORM_KEY2 + " should be the first in the list");
}
@@ -131,7 +132,7 @@ public class ExtensionTest {
final ValidatorResult firstNameResult =
results.getValidatorResult("firstName");
final ValidatorResult lastNameResult =
results.getValidatorResult("lastName");
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
-
assertTrue(firstNameResult.field.getArg(0).getKey().equals(CHECK_MSG_KEY),
+ assertEquals(CHECK_MSG_KEY, firstNameResult.field.getArg(0).getKey(),
"First Name ValidatorResult for the '" + ACTION + "' action
should have '" + CHECK_MSG_KEY + " as a key.");
assertNull(lastNameResult, "Last Name ValidatorResult should be
null.");
@@ -166,11 +167,11 @@ public class ExtensionTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
}
/**
@@ -203,7 +204,7 @@ public class ExtensionTest {
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
}
/**
@@ -232,11 +233,11 @@ public class ExtensionTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
}
/**
@@ -265,7 +266,7 @@ public class ExtensionTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
@@ -299,11 +300,11 @@ public class ExtensionTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
index be9990fa..104bfb4f 100644
--- a/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
@@ -17,8 +17,8 @@
package org.apache.commons.validator;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Date;
@@ -69,13 +69,13 @@ public class GenericTypeValidatorTest extends
AbstractCommonTest {
final Map<String, ?> hResultValues = results.getResultValueMap();
- assertTrue(hResultValues.get("byte") instanceof Byte, () -> "Expecting
byte result to be an instance of Byte for locale: " + locale);
- assertTrue(hResultValues.get("short") instanceof Short, () ->
"Expecting short result to be an instance of Short for locale: " + locale);
- assertTrue(hResultValues.get("integer") instanceof Integer, () ->
"Expecting integer result to be an instance of Integer for locale: " + locale);
- assertTrue(hResultValues.get("long") instanceof Long, () -> "Expecting
long result to be an instance of Long for locale: " + locale);
- assertTrue(hResultValues.get("float") instanceof Float, () ->
"Expecting float result to be an instance of Float for locale: " + locale);
- assertTrue(hResultValues.get("double") instanceof Double, () ->
"Expecting double result to be an instance of Double for locale: " + locale);
- assertTrue(hResultValues.get("date") instanceof Date, () -> "Expecting
date result to be an instance of Date for locale: " + locale);
+ assertInstanceOf(Byte.class, hResultValues.get("byte"), () ->
"Expecting byte result to be an instance of Byte for locale: " + locale);
+ assertInstanceOf(Short.class, hResultValues.get("short"), () ->
"Expecting short result to be an instance of Short for locale: " + locale);
+ assertInstanceOf(Integer.class, hResultValues.get("integer"), () ->
"Expecting integer result to be an instance of Integer for locale: " + locale);
+ assertInstanceOf(Long.class, hResultValues.get("long"), () ->
"Expecting long result to be an instance of Long for locale: " + locale);
+ assertInstanceOf(Float.class, hResultValues.get("float"), () ->
"Expecting float result to be an instance of Float for locale: " + locale);
+ assertInstanceOf(Double.class, hResultValues.get("double"), () ->
"Expecting double result to be an instance of Double for locale: " + locale);
+ assertInstanceOf(Date.class, hResultValues.get("date"), () ->
"Expecting date result to be an instance of Date for locale: " + locale);
for (final String key : hResultValues.keySet()) {
final Object value = hResultValues.get(key);
@@ -149,12 +149,12 @@ public class GenericTypeValidatorTest extends
AbstractCommonTest {
final Map<String, ?> hResultValues = results.getResultValueMap();
- assertTrue(hResultValues.get("byte") instanceof Byte, "Expecting byte
result to be an instance of Byte.");
- assertTrue(hResultValues.get("short") instanceof Short, "Expecting
short result to be an instance of Short.");
- assertTrue(hResultValues.get("integer") instanceof Integer, "Expecting
integer result to be an instance of Integer.");
- assertTrue(hResultValues.get("long") instanceof Long, "Expecting long
result to be an instance of Long.");
- assertTrue(hResultValues.get("float") instanceof Float, "Expecting
float result to be an instance of Float.");
- assertTrue(hResultValues.get("double") instanceof Double, "Expecting
double result to be an instance of Double.");
+ assertInstanceOf(Byte.class, hResultValues.get("byte"), "Expecting
byte result to be an instance of Byte.");
+ assertInstanceOf(Short.class, hResultValues.get("short"), "Expecting
short result to be an instance of Short.");
+ assertInstanceOf(Integer.class, hResultValues.get("integer"),
"Expecting integer result to be an instance of Integer.");
+ assertInstanceOf(Long.class, hResultValues.get("long"), "Expecting
long result to be an instance of Long.");
+ assertInstanceOf(Float.class, hResultValues.get("float"), "Expecting
float result to be an instance of Float.");
+ assertInstanceOf(Double.class, hResultValues.get("double"), "Expecting
double result to be an instance of Double.");
for (final String key : hResultValues.keySet()) {
final Object value = hResultValues.get(key);
diff --git
a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index 47217fb5..e14ce6d3 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.validator;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -91,12 +92,12 @@ public class MultipleConfigFilesTest {
assertNotNull(firstNameResult);
assertTrue(firstNameResult.containsAction(ACTION));
- assertTrue(!firstNameResult.isValid(ACTION));
+ assertFalse(firstNameResult.isValid(ACTION));
assertNotNull(lastNameResult);
assertTrue(lastNameResult.containsAction(ACTION));
- assertTrue(!lastNameResult.isValid(ACTION));
- assertTrue(!lastNameResult.containsAction("int"));
+ assertFalse(lastNameResult.isValid(ACTION));
+ assertFalse(lastNameResult.containsAction("int"));
}
/**
@@ -173,11 +174,11 @@ public class MultipleConfigFilesTest {
assertNotNull(firstNameResult);
assertTrue(firstNameResult.containsAction(ACTION));
- assertTrue(!firstNameResult.isValid(ACTION));
+ assertFalse(firstNameResult.isValid(ACTION));
assertNotNull(lastNameResult);
assertTrue(lastNameResult.containsAction("int"));
- assertTrue(!lastNameResult.isValid("int"));
+ assertFalse(lastNameResult.isValid("int"));
}
/**
@@ -245,7 +246,7 @@ public class MultipleConfigFilesTest {
assertNotNull(lastNameResult);
assertTrue(lastNameResult.containsAction("int"));
- assertTrue(!lastNameResult.isValid("int"));
+ assertFalse(lastNameResult.isValid("int"));
}
}
diff --git a/src/test/java/org/apache/commons/validator/MultipleTest.java
b/src/test/java/org/apache/commons/validator/MultipleTest.java
index dde5f237..5e9cfa04 100644
--- a/src/test/java/org/apache/commons/validator/MultipleTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.validator;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -83,12 +84,12 @@ public class MultipleTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "Last Name ValidatorResult should not be
null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
- assertTrue(!lastNameResult.containsAction("int"), "Last Name
ValidatorResults should not contain the 'int' action.");
+ assertFalse(lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.containsAction("int"), "Last Name
ValidatorResults should not contain the 'int' action.");
}
/**
@@ -118,11 +119,11 @@ public class MultipleTest extends AbstractCommonTest {
assertNotNull(middleNameResult, "Middle Name ValidatorResult should
not be null.");
assertTrue(middleNameResult.containsAction("required"), "Middle Name
ValidatorResult should contain the 'required' action.");
- assertTrue(!middleNameResult.isValid("required"), "Middle Name
ValidatorResult for the 'required' action should have failed");
+ assertFalse(middleNameResult.isValid("required"), "Middle Name
ValidatorResult for the 'required' action should have failed");
- assertTrue(!middleNameResult.containsAction("int"), "Middle Name
ValidatorResult should not contain the 'int' action.");
+ assertFalse(middleNameResult.containsAction("int"), "Middle Name
ValidatorResult should not contain the 'int' action.");
- assertTrue(!middleNameResult.containsAction("positive"), "Middle Name
ValidatorResult should not contain the 'positive' action.");
+ assertFalse(middleNameResult.containsAction("positive"), "Middle Name
ValidatorResult should not contain the 'positive' action.");
}
/**
@@ -156,9 +157,9 @@ public class MultipleTest extends AbstractCommonTest {
assertTrue(middleNameResult.isValid("required"), "Middle Name
ValidatorResult for the 'required' action should have passed");
assertTrue(middleNameResult.containsAction("int"), "Middle Name
ValidatorResult should contain the 'int' action.");
- assertTrue(!middleNameResult.isValid("int"), "Middle Name
ValidatorResult for the 'int' action should have failed");
+ assertFalse(middleNameResult.isValid("int"), "Middle Name
ValidatorResult for the 'int' action should have failed");
- assertTrue(!middleNameResult.containsAction("positive"), "Middle Name
ValidatorResult should not contain the 'positive' action.");
+ assertFalse(middleNameResult.containsAction("positive"), "Middle Name
ValidatorResult should not contain the 'positive' action.");
}
/**
@@ -195,7 +196,7 @@ public class MultipleTest extends AbstractCommonTest {
assertTrue(middleNameResult.isValid("int"), "Middle Name
ValidatorResult for the 'int' action should have passed");
assertTrue(middleNameResult.containsAction("positive"), "Middle Name
ValidatorResult should contain the 'positive' action.");
- assertTrue(!middleNameResult.isValid("positive"), "Middle Name
ValidatorResult for the 'positive' action should have failed");
+ assertFalse(middleNameResult.isValid("positive"), "Middle Name
ValidatorResult for the 'positive' action should have failed");
}
/**
@@ -262,11 +263,11 @@ public class MultipleTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "Last Name ValidatorResult should not be
null.");
assertTrue(lastNameResult.containsAction("int"), "Last Name
ValidatorResult should contain the 'int' action.");
- assertTrue(!lastNameResult.isValid("int"), "Last Name ValidatorResult
for the 'int' action should have failed.");
+ assertFalse(lastNameResult.isValid("int"), "Last Name ValidatorResult
for the 'int' action should have failed.");
}
/**
@@ -334,6 +335,6 @@ public class MultipleTest extends AbstractCommonTest {
assertNotNull(lastNameResult, "Last Name ValidatorResult should not be
null.");
assertTrue(lastNameResult.containsAction("int"), "Last Name
ValidatorResult should contain the 'int' action.");
- assertTrue(!lastNameResult.isValid("int"), "Last Name ValidatorResult
for the 'int' action should have failed.");
+ assertFalse(lastNameResult.isValid("int"), "Last Name ValidatorResult
for the 'int' action should have failed.");
}
}
diff --git a/src/test/java/org/apache/commons/validator/RequiredIfTest.java
b/src/test/java/org/apache/commons/validator/RequiredIfTest.java
index 243f6e90..699db985 100644
--- a/src/test/java/org/apache/commons/validator/RequiredIfTest.java
+++ b/src/test/java/org/apache/commons/validator/RequiredIfTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.validator;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -151,7 +152,7 @@ public class RequiredIfTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "Last Name ValidatorResult should not be
null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
@@ -224,7 +225,7 @@ public class RequiredIfTest extends AbstractCommonTest {
assertNotNull(lastNameResult, "Last Name ValidatorResult should not be
null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
}
}
diff --git a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
index 6235c639..6578e360 100644
--- a/src/test/java/org/apache/commons/validator/RequiredNameTest.java
+++ b/src/test/java/org/apache/commons/validator/RequiredNameTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.validator;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -83,11 +84,11 @@ public class RequiredNameTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), "Last Name ValidatorResult
for the '" + ACTION + "' action should have failed.");
}
/**
@@ -120,7 +121,7 @@ public class RequiredNameTest extends AbstractCommonTest {
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
}
/**
@@ -149,11 +150,11 @@ public class RequiredNameTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
}
/**
@@ -182,7 +183,7 @@ public class RequiredNameTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), () -> "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), () -> "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
@@ -216,11 +217,11 @@ public class RequiredNameTest extends AbstractCommonTest {
assertNotNull(firstNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(firstNameResult.containsAction(ACTION), "First Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(firstNameResult.isValid(ACTION), "First Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
assertNotNull(lastNameResult, "First Name ValidatorResult should not
be null.");
assertTrue(lastNameResult.containsAction(ACTION), () -> "Last Name
ValidatorResult should contain the '" + ACTION + "' action.");
- assertTrue(!lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
+ assertFalse(lastNameResult.isValid(ACTION), () -> "Last Name
ValidatorResult for the '" + ACTION + "' action should have failed.");
}
/**
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java
b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index fbc887c2..6f1b3f9b 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -278,7 +278,7 @@ public class ValidatorTest {
assertTrue(result.containsAction(action), "ValidatorResult does
not contain '" + action + "' validator result.");
- assertTrue(!result.isValid(action), "Validation of the date
formatting has passed when it should have failed.");
+ assertFalse(result.isValid(action), "Validation of the date
formatting has passed when it should have failed.");
} catch (final Exception e) {
fail("An exception was thrown while calling Validator.validate()");
}
diff --git
a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
index e4ec0d32..08fa93b2 100644
---
a/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java
@@ -18,6 +18,8 @@ package org.apache.commons.validator.routines;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -64,36 +66,36 @@ public class CalendarValidatorTest extends
AbstractCalendarValidatorTest {
final Date dateCET = calCET.getTime();
// Check the dates don't match
- assertFalse(dateGMT.getTime() == dateCET.getTime(), "Check GMT !=
CET");
- assertFalse(dateGMT.getTime() == dateEST.getTime(), "Check GMT !=
EST");
- assertFalse(dateCET.getTime() == dateEST.getTime(), "Check CET !=
EST");
+ assertNotEquals(dateGMT.getTime(), dateCET.getTime(), "Check GMT !=
CET");
+ assertNotEquals(dateGMT.getTime(), dateEST.getTime(), "Check GMT !=
EST");
+ assertNotEquals(dateCET.getTime(), dateEST.getTime(), "Check CET !=
EST");
// EST to GMT and back
CalendarValidator.adjustToTimeZone(calEST, GMT);
assertEquals(dateGMT, calEST.getTime(), "EST to GMT");
- assertFalse(dateEST == calEST.getTime(), "Check EST = GMT");
+ assertNotSame(dateEST, calEST.getTime(), "Check EST = GMT");
CalendarValidator.adjustToTimeZone(calEST, EST);
assertEquals(dateEST, calEST.getTime(), "back to EST");
- assertFalse(dateGMT == calEST.getTime(), "Check EST != GMT");
+ assertNotSame(dateGMT, calEST.getTime(), "Check EST != GMT");
// CET to GMT and back
CalendarValidator.adjustToTimeZone(calCET, GMT);
assertEquals(dateGMT, calCET.getTime(), "CET to GMT");
- assertFalse(dateCET == calCET.getTime(), "Check CET = GMT");
+ assertNotSame(dateCET, calCET.getTime(), "Check CET = GMT");
CalendarValidator.adjustToTimeZone(calCET, EET);
assertEquals(dateCET, calCET.getTime(), "back to CET");
- assertFalse(dateGMT == calCET.getTime(), "Check CET != GMT");
+ assertNotSame(dateGMT, calCET.getTime(), "Check CET != GMT");
// Adjust to TimeZone with Same rules
final Calendar calUTC = createCalendar(UTC, DATE_2005_11_23,
TIME_12_03_45);
assertTrue(UTC.hasSameRules(GMT), "SAME: UTC = GMT");
assertEquals(calUTC.getTime(), calGMT.getTime(), "SAME: Check time
(A)");
- assertFalse(GMT.equals(calUTC.getTimeZone()), "SAME: Check GMT(A)");
- assertTrue(UTC.equals(calUTC.getTimeZone()), "SAME: Check UTC(A)");
+ assertNotEquals(GMT, calUTC.getTimeZone(), "SAME: Check GMT(A)");
+ assertEquals(UTC, calUTC.getTimeZone(), "SAME: Check UTC(A)");
CalendarValidator.adjustToTimeZone(calUTC, GMT);
assertEquals(calUTC.getTime(), calGMT.getTime(), "SAME: Check time
(B)");
- assertTrue(GMT.equals(calUTC.getTimeZone()), "SAME: Check GMT(B)");
- assertFalse(UTC.equals(calUTC.getTimeZone()), "SAME: Check UTC(B)");
+ assertEquals(GMT, calUTC.getTimeZone(), "SAME: Check GMT(B)");
+ assertNotEquals(UTC, calUTC.getTimeZone(), "SAME: Check UTC(B)");
}
/**
@@ -134,7 +136,7 @@ public class CalendarValidatorTest extends
AbstractCalendarValidatorTest {
// Test Time Zone
final TimeZone zone = TimeZone.getDefault().getRawOffset() ==
EET.getRawOffset() ? EST : EET;
final Date expectedZone = createCalendar(zone, 20051231, 0).getTime();
- assertFalse(expected.getTime() == expectedZone.getTime(), "default/EET
same ");
+ assertNotEquals(expected.getTime(), expectedZone.getTime(),
"default/EET same ");
assertEquals(expectedZone,
CalendarValidator.getInstance().validate(defaultVal, zone).getTime(),
"validate(C) default");
assertEquals(expectedZone,
CalendarValidator.getInstance().validate(localeVal, locale, zone).getTime(),
"validate(C) locale ");
diff --git
a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
index 4e2fb41f..7befa1a3 100644
--- a/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java
@@ -18,6 +18,7 @@ package org.apache.commons.validator.routines;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -160,7 +161,7 @@ public class DateValidatorTest extends
AbstractCalendarValidatorTest {
// Test Time Zone
final TimeZone zone = TimeZone.getDefault().getRawOffset() ==
EET.getRawOffset() ? EST : EET;
final Date expectedZone = createCalendar(zone, 20051231, 0).getTime();
- assertFalse(expected.getTime() == expectedZone.getTime(),
"default/zone same " + zone);
+ assertNotEquals(expected.getTime(), expectedZone.getTime(),
"default/zone same " + zone);
assertEquals(expectedZone,
DateValidator.getInstance().validate(defaultVal, zone), "validate(C) default");
assertEquals(expectedZone,
DateValidator.getInstance().validate(localeVal, locale, zone), "validate(C)
locale ");
diff --git a/src/test/java/org/apache/commons/validator/util/FlagsTest.java
b/src/test/java/org/apache/commons/validator/util/FlagsTest.java
index 317b5bf4..6f3139d4 100644
--- a/src/test/java/org/apache/commons/validator/util/FlagsTest.java
+++ b/src/test/java/org/apache/commons/validator/util/FlagsTest.java
@@ -89,10 +89,10 @@ public class FlagsTest {
f.turnOn(LONG_FLAG);
f.turnOn(INT_FLAG);
assertTrue(f.isOn(LONG_FLAG));
- assertTrue(!f.isOff(LONG_FLAG));
+ assertFalse(f.isOff(LONG_FLAG));
assertTrue(f.isOn(INT_FLAG));
- assertTrue(!f.isOff(INT_FLAG));
+ assertFalse(f.isOff(INT_FLAG));
assertTrue(f.isOff(LONG_FLAG_2));
}
