This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new c0e819d22d StringFormatter class
c0e819d22d is described below
commit c0e819d22d8abb600d88a96b38bde03bb73f959a
Author: James Bognar <[email protected]>
AuthorDate: Sat Nov 29 10:24:32 2025 -0500
StringFormatter class
---
.../main/java/org/apache/juneau/assertions/AssertionPredicate.java | 6 +++---
.../java/org/apache/juneau/assertions/FluentObjectAssertion.java | 2 +-
.../src/main/java/org/apache/juneau/assertions/Verify.java | 6 +++---
.../test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java | 2 +-
.../java/org/apache/juneau/assertions/BeanListAssertion_Test.java | 2 +-
.../java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java | 2 +-
.../java/org/apache/juneau/assertions/CollectionAssertion_Test.java | 2 +-
.../test/java/org/apache/juneau/assertions/DateAssertion_Test.java | 2 +-
.../test/java/org/apache/juneau/assertions/ListAssertion_Test.java | 2 +-
.../org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.java | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index a8ef320737..af8e55f507 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -96,7 +96,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
if (nn(p)) {
var b = p.test(t);
if (! b) {
- var m =
mformat(MSG_predicateTestFailed, i + 1);
+ var m =
f(MSG_predicateTestFailed, i + 1);
if (p instanceof
AssertionPredicate p2) // NOSONAR - Intentional.
m += "\n\t" +
p2.getFailureMessage();
failedMessage.set(m);
@@ -139,7 +139,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
if (nn(p)) {
var b = p.test(t);
if (b) {
-
failedMessage.set(mformat(MSG_predicateTestsUnexpectedlyPassed));
+
failedMessage.set(f(MSG_predicateTestsUnexpectedlyPassed));
return false;
}
}
@@ -179,7 +179,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
for (var p : inner)
if (nn(p) && p.test(t))
return true;
- var m = mformat(MSG_noPredicateTestsPassed);
+ var m = f(MSG_noPredicateTestsPassed);
failedMessage.set(m);
return false;
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 1da191dcf8..2ec60afbeb 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -581,7 +581,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
protected String getFailureMessage(Predicate<?> p, Object value) {
if (p instanceof AssertionPredicate p2)
return p2.getFailureMessage();
- return mformat(MSG_unexpectedValue2, value);
+ return f(MSG_unexpectedValue2, r(value));
}
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index 518da3da4e..4d77a5b689 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -83,7 +83,7 @@ public class Verify {
if (expected == o)
return null;
if (expected == null || o == null || ! expected.equals(o))
- return nn(msg) ? msg.get() :
mformat(MSG_unexpectedValue, expected, o);
+ return nn(msg) ? msg.get() : f(MSG_unexpectedValue,
r(expected), r(o));
return null;
}
@@ -112,7 +112,7 @@ public class Verify {
if ((type == null && o == null) || (nn(type) &&
type.isInstance(o)))
return null;
var c = o == null ? null : o.getClass();
- return nn(msg) ? msg.get() : mformat(MSG_unexpectedType, type,
c);
+ return nn(msg) ? msg.get() : f(MSG_unexpectedType, cn(type),
cn(c));
}
/**
@@ -123,7 +123,7 @@ public class Verify {
* @return This object.
*/
public Verify msg(String msg, Object args) {
- this.msg = () -> mformat(msg, args);
+ this.msg = fs(msg, args);
return this;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
index b81afc01fd..2c15681858 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ArrayAssertion_Test.java
@@ -187,7 +187,7 @@ public class ArrayAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
var x1 = a(null,1,2);
test(x1).is(x->x.length==3);
-
assertThrown(()->test(x1).is(x->x.length==2)).asMessage().asOneLine().is("Unexpected
value: '[null, 1, 2]'.");
+
assertThrown(()->test(x1).is(x->x.length==2)).asMessage().asOneLine().is("Unexpected
value: '[null,1,2]'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[null, 1, 2]'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
index 8ea5b18e87..8006d7fcf4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanListAssertion_Test.java
@@ -210,7 +210,7 @@ class BeanListAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
var x1 = l(A1,A2);
test(x1).is(x->x.size()==2);
-
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[(a=1,b=2), (a=3,b=4)]'.");
+
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[(a=1,b=2),(a=3,b=4)]'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[(a=1,b=2), (a=3,b=4)]'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
index 050953474d..ee002cff6e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ByteArrayAssertion_Test.java
@@ -165,7 +165,7 @@ class ByteArrayAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
byte[] x1 = {1,2};
test(x1).is(x->x.length==2);
-
assertThrown(()->test(x1).is(x->x.length==3)).asMessage().asOneLine().is("Unexpected
value: '[1, 2]'.");
+
assertThrown(()->test(x1).is(x->x.length==3)).asMessage().asOneLine().is("Unexpected
value: '0102'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[1, 2]'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/CollectionAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/CollectionAssertion_Test.java
index a187e95b93..f7cde14f94 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/CollectionAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/CollectionAssertion_Test.java
@@ -151,7 +151,7 @@ class CollectionAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
var x1 = l(1,2);
test(x1).is(x->x.size()==2);
-
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[1, 2]'.");
+
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[1,2]'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[1, 2]'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
index 3b06b0243b..28f1ab95c1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/DateAssertion_Test.java
@@ -164,7 +164,7 @@ class DateAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
var x1 = MID1;
test(x1).is(x->x!=null);
-
assertThrown(()->test(x1).is(x->x==null)).asMessage().asOneLine().isMatches("Unexpected
value: '*2000'.");
+
assertThrown(()->test(x1).is(x->x==null)).asMessage().asOneLine().isMatches("Unexpected
value: '*2000*'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().isMatches("Value
unexpectedly matched. Value='*2000'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ListAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ListAssertion_Test.java
index 6b1931e88e..e3f9e133ae 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ListAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ListAssertion_Test.java
@@ -179,7 +179,7 @@ class ListAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
var x1 = l(1,2);
test(x1).is(x->x.size()==2);
-
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[1, 2]'.");
+
assertThrown(()->test(x1).is(x->x.size()==3)).asMessage().asOneLine().is("Unexpected
value: '[1,2]'.");
assertThrown(()->test(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[1, 2]'.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.java
index fac6dba15c..ee440e9289 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.java
@@ -147,7 +147,7 @@ class PrimitiveArrayAssertion_Test extends TestBase {
@Test void ca04b_is_predicate() {
byte[] x1 = {1,2};
byteArray(x1).is(x->x.length==2);
-
assertThrown(()->byteArray(x1).is(x->x.length==3)).asMessage().asOneLine().is("Unexpected
value: '[1, 2]'.");
+
assertThrown(()->byteArray(x1).is(x->x.length==3)).asMessage().asOneLine().is("Unexpected
value: '0102'.");
assertThrown(()->byteArray(x1).is(ne(x1))).asMessage().asOneLine().is("Value
unexpectedly matched. Value='[1, 2]'.");
}
