This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new f79325551 Use Matchers for more detail on error
f79325551 is described below
commit f79325551a133fff8434f40efd714c533c95c984
Author: Sebb <s...@apache.org>
AuthorDate: Sun Oct 22 15:20:12 2023 +0100
Use Matchers for more detail on error
---
src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java | 5 +++--
src/test/java/org/apache/commons/lang3/StringUtilsTest.java | 8 ++++----
src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java | 8 +++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
index 2c6698ac1..7abc149b6 100644
--- a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
@@ -20,6 +20,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -67,7 +68,7 @@ public class RandomStringUtilsTest extends AbstractLangTest {
r1 = RandomStringUtils.randomAscii(50);
assertEquals(50, r1.length(), "randomAscii(50) length");
for (int i = 0; i < r1.length(); i++) {
- assertTrue(r1.charAt(i) >= 32 && r1.charAt(i) <= 127, "char
between 32 and 127");
+ assertThat("char >= 32 && <= 127", ((int) r1.charAt(i)),
allOf(greaterThanOrEqualTo(32), lessThanOrEqualTo(127)));
}
r2 = RandomStringUtils.randomAscii(50);
assertFalse(r1.equals(r2), "!r1.equals(r2)");
@@ -470,7 +471,7 @@ public class RandomStringUtilsTest extends AbstractLangTest
{
// Perform chi-square test with degrees of freedom = 3-1 = 2, testing
at 1e-5 level.
// This expects a failure rate of 1 in 100,000.
// critical value: from scipy.stats import chi2; chi2(2).isf(1e-5)
- assertTrue(chiSquare(expected, counts) < 23.025850929940457, "test
homogeneity -- will fail about 1 in 100,000 times");
+ assertThat("test homogeneity -- will fail about 1 in 100,000 times",
chiSquare(expected, counts), lessThan(23.025850929940457d));
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
index 438dfe5ce..9b9f9a06b 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.lang3;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -142,8 +144,7 @@ public class StringUtilsTest extends AbstractLangTest {
assertTrue(actual.indexOf((char) ('a' + offset)) != -1,
message + " -- should contain offset character");
}
- assertTrue(actual.length() <= maxWidth,
- message + " -- should not be greater than maxWidth");
+ assertThat(message + " -- should not be greater than maxWidth",
actual.length(), lessThanOrEqualTo(maxWidth));
assertEquals(expected, actual, message);
}
@@ -155,8 +156,7 @@ public class StringUtilsTest extends AbstractLangTest {
assertTrue(actual.indexOf((char) ('a' + offset)) != -1,
message + " -- should contain offset character");
}
- assertTrue(actual.length() <= maxWidth,
- message + " -- should not be greater than maxWidth");
+ assertThat(message + " -- should not be greater than maxWidth",
actual.length(), lessThanOrEqualTo(maxWidth));
assertEquals(expected, actual, message);
}
diff --git a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
index 63cb6809d..17943a45f 100644
--- a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
@@ -19,6 +19,8 @@
package org.apache.commons.lang3;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -121,9 +123,9 @@ public class ThreadUtilsTest extends AbstractLangTest {
for (final Thread thread : threads) {
thread.start();
}
- assertTrue(ThreadUtils.getAllThreadGroups().size() >= 7);
- assertTrue(ThreadUtils.getAllThreads().size() >= 11);
-
assertTrue(ThreadUtils.findThreads(ThreadUtils.ALWAYS_TRUE_PREDICATE).size() >=
11);
+ assertThat("getAllThreadGroups",
ThreadUtils.getAllThreadGroups().size(), greaterThanOrEqualTo(7));
+ assertThat("getAllThreads", ThreadUtils.getAllThreads().size(),
greaterThanOrEqualTo(11));
+ assertThat("findThreads(ThreadUtils.ALWAYS_TRUE_PREDICATE)",
ThreadUtils.findThreads(ThreadUtils.ALWAYS_TRUE_PREDICATE).size(),
greaterThanOrEqualTo(11));
assertEquals(1, ThreadUtils.findThreadsByName(t4.getName(),
threadGroup3.getName()).size());
assertEquals(0, ThreadUtils.findThreadsByName(t4.getName(),
threadGroup2.getName()).size());
assertEquals(2, ThreadUtils.findThreadsByName(t11.getName(),
threadGroup7.getName()).size());
