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 2ad9986 Assertions API improvements.
2ad9986 is described below
commit 2ad9986da4bd7147976de99f7fd1d02e49e357b5
Author: JamesBognar <[email protected]>
AuthorDate: Tue Jul 13 10:27:46 2021 -0400
Assertions API improvements.
---
.../apache/juneau/assertions/Messages.properties | 112 ++++++++++-----------
.../juneau/assertions/ArrayAssertion_Test.java | 6 +-
.../assertions/AssertionPredicates_Test.java | 44 ++++----
.../juneau/assertions/ByteArrayAssertion_Test.java | 8 +-
.../assertions/CollectionAssertion_Test.java | 4 +-
.../juneau/assertions/DateAssertion_Test.java | 8 +-
.../juneau/assertions/IntegerAssertion_Test.java | 48 ++++-----
.../juneau/assertions/LongAssertion_Test.java | 48 ++++-----
.../juneau/assertions/MapAssertion_Test.java | 4 +-
.../juneau/assertions/ObjectAssertion_Test.java | 26 ++---
.../juneau/assertions/StringAssertion_Test.java | 66 ++++++------
.../juneau/assertions/ThrowableAssertion_Test.java | 12 +--
.../org/apache/juneau/assertions/Verify_Test.java | 16 +--
.../juneau/assertions/VersionAssertion_Test.java | 48 ++++-----
.../assertions/ZonedDateTimeAssertion_Test.java | 8 +-
.../java/org/apache/juneau/config/ConfigTest.java | 18 ++--
.../org/apache/juneau/http/EntityTag_Test.java | 2 +-
.../apache/juneau/reflection/ClassInfoTest.java | 2 +-
18 files changed, 240 insertions(+), 240 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/resources/org/apache/juneau/assertions/Messages.properties
b/juneau-core/juneau-marshall/src/main/resources/org/apache/juneau/assertions/Messages.properties
index ebb47ff..0ed672b 100644
---
a/juneau-core/juneau-marshall/src/main/resources/org/apache/juneau/assertions/Messages.properties
+++
b/juneau-core/juneau-marshall/src/main/resources/org/apache/juneau/assertions/Messages.properties
@@ -1,13 +1,13 @@
#
***************************************************************************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
# * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
+# * to you under the Apache License, Version 2.0 (the ''License''); you may
not use this file except in compliance *
# * with the License. You may obtain a copy of the License at
*
# *
*
# * http://www.apache.org/licenses/LICENSE-2.0
*
# *
*
# * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
+# * ''AS IS'' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
# * specific language governing permissions and limitations under the License.
*
# *
*
#
***************************************************************************************************************************
@@ -15,101 +15,101 @@
Assertion.causedBy = Caused by
AssertionPredicate.valueDidNotPassTest = Value did not pass test.
-AssertionPredicate.valueDidNotPassTestWithValue = Value did not pass
test.\n\tValue="{0}".
+AssertionPredicate.valueDidNotPassTestWithValue = Value did not pass
test.\n\tValue=''{0}''.
AssertionPredicate.predicateTestFailed = Predicate test #{0} failed.
AssertionPredicate.noPredicateTestsPassed = No predicate tests passed.
AssertionPredicate.predicateTestsUnexpectedlyPassed = Predicate test
unexpectedly passed.
AssertionPredicates.valueWasNull = Value was null.
AssertionPredicates.valueWasNotNull = Value was not null.
-AssertionPredicates.valueDidNotMatchExpected = Value did not match
expected.\n\tExpect="{0}".\n\tActual="{1}".
-AssertionPredicates.valueDidNotContainExpected = Value did not contain
expected.\n\tExpect="{0}".\n\tActual="{1}".
-AssertionPredicates.valueUnexpectedlyMatched = Value unexpectedly
matched.\n\tValue="{0}".
-AssertionPredicates.valueWasNotExpectedType = Value was not expected
type.\n\tExpect="{0}".\n\tActual="{1}".
-AssertionPredicates.valueDidNotMatchPattern = Value did not match
pattern.\n\tPattern="{0}".\n\tValue="{1}".
+AssertionPredicates.valueDidNotMatchExpected = Value did not match
expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+AssertionPredicates.valueDidNotContainExpected = Value did not contain
expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+AssertionPredicates.valueUnexpectedlyMatched = Value unexpectedly
matched.\n\tValue=''{0}''.
+AssertionPredicates.valueWasNotExpectedType = Value was not expected
type.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+AssertionPredicates.valueDidNotMatchPattern = Value did not match
pattern.\n\tPattern=''{0}''.\n\tValue=''{1}''.
-Assertions.argumentCannotBeNull = Argument "{0}" cannot be null.
+Assertions.argumentCannotBeNull = Argument ''{0}'' cannot be null.
FluentArrayAssertion.arrayWasNotEmpty = Array was not empty.
FluentArrayAssertion.arrayWasEmpty = Array was empty.
FluentArrayAssertion.arrayUnexpectedSize = Array did not have the expected
size.\n\tExpect={0}.\n\tActual={1}.
-FluentArrayAssertion.arrayDidNotContainExpectedValue = Array did not contain
expected value.\n\tExpect="{0}".\n\tActual="{1}".
-FluentArrayAssertion.arrayContainedUnexpectedValue = Array contained
unexpected value.\n\tUnexpected="{0}".\n\tActual="{1}".
+FluentArrayAssertion.arrayDidNotContainExpectedValue = Array did not contain
expected value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentArrayAssertion.arrayContainedUnexpectedValue = Array contained
unexpected value.\n\tUnexpected=''{0}''.\n\tActual=''{1}''.
FluentArrayAssertion.arrayDidNotContainExpectedValueAt = Array did not contain
expected value at index {0}.\n\t{1}.
FluentBooleanAssertion.valueWasFalse = Value was false.
FluentBooleanAssertion.valueWasTrue = Value was true.
FluentCollectionAssertion.collectionWasNotEmpty = Collection was not empty.
-FluentCollectionAssertion.collectionDidNotContainExpectedValue = Collection
did not contain expected value.\n\tExpect="{0}".\n\tValue="{1}".
-FluentCollectionAssertion.collectionDidNotContainTestedValue = Collection did
not contain tested value.\n\tValue="{1}".
-FluentCollectionAssertion.collectionContainedUnexpectedValue = Collection
contained unexpected value.\n\tUnexpected="{0}".\n\tValue="{1}".
+FluentCollectionAssertion.collectionDidNotContainExpectedValue = Collection
did not contain expected value.\n\tExpect=''{0}''.\n\tValue=''{1}''.
+FluentCollectionAssertion.collectionDidNotContainTestedValue = Collection did
not contain tested value.\n\tValue=''{1}''.
+FluentCollectionAssertion.collectionContainedUnexpectedValue = Collection
contained unexpected value.\n\tUnexpected=''{0}''.\n\tValue=''{1}''.
FluentCollectionAssertion.collectionWasEmpty = Collection was empty.
FluentCollectionAssertion.collectionDidNotHaveExpectedSize = Collection did
not have the expected size.\n\tExpect={0}.\n\tActual={1}.
-FluentComparableAssertion.valueWasNotGreaterThanExpected = Value was not
greater than expected.\n\tExpect="{0}".\n\tActual="{1}".
-FluentComparableAssertion.valueWasNotGreaterOrEqualsToExpected = Value was not
greater than or equals to expected.\n\tExpect="{0}".\n\tActual="{1}".
-FluentComparableAssertion.valueWasNotLessThanExpected = Value was not less
than expected.\n\tExpect="{0}".\n\tActual="{1}".
-FluentComparableAssertion.valueWasNotLessOrEqualsToExpected = Value was not
less than or equals to expected.\n\tExpect="{0}".\n\tActual="{1}".
+FluentComparableAssertion.valueWasNotGreaterThanExpected = Value was not
greater than expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentComparableAssertion.valueWasNotGreaterOrEqualsToExpected = Value was not
greater than or equals to expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentComparableAssertion.valueWasNotLessThanExpected = Value was not less
than expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentComparableAssertion.valueWasNotLessOrEqualsToExpected = Value was not
less than or equals to expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
-FluentDateAssertion.unexpectedValue = Unexpected
value.\n\tExpect="{0}".\n\tActual="{1}".
-FluentDateAssertion.valueWasNotAfterExpected = Value was not after
expected.\n\tExpect="{0}".\n\tActual="{1}".
-FluentDateAssertion.valueWasNotBeforeExpected = Value was not before
expected.\n\tExpect=\"{0}".\n\tActual="{1}".
+FluentDateAssertion.unexpectedValue = Unexpected
value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentDateAssertion.valueWasNotAfterExpected = Value was not after
expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentDateAssertion.valueWasNotBeforeExpected = Value was not before
expected.\n\tExpect=\''{0}''.\n\tActual=''{1}''.
FluentListAssertion.listDidNotContainExpectedValueAt = List did not contain
expected value at index {0}.\n\t{1}
FluentMapAssertion.mapWasNotEmpty = Map was not empty.
-FluentMapAssertion.mapDidNotContainExpectedKey = Map did not contain expected
key.\n\tExpected key="{0}".\n\tValue="{1}".
-FluentMapAssertion.mapContainedUnexpectedKey = Map contained unexpected
key.\n\tUnexpected key="{0}".\n\tValue="{1}".
+FluentMapAssertion.mapDidNotContainExpectedKey = Map did not contain expected
key.\n\tExpected key=''{0}''.\n\tValue=''{1}''.
+FluentMapAssertion.mapContainedUnexpectedKey = Map contained unexpected
key.\n\tUnexpected key=''{0}''.\n\tValue=''{1}''.
FluentMapAssertion.mapWasEmpty = Map was empty.
FluentMapAssertion.mapDidNotHaveTheExpectedSize = Map did not have the
expected size.\n\tExpect={0}.\n\tActual={1}.
-FluentObjectAssertion.unexpectedType = Unexpected
type.\n\tExpect="{0}".\n\tActual="{1}".
-FluentObjectAssertion.unexpectedComparison = Unexpected
comparison.\n\tExpect="{0}".\n\tActual="{1}".
-FluentObjectAssertion.unexpectedValue = Unexpected
value.\n\tExpect="{0}".\n\tActual="{1}".
-FluentObjectAssertion.unexpectedValueDidNotExpect = Unexpected value.\n\tDid
not expect="{0}".\n\tActual="{1}".
-FluentObjectAssertion.notTheSameValue = Not the same
value.\n\tExpect="{0}".\n\tActual="{1}".
+FluentObjectAssertion.unexpectedType = Unexpected
type.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.unexpectedComparison = Unexpected
comparison.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.unexpectedValue = Unexpected
value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.unexpectedValueDidNotExpect = Unexpected value.\n\tDid
not expect=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.notTheSameValue = Not the same
value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
FluentObjectAssertion.valueWasNull = Value was null.
FluentObjectAssertion.valueWasNotNull = Value was not null.
-FluentObjectAssertion.expectedValueNotFound = Expected value not
found.\n\tExpect="{0}".\n\tActual="{1}".
-FluentObjectAssertion.unexpectedValueFound = Unexpected value
found.\n\tUnexpected="{0}".\n\tActual="{1}".
-FluentObjectAssertion.objectWasNotType = Object was not type
"{0}".\n\tActual="{1}".
-FluentObjectAssertion.unexpectedValue2 = Unexpected value: "{0}".
+FluentObjectAssertion.expectedValueNotFound = Expected value not
found.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.unexpectedValueFound = Unexpected value
found.\n\tUnexpected=''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.objectWasNotType = Object was not type
''{0}''.\n\tActual=''{1}''.
+FluentObjectAssertion.unexpectedValue2 = Unexpected value: ''{0}''.
-FluentPrimitiveArrayAssertion.objectWasNotAnArray = Object was not an
array.\n\tActual="{0}".
+FluentPrimitiveArrayAssertion.objectWasNotAnArray = Object was not an
array.\n\tActual=''{0}''.
FluentPrimitiveArrayAssertion.arrayWasNotEmpty = Array was not empty.
FluentPrimitiveArrayAssertion.arrayWasEmpty = Array was empty.
FluentPrimitiveArrayAssertion.arrayDidNotHaveExpectedSize = Array did not have
the expected size.\n\tExpect={0}.\n\tActual={1}.
-FluentPrimitiveArrayAssertion.arrayDidNotContainExpectedValue = Array did not
contain expected value.\n\tExpect="{0}.\n\tActual="{1}"
+FluentPrimitiveArrayAssertion.arrayDidNotContainExpectedValue = Array did not
contain expected value.\n\tExpect=''{0}.\n\tActual=''{1}''
FluentPrimitiveArrayAssertion.arrayDidNotContainExpectedValueAt = Array did
not contain expected value at index {0}.\n\t{1}
-FluentPrimitiveArrayAssertion.arrayContainedUnexpectedValue = Array contained
unexpected value.\n\tUnexpected="{0}".\n\tActual="{1}".
-
-FluentStringAssertion.stringDifferedAtPosition = String differed at position
{0}.\n\tExpect="{1}".\n\tActual="{2}".
-FluentStringAssertion.expectedStringHadDifferentNumbersOfLines = Expected
string had different numbers of lines.\n\tExpect="{0}".\n\tActual="{1}".
-FluentStringAssertion.expectedStringHadDifferentValuesAtLine = Expected string
had different values at line {0}.\n\tExpect="{1}".\n\tActual="{2}".
-FluentStringAssertion.unexpectedValue = Unexpected
value.\n\tExpect="{0}".\n\tActual="{1}".
-FluentStringAssertion.stringEqualedUnexpected = String equaled
unexpected.\n\tValue="{0}".
-FluentStringAssertion.stringDidNotContainExpectedSubstring = String did not
contain expected substring.\n\tSubstring="{0}".\n\tValue="{1}".
-FluentStringAssertion.stringContainedUnexpectedSubstring = String contained
unexpected substring.\n\tSubstring="{0}".\n\tValue="{1}".
-FluentStringAssertion.stringWasNotEmpty = String was not empty.\n\tValue="{0}".
+FluentPrimitiveArrayAssertion.arrayContainedUnexpectedValue = Array contained
unexpected value.\n\tUnexpected=''{0}''.\n\tActual=''{1}''.
+
+FluentStringAssertion.stringDifferedAtPosition = String differed at position
{0}.\n\tExpect=''{1}''.\n\tActual=''{2}''.
+FluentStringAssertion.expectedStringHadDifferentNumbersOfLines = Expected
string had different numbers of lines.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentStringAssertion.expectedStringHadDifferentValuesAtLine = Expected string
had different values at line {0}.\n\tExpect=''{1}''.\n\tActual=''{2}''.
+FluentStringAssertion.unexpectedValue = Unexpected
value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentStringAssertion.stringEqualedUnexpected = String equaled
unexpected.\n\tValue=''{0}''.
+FluentStringAssertion.stringDidNotContainExpectedSubstring = String did not
contain expected substring.\n\tSubstring=''{0}''.\n\tValue=''{1}''.
+FluentStringAssertion.stringContainedUnexpectedSubstring = String contained
unexpected substring.\n\tSubstring=''{0}''.\n\tValue=''{1}''.
+FluentStringAssertion.stringWasNotEmpty = String was not
empty.\n\tValue=''{0}''.
FluentStringAssertion.stringWasNull = String was null.
FluentStringAssertion.stringWasEmpty = String was empty.
-FluentStringAssertion.stringDidNotMatchExpectedPattern = String did not match
expected pattern.\n\tPattern="{0}".\n\tValue="{1}".
-FluentStringAssertion.stringMatchedUnexpectedPattern = String matched
unexpected pattern.\n\tPattern="{0}".\n\tValue="{1}".
-FluentStringAssertion.stringDidNotStartWithExpected = String did not start
with expected substring.\n\tSubstring="{0}".\n\tValue="{1}".
-FluentStringAssertion.stringDidNotEndWithExpected = String did not end with
expected substring.\n\tSubstring="{0}".\n\tValue="{1}".
+FluentStringAssertion.stringDidNotMatchExpectedPattern = String did not match
expected pattern.\n\tPattern=''{0}''.\n\tValue=''{1}''.
+FluentStringAssertion.stringMatchedUnexpectedPattern = String matched
unexpected pattern.\n\tPattern=''{0}''.\n\tValue=''{1}''.
+FluentStringAssertion.stringDidNotStartWithExpected = String did not start
with expected substring.\n\tSubstring=''{0}''.\n\tValue=''{1}''.
+FluentStringAssertion.stringDidNotEndWithExpected = String did not end with
expected substring.\n\tSubstring=''{0}''.\n\tValue=''{1}''.
-FluentThrowableAssertion.exceptionWasNotExpectedType = Exception was not
expected type.\n\tExpect="{0}".\n\tActual="{1}".
-FluentThrowableAssertion.exceptionMessageDidNotContainExpectedSubstring =
Exception message did not contain expected
substring.\n\tSubstring="{0}".\n\tValue="{1}".
+FluentThrowableAssertion.exceptionWasNotExpectedType = Exception was not
expected type.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentThrowableAssertion.exceptionMessageDidNotContainExpectedSubstring =
Exception message did not contain expected
substring.\n\tSubstring=''{0}''.\n\tValue=''{1}''.
FluentThrowableAssertion.exceptionWasNotThrown = Exception was not thrown.
FluentThrowableAssertion.exceptionWasThrown = Exception was thrown.
-FluentThrowableAssertion.causedByExceptionNotExpectedType = Caused-by
exception not of expected type.\n\tExpected="{0}".\n\tActual="{1}".
+FluentThrowableAssertion.causedByExceptionNotExpectedType = Caused-by
exception not of expected type.\n\tExpected=''{0}''.\n\tActual=''{1}''.
-FluentZonedDateTimeAssertion.unexpectedValue = Unexpected
value.\n\tExpect="{0}".\n\tActual="{1}".
-FluentZonedDateTimeAssertion.valueWasNotAfterExpected = Value was not after
expected.\n\tExpect="{0}".\n\tActual="{1}".
-FluentZonedDateTimeAssertion.valueWasNotBeforeExpected = Value was not before
expected.\n\tExpect="{0}".\n\tActual="{1}".
+FluentZonedDateTimeAssertion.unexpectedValue = Unexpected
value.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentZonedDateTimeAssertion.valueWasNotAfterExpected = Value was not after
expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
+FluentZonedDateTimeAssertion.valueWasNotBeforeExpected = Value was not before
expected.\n\tExpect=''{0}''.\n\tActual=''{1}''.
-Verify.unexpectedType = Expected type "{0}" but was "{1}".
-Verify.unexpectedValue = Expected "{0}" but was "{1}".
+Verify.unexpectedType = Expected type ''{0}'' but was ''{1}''.
+Verify.unexpectedValue = Expected ''{0}'' but was ''{1}''.
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 be1aba6..3300274 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
@@ -53,11 +53,11 @@ public class ArrayAssertion_Test {
test(x2).item(0).exists();
test(x2).contains("foo");
- assertThrown(()->test(x2).contains("z")).message().is("Array
did not contain expected value.\n\tExpect=\"z\".\n\tActual=\"[foo, bar]\".");
+ assertThrown(()->test(x2).contains("z")).message().is("Array
did not contain expected value.\n\tExpect='z'.\n\tActual='[foo, bar]'.");
test(x1).doesNotContain("foo");
-
assertThrown(()->test(x2).doesNotContain("foo")).message().is("Array contained
unexpected value.\n\tUnexpected=\"foo\".\n\tActual=\"[foo, bar]\".");
-
assertThrown(()->test(x2).doesNotContain("bar")).message().is("Array contained
unexpected value.\n\tUnexpected=\"bar\".\n\tActual=\"[foo, bar]\".");
+
assertThrown(()->test(x2).doesNotContain("foo")).message().is("Array contained
unexpected value.\n\tUnexpected='foo'.\n\tActual='[foo, bar]'.");
+
assertThrown(()->test(x2).doesNotContain("bar")).message().is("Array contained
unexpected value.\n\tUnexpected='bar'.\n\tActual='[foo, bar]'.");
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
index 4349ca6..a60704f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
@@ -54,75 +54,75 @@ public class AssertionPredicates_Test {
public void a04_eq() {
x1.passes(eq("foo"));
x1.passes(eq((Object)"foo"));
- assertThrown(()->x1.passes(eq("FOO"))).message().is("Value did
not match expected.\n\tExpect=\"FOO\".\n\tActual=\"foo\".");
- assertThrown(()->x1.passes(eq("bar"))).message().is("Value did
not match expected.\n\tExpect=\"bar\".\n\tActual=\"foo\".");
-
assertThrown(()->x1.passes(eq((Object)"bar"))).message().is("Value did not
match expected.\n\tExpect=\"bar\".\n\tActual=\"foo\".");
+ assertThrown(()->x1.passes(eq("FOO"))).message().is("Value did
not match expected.\n\tExpect='FOO'.\n\tActual='foo'.");
+ assertThrown(()->x1.passes(eq("bar"))).message().is("Value did
not match expected.\n\tExpect='bar'.\n\tActual='foo'.");
+
assertThrown(()->x1.passes(eq((Object)"bar"))).message().is("Value did not
match expected.\n\tExpect='bar'.\n\tActual='foo'.");
x2.passes(eq(null));
- assertThrown(()->x2.passes(eq("foo"))).message().is("Value did
not match expected.\n\tExpect=\"foo\".\n\tActual=\"null\".");
+ assertThrown(()->x2.passes(eq("foo"))).message().is("Value did
not match expected.\n\tExpect='foo'.\n\tActual='null'.");
}
@Test
public void a05_eqic() {
x1.passes(eqic("foo"));
x1.passes(eqic("FOO"));
- assertThrown(()->x1.passes(eqic("bar"))).message().is("Value
did not match expected.\n\tExpect=\"bar\".\n\tActual=\"foo\".");
+ assertThrown(()->x1.passes(eqic("bar"))).message().is("Value
did not match expected.\n\tExpect='bar'.\n\tActual='foo'.");
x2.passes(eqic(null));
- assertThrown(()->x2.passes(eqic("bar"))).message().is("Value
did not match expected.\n\tExpect=\"bar\".\n\tActual=\"null\".");
+ assertThrown(()->x2.passes(eqic("bar"))).message().is("Value
did not match expected.\n\tExpect='bar'.\n\tActual='null'.");
}
@Test
public void a06_ne() {
x1.passes(ne("bar"));
x1.passes(ne((Object)"bar"));
- assertThrown(()->x1.passes(ne("foo"))).message().is("Value
unexpectedly matched.\n\tValue=\"foo\".");
-
assertThrown(()->x1.passes(ne((Object)"foo"))).message().is("Value unexpectedly
matched.\n\tValue=\"foo\".");
+ assertThrown(()->x1.passes(ne("foo"))).message().is("Value
unexpectedly matched.\n\tValue='foo'.");
+
assertThrown(()->x1.passes(ne((Object)"foo"))).message().is("Value unexpectedly
matched.\n\tValue='foo'.");
x2.passes(ne("bar"));
- assertThrown(()->x2.passes(ne(null))).message().is("Value
unexpectedly matched.\n\tValue=\"null\".");
+ assertThrown(()->x2.passes(ne(null))).message().is("Value
unexpectedly matched.\n\tValue='null'.");
}
@Test
public void a07_type() {
x1.passes(type(String.class));
x1.passes(type(Object.class));
-
assertThrown(()->x1.passes(type(Integer.class))).message().is("Value was not
expected
type.\n\tExpect=\"java.lang.Integer\".\n\tActual=\"java.lang.String\".");
-
assertThrown(()->x2.passes(type(String.class))).message().is("Value was not
expected type.\n\tExpect=\"java.lang.String\".\n\tActual=\"null\".");
+
assertThrown(()->x1.passes(type(Integer.class))).message().is("Value was not
expected type.\n\tExpect='java.lang.Integer'.\n\tActual='java.lang.String'.");
+
assertThrown(()->x2.passes(type(String.class))).message().is("Value was not
expected type.\n\tExpect='java.lang.String'.\n\tActual='null'.");
}
@Test
public void a08_exactType() {
x1.passes(exactType(String.class));
-
assertThrown(()->x1.passes(exactType(Object.class))).message().is("Value was
not expected
type.\n\tExpect=\"java.lang.Object\".\n\tActual=\"java.lang.String\".");
-
assertThrown(()->x2.passes(exactType(Object.class))).message().is("Value was
not expected type.\n\tExpect=\"java.lang.Object\".\n\tActual=\"null\".");
+
assertThrown(()->x1.passes(exactType(Object.class))).message().is("Value was
not expected
type.\n\tExpect='java.lang.Object'.\n\tActual='java.lang.String'.");
+
assertThrown(()->x2.passes(exactType(Object.class))).message().is("Value was
not expected type.\n\tExpect='java.lang.Object'.\n\tActual='null'.");
}
@Test
public void a03_() {
x1.passes(match("fo*"));
- assertThrown(()->x1.passes(match("ba*"))).message().is("Value
did not match pattern.\n\tPattern=\"ba*\".\n\tValue=\"foo\".");
- assertThrown(()->x2.passes(match("ba*"))).message().is("Value
did not match pattern.\n\tPattern=\"ba*\".\n\tValue=\"null\".");
+ assertThrown(()->x1.passes(match("ba*"))).message().is("Value
did not match pattern.\n\tPattern='ba*'.\n\tValue='foo'.");
+ assertThrown(()->x2.passes(match("ba*"))).message().is("Value
did not match pattern.\n\tPattern='ba*'.\n\tValue='null'.");
}
@Test
public void a10_regex() {
x1.passes(regex("fo.*"));
- assertThrown(()->x1.passes(regex("ba.*"))).message().is("Value
did not match pattern.\n\tPattern=\"ba.*\".\n\tValue=\"foo\".");
- assertThrown(()->x2.passes(regex("ba.*"))).message().is("Value
did not match pattern.\n\tPattern=\"ba.*\".\n\tValue=\"null\".");
+ assertThrown(()->x1.passes(regex("ba.*"))).message().is("Value
did not match pattern.\n\tPattern='ba.*'.\n\tValue='foo'.");
+ assertThrown(()->x2.passes(regex("ba.*"))).message().is("Value
did not match pattern.\n\tPattern='ba.*'.\n\tValue='null'.");
}
@Test
public void a11_regex_wFlags() {
x1.passes(regex("FO.*", CASE_INSENSITIVE));
- assertThrown(()->x1.passes(regex("BA.*",
CASE_INSENSITIVE))).message().is("Value did not match
pattern.\n\tPattern=\"BA.*\".\n\tValue=\"foo\".");
- assertThrown(()->x2.passes(regex("BA.*",
CASE_INSENSITIVE))).message().is("Value did not match
pattern.\n\tPattern=\"BA.*\".\n\tValue=\"null\".");
+ assertThrown(()->x1.passes(regex("BA.*",
CASE_INSENSITIVE))).message().is("Value did not match
pattern.\n\tPattern='BA.*'.\n\tValue='foo'.");
+ assertThrown(()->x2.passes(regex("BA.*",
CASE_INSENSITIVE))).message().is("Value did not match
pattern.\n\tPattern='BA.*'.\n\tValue='null'.");
}
@Test
public void a12_regex_wPattern() {
Pattern p1 = Pattern.compile("FO.*", CASE_INSENSITIVE), p2 =
Pattern.compile("BA.*", CASE_INSENSITIVE);
x1.passes(regex(p1));
- assertThrown(()->x1.passes(regex(p2))).message().is("Value did
not match pattern.\n\tPattern=\"BA.*\".\n\tValue=\"foo\".");
- assertThrown(()->x2.passes(regex(p2))).message().is("Value did
not match pattern.\n\tPattern=\"BA.*\".\n\tValue=\"null\".");
+ assertThrown(()->x1.passes(regex(p2))).message().is("Value did
not match pattern.\n\tPattern='BA.*'.\n\tValue='foo'.");
+ assertThrown(()->x2.passes(regex(p2))).message().is("Value did
not match pattern.\n\tPattern='BA.*'.\n\tValue='null'.");
}
@Test
@@ -152,6 +152,6 @@ public class AssertionPredicates_Test {
@Test
public void a16_test() {
x1.passes(test(eq("foo")));
-
assertThrown(()->x1.passes(test(eq("bar")))).message().is("Value did not pass
test.\n\tValue did not match expected.\n\tExpect=\"bar\".\n\tActual=\"foo\".");
+
assertThrown(()->x1.passes(test(eq("bar")))).message().is("Value did not pass
test.\n\tValue did not match expected.\n\tExpect='bar'.\n\tActual='foo'.");
}
}
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 e1afd61..cd5bae5 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
@@ -69,22 +69,22 @@ public class ByteArrayAssertion_Test {
test(empty()).asString().isNull();
test(x1).asString().is("");
test(x2).asString().is("ab");
-
assertThrown(()->test(x2).asString().is("xx")).message().is("Unexpected
value.\n\tExpect=\"xx\".\n\tActual=\"ab\".");
+
assertThrown(()->test(x2).asString().is("xx")).message().is("Unexpected
value.\n\tExpect='xx'.\n\tActual='ab'.");
test(empty()).asBase64().isNull();
test(x1).asBase64().is("");
test(x2).asBase64().is("YWI=");
-
assertThrown(()->test(x2).asBase64().is("xx")).message().is("Unexpected
value.\n\tExpect=\"xx\".\n\tActual=\"YWI=\".");
+
assertThrown(()->test(x2).asBase64().is("xx")).message().is("Unexpected
value.\n\tExpect='xx'.\n\tActual='YWI='.");
test(empty()).asHex().isNull();
test(x1).asHex().is("");
test(x2).asHex().is("6162");
-
assertThrown(()->test(x2).asHex().is("xx")).message().is("Unexpected
value.\n\tExpect=\"xx\".\n\tActual=\"6162\".");
+
assertThrown(()->test(x2).asHex().is("xx")).message().is("Unexpected
value.\n\tExpect='xx'.\n\tActual='6162'.");
test(empty()).asSpacedHex().isNull();
test(x1).asSpacedHex().is("");
test(x2).asSpacedHex().is("61 62");
-
assertThrown(()->test(x2).asSpacedHex().is("xx")).message().is("Unexpected
value.\n\tExpect=\"xx\".\n\tActual=\"61 62\".");
+
assertThrown(()->test(x2).asSpacedHex().is("xx")).message().is("Unexpected
value.\n\tExpect='xx'.\n\tActual='61 62'.");
}
@Test
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 5ea8371..eb8ed7a 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
@@ -52,10 +52,10 @@ public class CollectionAssertion_Test {
test(x2).isNotEmpty();
test(x2).contains("a");
-
assertThrown(()->test(x2).contains("z")).message().is("Collection did not
contain expected value.\n\tExpect=\"z\".\n\tValue=\"[a, b]\".");
+
assertThrown(()->test(x2).contains("z")).message().is("Collection did not
contain expected value.\n\tExpect='z'.\n\tValue='[a, b]'.");
test(x1).doesNotContain("a");
-
assertThrown(()->test(x2).doesNotContain("a")).message().is("Collection
contained unexpected value.\n\tUnexpected=\"a\".\n\tValue=\"[a, b]\".");
+
assertThrown(()->test(x2).doesNotContain("a")).message().is("Collection
contained unexpected value.\n\tUnexpected='a'.\n\tValue='[a, b]'.");
}
@Test
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 15d3e30..7fa68af 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
@@ -56,12 +56,12 @@ public class DateAssertion_Test {
assertThrown(()->test(x2).isEqual(x1,
ChronoUnit.DAYS)).message().contains("Unexpected value.");
assertThrown(()->test(empty()).isBefore(x1)).message().is("Value was null.");
-
assertThrown(()->test(x1).isBefore(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(x1).isBefore(null)).message().is("Argument 'value' cannot
be null.");
test(x1).isBefore(x2);
assertThrown(()->test(x2).isBefore(x1)).message().contains("Value was not
before expected.");
assertThrown(()->test(empty()).isAfter(x1)).message().is("Value
was null.");
- assertThrown(()->test(x1).isAfter(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(x1).isAfter(null)).message().is("Argument
'value' cannot be null.");
test(x2).isAfter(x1);
assertThrown(()->test(x1).isAfter(x2)).message().contains("Value was not after
expected.");
@@ -74,8 +74,8 @@ public class DateAssertion_Test {
assertThrown(()->test(x1).isAfterNow()).message().contains("Value was not after
expected.");
assertThrown(()->test(empty()).isBetween(x1,x2)).message().is("Value was
null.");
-
assertThrown(()->test(now).isBetween(null,x2)).message().is("Argument \"lower\"
cannot be null.");
-
assertThrown(()->test(now).isBetween(x1,null)).message().is("Argument \"upper\"
cannot be null.");
+
assertThrown(()->test(now).isBetween(null,x2)).message().is("Argument 'lower'
cannot be null.");
+
assertThrown(()->test(now).isBetween(x1,null)).message().is("Argument 'upper'
cannot be null.");
test(now).isBetween(x1, x2);
assertThrown(()->test(x1).isBetween(now,x2)).message().contains("Value was not
after expected.");
assertThrown(()->test(x2).isBetween(x1,now)).message().contains("Value was not
before expected.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
index d84d0a8..8b8df5b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/IntegerAssertion_Test.java
@@ -51,61 +51,61 @@ public class IntegerAssertion_Test {
test(empty()).isEqual(null);
assertThrown(()->test(empty()).isGreaterThan(1)).message().is("Value was
null.");
-
assertThrown(()->test(1).isGreaterThan(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(1).isGreaterThan(null)).message().is("Argument 'value'
cannot be null.");
test(2).isGreaterThan(1);
- assertThrown(()->test(1).isGreaterThan(2)).message().is("Value
was not greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
- assertThrown(()->test(1).isGreaterThan(1)).message().is("Value
was not greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(1).isGreaterThan(2)).message().is("Value
was not greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+ assertThrown(()->test(1).isGreaterThan(1)).message().is("Value
was not greater than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isGt(1)).message().is("Value was
null.");
- assertThrown(()->test(1).isGt(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1).isGt(null)).message().is("Argument
'value' cannot be null.");
test(2).isGt(1);
- assertThrown(()->test(1).isGt(2)).message().is("Value was not
greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
- assertThrown(()->test(1).isGt(1)).message().is("Value was not
greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(1).isGt(2)).message().is("Value was not
greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+ assertThrown(()->test(1).isGt(1)).message().is("Value was not
greater than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isGreaterThanOrEqual(1)).message().is("Value was
null.");
-
assertThrown(()->test(1).isGreaterThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(1).isGreaterThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(2).isGreaterThanOrEqual(1);
-
assertThrown(()->test(1).isGreaterThanOrEqual(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+
assertThrown(()->test(1).isGreaterThanOrEqual(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(1).isGreaterThanOrEqual(1);
assertThrown(()->test(empty()).isGte(1)).message().is("Value
was null.");
- assertThrown(()->test(1).isGte(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1).isGte(null)).message().is("Argument
'value' cannot be null.");
test(2).isGte(1);
- assertThrown(()->test(1).isGte(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+ assertThrown(()->test(1).isGte(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(1).isGte(1);
assertThrown(()->test(empty()).isLessThan(1)).message().is("Value was null.");
-
assertThrown(()->test(1).isLessThan(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(1).isLessThan(null)).message().is("Argument 'value'
cannot be null.");
test(1).isLessThan(2);
- assertThrown(()->test(2).isLessThan(1)).message().is("Value was
not less than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(1).isLessThan(1)).message().is("Value was
not less than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(2).isLessThan(1)).message().is("Value was
not less than expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(1).isLessThan(1)).message().is("Value was
not less than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLt(1)).message().is("Value was
null.");
- assertThrown(()->test(1).isLt(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1).isLt(null)).message().is("Argument
'value' cannot be null.");
test(1).isLt(2);
- assertThrown(()->test(2).isLt(1)).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(1).isLt(1)).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(2).isLt(1)).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(1).isLt(1)).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLessThanOrEqual(1)).message().is("Value was
null.");
-
assertThrown(()->test(1).isLessThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(1).isLessThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(1).isLessThanOrEqual(2);
-
assertThrown(()->test(2).isLessThanOrEqual(1)).message().is("Value was not less
than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+
assertThrown(()->test(2).isLessThanOrEqual(1)).message().is("Value was not less
than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(1).isLessThanOrEqual(1);
assertThrown(()->test(empty()).isLte(1)).message().is("Value
was null.");
- assertThrown(()->test(1).isLte(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1).isLte(null)).message().is("Argument
'value' cannot be null.");
test(1).isLte(2);
- assertThrown(()->test(2).isLte(1)).message().is("Value was not
less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+ assertThrown(()->test(2).isLte(1)).message().is("Value was not
less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(1).isLte(1);
assertThrown(()->test(empty()).isBetween(1,3)).message().is("Value was null.");
-
assertThrown(()->test(2).isBetween(null,3)).message().is("Argument \"lower\"
cannot be null.");
-
assertThrown(()->test(2).isBetween(1,null)).message().is("Argument \"upper\"
cannot be null.");
+
assertThrown(()->test(2).isBetween(null,3)).message().is("Argument 'lower'
cannot be null.");
+
assertThrown(()->test(2).isBetween(1,null)).message().is("Argument 'upper'
cannot be null.");
test(2).isBetween(1,3);
test(1).isBetween(1,3);
test(3).isBetween(1,3);
- assertThrown(()->test(2).isBetween(1,1)).message().is("Value
was not less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(2).isBetween(3,3)).message().is("Value
was not greater than or equals to expected.\n\tExpect=\"3\".\n\tActual=\"2\".");
+ assertThrown(()->test(2).isBetween(1,1)).message().is("Value
was not less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(2).isBetween(3,3)).message().is("Value
was not greater than or equals to expected.\n\tExpect='3'.\n\tActual='2'.");
test(2).isNot("2");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
index 7b0e0e1..7e3fd92 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
@@ -51,64 +51,64 @@ public class LongAssertion_Test {
test(empty()).isEqual(null);
assertThrown(()->test(empty()).isGreaterThan(1)).message().is("Value was
null.");
-
assertThrown(()->test(1l).isGreaterThan(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(1l).isGreaterThan(null)).message().is("Argument 'value'
cannot be null.");
test(2l).isGreaterThan(1);
-
assertThrown(()->test(1l).isGreaterThan(2l)).message().is("Value was not
greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
-
assertThrown(()->test(1l).isGreaterThan(1l)).message().is("Value was not
greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+
assertThrown(()->test(1l).isGreaterThan(2l)).message().is("Value was not
greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+
assertThrown(()->test(1l).isGreaterThan(1l)).message().is("Value was not
greater than expected.\n\tExpect='1'.\n\tActual='1'.");
test(2l).asInteger().isGreaterThan(1);
test(empty()).asInteger().isNull();
assertThrown(()->test(empty()).isGt(1l)).message().is("Value
was null.");
- assertThrown(()->test(1l).isGt(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1l).isGt(null)).message().is("Argument
'value' cannot be null.");
test(2l).isGt(1);
- assertThrown(()->test(1l).isGt(2)).message().is("Value was not
greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
- assertThrown(()->test(1l).isGt(1)).message().is("Value was not
greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(1l).isGt(2)).message().is("Value was not
greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+ assertThrown(()->test(1l).isGt(1)).message().is("Value was not
greater than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isGreaterThanOrEqual(1)).message().is("Value was
null.");
-
assertThrown(()->test(1l).isGreaterThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(1l).isGreaterThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(2l).isGreaterThanOrEqual(1);
-
assertThrown(()->test(1l).isGreaterThanOrEqual(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+
assertThrown(()->test(1l).isGreaterThanOrEqual(2)).message().is("Value was not
greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(1l).isGreaterThanOrEqual(1);
assertThrown(()->test(empty()).isGte(1)).message().is("Value
was null.");
- assertThrown(()->test(1l).isGte(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1l).isGte(null)).message().is("Argument
'value' cannot be null.");
test(2l).isGte(1);
- assertThrown(()->test(1l).isGte(2l)).message().is("Value was
not greater than or equals to expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+ assertThrown(()->test(1l).isGte(2l)).message().is("Value was
not greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(1l).isGte(1l);
assertThrown(()->test(empty()).isLessThan(1)).message().is("Value was null.");
-
assertThrown(()->test(1l).isLessThan(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(1l).isLessThan(null)).message().is("Argument 'value'
cannot be null.");
test(1l).isLessThan(2l);
- assertThrown(()->test(2l).isLessThan(1)).message().is("Value
was not less than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(1l).isLessThan(1)).message().is("Value
was not less than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(2l).isLessThan(1)).message().is("Value
was not less than expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(1l).isLessThan(1)).message().is("Value
was not less than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLt(1)).message().is("Value was
null.");
- assertThrown(()->test(1l).isLt(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1l).isLt(null)).message().is("Argument
'value' cannot be null.");
test(1l).isLt(2);
- assertThrown(()->test(2l).isLt(1)).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(1l).isLt(1)).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+ assertThrown(()->test(2l).isLt(1)).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(1l).isLt(1)).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLessThanOrEqual(1)).message().is("Value was
null.");
-
assertThrown(()->test(1l).isLessThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(1l).isLessThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(1l).isLessThanOrEqual(2);
-
assertThrown(()->test(2l).isLessThanOrEqual(1)).message().is("Value was not
less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+
assertThrown(()->test(2l).isLessThanOrEqual(1)).message().is("Value was not
less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(1l).isLessThanOrEqual(1);
assertThrown(()->test(empty()).isLte(1)).message().is("Value
was null.");
- assertThrown(()->test(1l).isLte(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(1l).isLte(null)).message().is("Argument
'value' cannot be null.");
test(1l).isLte(2);
- assertThrown(()->test(2l).isLte(1)).message().is("Value was not
less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+ assertThrown(()->test(2l).isLte(1)).message().is("Value was not
less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(1l).isLte(1);
assertThrown(()->test(empty()).isBetween(1,3)).message().is("Value was null.");
-
assertThrown(()->test(2l).isBetween(null,3)).message().is("Argument \"lower\"
cannot be null.");
-
assertThrown(()->test(2l).isBetween(1,null)).message().is("Argument \"upper\"
cannot be null.");
+
assertThrown(()->test(2l).isBetween(null,3)).message().is("Argument 'lower'
cannot be null.");
+
assertThrown(()->test(2l).isBetween(1,null)).message().is("Argument 'upper'
cannot be null.");
test(2l).isBetween(1,3);
test(1l).isBetween(1,3);
test(3l).isBetween(1,3);
- assertThrown(()->test(2l).isBetween(1,1)).message().is("Value
was not less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
- assertThrown(()->test(2l).isBetween(3,3)).message().is("Value
was not greater than or equals to expected.\n\tExpect=\"3\".\n\tActual=\"2\".");
+ assertThrown(()->test(2l).isBetween(1,1)).message().is("Value
was not less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
+ assertThrown(()->test(2l).isBetween(3,3)).message().is("Value
was not greater than or equals to expected.\n\tExpect='3'.\n\tActual='2'.");
test(2l).isNot("2");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
index 921e10c..47e8bf4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/MapAssertion_Test.java
@@ -56,11 +56,11 @@ public class MapAssertion_Test {
test((Map<String,Object>)null).value("a").asInteger().isNull();
test(x2).containsKey("a");
- assertThrown(()->test(x2).containsKey("x")).message().is("Map
did not contain expected key.\n\tExpected key=\"x\".\n\tValue=\"{a=1, b=2}\".");
+ assertThrown(()->test(x2).containsKey("x")).message().is("Map
did not contain expected key.\n\tExpected key='x'.\n\tValue='{a=1, b=2}'.");
assertThrown(()->test((Map<?,?>)null).containsKey("x")).message().is("Value was
null.");
test(x2).doesNotContainKey("x");
-
assertThrown(()->test(x2).doesNotContainKey("a")).message().is("Map contained
unexpected key.\n\tUnexpected key=\"a\".\n\tValue=\"{a=1, b=2}\".");
+
assertThrown(()->test(x2).doesNotContainKey("a")).message().is("Map contained
unexpected key.\n\tUnexpected key='a'.\n\tValue='{a=1, b=2}'.");
assertThrown(()->test((Map<?,?>)null).containsKey("x")).message().is("Value was
null.");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
index 35e04bd..f06142b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ObjectAssertion_Test.java
@@ -58,11 +58,11 @@ public class ObjectAssertion_Test {
test(of(1)).exists();
assertThrown(()->test(empty()).isType(String.class)).message().is("Value was
null.");
-
assertThrown(()->test("foo").isType(null)).message().is("Argument \"parent\"
cannot be null.");
+
assertThrown(()->test("foo").isType(null)).message().is("Argument 'parent'
cannot be null.");
test("foo").isType(String.class);
test("foo").isType(CharSequence.class);
test("foo").isType(Comparable.class);
-
assertThrown(()->test(1).isType(String.class)).message().is("Unexpected
type.\n\tExpect=\"java.lang.String\".\n\tActual=\"java.lang.Integer\".");
+
assertThrown(()->test(1).isType(String.class)).message().is("Unexpected
type.\n\tExpect='java.lang.String'.\n\tActual='java.lang.Integer'.");
test("foo").asString(JsonSerializer.DEFAULT).is("\"foo\"");
test(empty()).asString(JsonSerializer.DEFAULT).is("null");
@@ -76,39 +76,39 @@ public class ObjectAssertion_Test {
int[] x1 = {1,2}, x2 = {2,1};
test(x2).asJsonSorted().is("[1,2]");
-
assertThrown(()->test(x2).asJsonSorted().is("[2,1]")).message().is("Unexpected
value.\n\tExpect=\"[2,1]\".\n\tActual=\"[1,2]\".");
+
assertThrown(()->test(x2).asJsonSorted().is("[2,1]")).message().is("Unexpected
value.\n\tExpect='[2,1]'.\n\tActual='[1,2]'.");
test(empty()).asJsonSorted().is("null");
test(x1).isSameJsonAs(x1);
-
assertThrown(()->test(x1).isSameJsonAs(x2)).message().is("Unexpected
comparison.\n\tExpect=\"[2,1]\".\n\tActual=\"[1,2]\".");
+
assertThrown(()->test(x1).isSameJsonAs(x2)).message().is("Unexpected
comparison.\n\tExpect='[2,1]'.\n\tActual='[1,2]'.");
test(empty()).isSameJsonAs(null);
assertThrown(()->test(new
A1()).isSameJsonAs(null)).messages().any(contains("Could not call getValue() on
property 'foo'"));
test(x1).isSameSortedAs(x1);
test(x1).isSameSortedAs(x2);
-
assertThrown(()->test(x1).isSameJsonAs(null)).message().is("Unexpected
comparison.\n\tExpect=\"null\".\n\tActual=\"[1,2]\".");
+
assertThrown(()->test(x1).isSameJsonAs(null)).message().is("Unexpected
comparison.\n\tExpect='null'.\n\tActual='[1,2]'.");
test(empty()).isSameSortedAs(null);
test(x1).doesNotEqual(null);
test(empty()).doesNotEqual(x1);
test(x1).doesNotEqual(x2);
-
assertThrown(()->test(empty()).doesNotEqual(null)).message().is("Unexpected
value.\n\tDid not expect=\"null\".\n\tActual=\"null\".");
-
assertThrown(()->test(x1).doesNotEqual(x1)).message().is("Unexpected
value.\n\tDid not expect=\"[1, 2]\".\n\tActual=\"[1, 2]\".");
+
assertThrown(()->test(empty()).doesNotEqual(null)).message().is("Unexpected
value.\n\tDid not expect='null'.\n\tActual='null'.");
+
assertThrown(()->test(x1).doesNotEqual(x1)).message().is("Unexpected
value.\n\tDid not expect='[1, 2]'.\n\tActual='[1, 2]'.");
test(x1).passes(x->x != null);
- assertThrown(()->test(x1).passes(x->x ==
null)).message().is("Unexpected value: \"[1, 2]\".");
+ assertThrown(()->test(x1).passes(x->x ==
null)).message().is("Unexpected value: '[1, 2]'.");
test(x1).passes(x->x[0] == 1);
-
assertThrown(()->test(x1).passes(x->x[0]==2)).message().is("Unexpected value:
\"[1, 2]\".");
+
assertThrown(()->test(x1).passes(x->x[0]==2)).message().is("Unexpected value:
'[1, 2]'.");
test(x1).isNot(null);
test(x1).isAny(x1,x2);
- assertThrown(()->test(x1).isAny(x2)).message().is("Expected
value not found.\n\tExpect=\"[[2, 1]]\".\n\tActual=\"[1, 2]\".");
+ assertThrown(()->test(x1).isAny(x2)).message().is("Expected
value not found.\n\tExpect='[[2, 1]]'.\n\tActual='[1, 2]'.");
test(x1).isNotAny(x2);
-
assertThrown(()->test(x1).isNotAny(x1,x2)).message().is("Unexpected value
found.\n\tUnexpected=\"[1, 2]\".\n\tActual=\"[1, 2]\".");
+
assertThrown(()->test(x1).isNotAny(x1,x2)).message().is("Unexpected value
found.\n\tUnexpected='[1, 2]'.\n\tActual='[1, 2]'.");
Date d1 = new Date(0), d2 = new Date(0);
test(d1).is(d2);
@@ -129,10 +129,10 @@ public class ObjectAssertion_Test {
@Test
public void a03_conversions() throws Exception {
test(new
String[]{"foo"}).asArray(String.class).item(0).is("foo");
-
assertThrown(()->test("foo").asArray(String.class)).message().contains("Object
was not type \"java.lang.String[]\".\n\tActual=\"java.lang.String\".");
+
assertThrown(()->test("foo").asArray(String.class)).message().contains("Object
was not type 'java.lang.String[]'.\n\tActual='java.lang.String'.");
test(true).asBoolean().isTrue();
-
assertThrown(()->test("foo").asBoolean()).message().contains("Object was not
type \"java.lang.Boolean\".\n\tActual=\"java.lang.String\".");
+
assertThrown(()->test("foo").asBoolean()).message().contains("Object was not
type 'java.lang.Boolean'.\n\tActual='java.lang.String'.");
test(new byte[]{123}).asByteArray().asJson().is("[123]");
test(AList.of(123)).asCollection().asJson().is("[123]");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
index 75e5b4c..e1e1ae9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/StringAssertion_Test.java
@@ -41,13 +41,13 @@ public class StringAssertion_Test {
test("foobar").replaceAll("fo+","bar").is("barbar").is("foobar");
test(of("foobar")).replaceAll("fo+","bar").is("barbar").is("foobar");
test(empty()).replaceAll("fo+","bar").isNull();
-
assertThrown(()->test("foobar").replaceAll(null,"")).message().is("Argument
\"regex\" cannot be null.");
-
assertThrown(()->test("foobar").replaceAll("",null)).message().is("Argument
\"replacement\" cannot be null.");
+
assertThrown(()->test("foobar").replaceAll(null,"")).message().is("Argument
'regex' cannot be null.");
+
assertThrown(()->test("foobar").replaceAll("",null)).message().is("Argument
'replacement' cannot be null.");
test("foobar").replace("foo","bar").is("barbar").is("foobar");
test(empty()).replace("foo","bar").isNull();
-
assertThrown(()->test("").replace(null,"bar").isNull()).message().is("Argument
\"target\" cannot be null.");
-
assertThrown(()->test("").replace("foo",null).isNull()).message().is("Argument
\"replacement\" cannot be null.");
+
assertThrown(()->test("").replace(null,"bar").isNull()).message().is("Argument
'target' cannot be null.");
+
assertThrown(()->test("").replace("foo",null).isNull()).message().is("Argument
'replacement' cannot be null.");
test("foo%20bar").urlDecode().is("foo bar").is("foo%20bar");
test(empty()).urlDecode().isNull();
@@ -62,86 +62,86 @@ public class StringAssertion_Test {
test(empty()).uc().isNull();
test("foo\nbar\nbaz").isEqualLinesTo("foo","bar","baz");
-
assertThrown(()->test(empty()).isEqualLinesTo((String[])null)).message().is("Argument
\"lines\" cannot be null.");
+
assertThrown(()->test(empty()).isEqualLinesTo((String[])null)).message().is("Argument
'lines' cannot be null.");
assertThrown(()->test(empty()).isEqualLinesTo((String)null)).message().is("Value
was null.");
-
assertThrown(()->test("foo\nbar\nbaz").javaStrings().isEqualLinesTo("foo","bar","bar")).message().is("String
differed at position
10.\n\tExpect=\"foo\\nbar\\nbar\".\n\tActual=\"foo\\nbar\\nbaz\".");
+
assertThrown(()->test("foo\nbar\nbaz").javaStrings().isEqualLinesTo("foo","bar","bar")).message().is("String
differed at position
10.\n\tExpect='foo\\nbar\\nbar'.\n\tActual='foo\\nbar\\nbaz'.");
test("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","baz");
-
assertThrown(()->test(empty()).isEqualSortedLinesTo((String[])null)).message().is("Argument
\"lines\" cannot be null.");
+
assertThrown(()->test(empty()).isEqualSortedLinesTo((String[])null)).message().is("Argument
'lines' cannot be null.");
test("").isEqualSortedLinesTo((String)null);
assertThrown(()->test(empty()).isEqualSortedLinesTo()).message().is("Value was
null.");
-
assertThrown(()->test("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","bar")).message().is("Expected
string had different values at line 2.\n\tExpect=\"bar\".\n\tActual=\"baz\".");
-
assertThrown(()->test("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo")).message().is("Expected
string had different numbers of lines.\n\tExpect=\"2\".\n\tActual=\"3\".");
+
assertThrown(()->test("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","bar")).message().is("Expected
string had different values at line 2.\n\tExpect='bar'.\n\tActual='baz'.");
+
assertThrown(()->test("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo")).message().is("Expected
string had different numbers of lines.\n\tExpect='2'.\n\tActual='3'.");
assertThrown(()->test(empty()).isEqualSortedLinesTo("foo")).message().is("Value
was null.");
-
assertThrown(()->test("foo").isEqualSortedLinesTo((String)null)).message().is("Expected
string had different values at line 1.\n\tExpect=\"\".\n\tActual=\"foo\".");
+
assertThrown(()->test("foo").isEqualSortedLinesTo((String)null)).message().is("Expected
string had different values at line 1.\n\tExpect=''.\n\tActual='foo'.");
test("foo\nbar\nbaz").isEqualLinesTo("foo","bar","baz");
test("foobar").isEqualIgnoreCaseTo("FOOBAR");
test(empty()).isEqualIgnoreCaseTo(null);
-
assertThrown(()->test("foobar").isEqualIgnoreCaseTo("FOOBAZ")).message().is("String
differed at position 5.\n\tExpect=\"FOOBAZ\".\n\tActual=\"foobar\".");
-
assertThrown(()->test(empty()).isEqualIgnoreCaseTo("FOOBAZ")).message().is("String
differed at position 0.\n\tExpect=\"FOOBAZ\".\n\tActual=\"null\".");
-
assertThrown(()->test("foobar").isEqualIgnoreCaseTo(null)).message().is("String
differed at position 0.\n\tExpect=\"null\".\n\tActual=\"foobar\".");
+
assertThrown(()->test("foobar").isEqualIgnoreCaseTo("FOOBAZ")).message().is("String
differed at position 5.\n\tExpect='FOOBAZ'.\n\tActual='foobar'.");
+
assertThrown(()->test(empty()).isEqualIgnoreCaseTo("FOOBAZ")).message().is("String
differed at position 0.\n\tExpect='FOOBAZ'.\n\tActual='null'.");
+
assertThrown(()->test("foobar").isEqualIgnoreCaseTo(null)).message().is("String
differed at position 0.\n\tExpect='null'.\n\tActual='foobar'.");
test("foobar").doesNotEqual("foobaz");
-
assertThrown(()->test("foobar").doesNotEqual("foobar")).message().is("String
equaled unexpected.\n\tValue=\"foobar\".");
+
assertThrown(()->test("foobar").doesNotEqual("foobar")).message().is("String
equaled unexpected.\n\tValue='foobar'.");
-
assertThrown(()->test("foobar").isEqualTo("foobaz")).message().is("String
differed at position 5.\n\tExpect=\"foobaz\".\n\tActual=\"foobar\".");
+
assertThrown(()->test("foobar").isEqualTo("foobaz")).message().is("String
differed at position 5.\n\tExpect='foobaz'.\n\tActual='foobar'.");
test("foobar").isNot("foobaz");
-
assertThrown(()->test("foobar").isNot("foobar")).message().is("String equaled
unexpected.\n\tValue=\"foobar\".");
-
assertThrown(()->test(empty()).isNot(null)).message().is("String equaled
unexpected.\n\tValue=\"null\".");
+
assertThrown(()->test("foobar").isNot("foobar")).message().is("String equaled
unexpected.\n\tValue='foobar'.");
+
assertThrown(()->test(empty()).isNot(null)).message().is("String equaled
unexpected.\n\tValue='null'.");
test("foobar").isNot(null);
test(empty()).isNot("foobar");
test("foobar").doesNotEqualIc("foobaz");
-
assertThrown(()->test("foobar").doesNotEqualIc("Foobar")).message().is("String
equaled unexpected.\n\tValue=\"foobar\".");
-
assertThrown(()->test(empty()).doesNotEqualIc(null)).message().is("String
equaled unexpected.\n\tValue=\"null\".");
+
assertThrown(()->test("foobar").doesNotEqualIc("Foobar")).message().is("String
equaled unexpected.\n\tValue='foobar'.");
+
assertThrown(()->test(empty()).doesNotEqualIc(null)).message().is("String
equaled unexpected.\n\tValue='null'.");
test("foobar").doesNotEqualIc(null);
test(empty()).doesNotEqualIc("foobar");
test("foobar").contains("foo","bar");
-
assertThrown(()->test("foobar").contains("foo","baz")).message().is("String did
not contain expected substring.\n\tSubstring=\"baz\".\n\tValue=\"foobar\".");
+
assertThrown(()->test("foobar").contains("foo","baz")).message().is("String did
not contain expected substring.\n\tSubstring='baz'.\n\tValue='foobar'.");
test(empty()).contains();
-
assertThrown(()->test("foobar").contains((String[])null)).message().is("Argument
\"values\" cannot be null.");
+
assertThrown(()->test("foobar").contains((String[])null)).message().is("Argument
'values' cannot be null.");
test("foobar").contains((String)null);
-
assertThrown(()->test(empty()).contains("foobar")).message().is("String did not
contain expected substring.\n\tSubstring=\"foobar\".\n\tValue=\"null\".");
+
assertThrown(()->test(empty()).contains("foobar")).message().is("String did not
contain expected substring.\n\tSubstring='foobar'.\n\tValue='null'.");
test("foobar").doesNotContain("baz","qux");
-
assertThrown(()->test("foobar").doesNotContain("foo","baz")).message().is("String
contained unexpected substring.\n\tSubstring=\"foo\".\n\tValue=\"foobar\".");
+
assertThrown(()->test("foobar").doesNotContain("foo","baz")).message().is("String
contained unexpected substring.\n\tSubstring='foo'.\n\tValue='foobar'.");
test(empty()).doesNotContain();
-
assertThrown(()->test("foobar").doesNotContain((String[])null)).message().is("Argument
\"values\" cannot be null.");
+
assertThrown(()->test("foobar").doesNotContain((String[])null)).message().is("Argument
'values' cannot be null.");
test("foobar").doesNotContain((String)null);
test(empty()).doesNotContain("foobar");
test("").isEmpty();
test(empty()).isEmpty();
- assertThrown(()->test("foo").isEmpty()).message().is("String
was not empty.\n\tValue=\"foo\".");
+ assertThrown(()->test("foo").isEmpty()).message().is("String
was not empty.\n\tValue='foo'.");
test("foo").isNotEmpty();
assertThrown(()->test("").isNotEmpty()).message().is("String
was empty.");
assertThrown(()->test(empty()).isNotEmpty()).message().is("String was null.");
test("foo").matches("fo+");
-
assertThrown(()->test("foo").matches("bar")).message().is("String did not match
expected pattern.\n\tPattern=\"bar\".\n\tValue=\"foo\".");
+
assertThrown(()->test("foo").matches("bar")).message().is("String did not match
expected pattern.\n\tPattern='bar'.\n\tValue='foo'.");
assertThrown(()->test(empty()).matches("fo+")).message().is("Value was null.");
-
assertThrown(()->test("").matches((String)null)).message().is("Argument
\"regex\" cannot be null.");
+
assertThrown(()->test("").matches((String)null)).message().is("Argument 'regex'
cannot be null.");
test("foo").matchesSimple("fo*");
-
assertThrown(()->test("foo").matchesSimple("b*")).message().is("String did not
match expected pattern.\n\tPattern=\"\\Qb\\E.*\\Q\\E\".\n\tValue=\"foo\".");
+
assertThrown(()->test("foo").matchesSimple("b*")).message().is("String did not
match expected pattern.\n\tPattern='\\Qb\\E.*\\Q\\E'.\n\tValue='foo'.");
assertThrown(()->test(empty()).matchesSimple("b*")).message().is("Value was
null.");
-
assertThrown(()->test("").matchesSimple(null)).message().is("Argument
\"searchPattern\" cannot be null.");
+
assertThrown(()->test("").matchesSimple(null)).message().is("Argument
'searchPattern' cannot be null.");
test("foo").doesNotMatch("b.*");
-
assertThrown(()->test("foo").doesNotMatch("fo+")).message().is("String matched
unexpected pattern.\n\tPattern=\"fo+\".\n\tValue=\"foo\".");
+
assertThrown(()->test("foo").doesNotMatch("fo+")).message().is("String matched
unexpected pattern.\n\tPattern='fo+'.\n\tValue='foo'.");
test(empty()).doesNotMatch("fo+");
-
assertThrown(()->test("").doesNotMatch((String)null)).message().is("Argument
\"regex\" cannot be null.");
+
assertThrown(()->test("").doesNotMatch((String)null)).message().is("Argument
'regex' cannot be null.");
test("foo").startsWith("fo");
-
assertThrown(()->test("foo").startsWith("x")).message().is("String did not
start with expected substring.\n\tSubstring=\"x\".\n\tValue=\"foo\".");
+
assertThrown(()->test("foo").startsWith("x")).message().is("String did not
start with expected substring.\n\tSubstring='x'.\n\tValue='foo'.");
test("foo").endsWith("oo");
-
assertThrown(()->test("foo").endsWith("x")).message().is("String did not end
with expected substring.\n\tSubstring=\"x\".\n\tValue=\"foo\".");
+
assertThrown(()->test("foo").endsWith("x")).message().is("String did not end
with expected substring.\n\tSubstring='x'.\n\tValue='foo'.");
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
index 217f0ab..3a60d02 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ThrowableAssertion_Test.java
@@ -31,9 +31,9 @@ public class ThrowableAssertion_Test {
RuntimeException x1 = new RuntimeException("foo");
test(x1).isType(Exception.class).isType(RuntimeException.class);
-
assertThrown(()->test(x1).isType(IOException.class)).message().is("Exception
was not expected
type.\n\tExpect=\"java.io.IOException\".\n\tActual=\"java.lang.RuntimeException\".");
+
assertThrown(()->test(x1).isType(IOException.class)).message().is("Exception
was not expected
type.\n\tExpect='java.io.IOException'.\n\tActual='java.lang.RuntimeException'.");
assertThrown(()->test(null).isType(IOException.class)).message().is("Exception
was not thrown.");
- assertThrown(()->test(x1).isType(null)).message().is("Argument
\"type\" cannot be null.");
+ assertThrown(()->test(x1).isType(null)).message().is("Argument
'type' cannot be null.");
test(x1).message().is("foo");
@@ -41,16 +41,16 @@ public class ThrowableAssertion_Test {
assertThrown(()->test(x1).doesNotExist()).message().is("Exception was thrown.");
test(x1).passes(x->x.getMessage().equals("foo"));
-
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: \"java.lang.RuntimeException: foo\".");
+
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: 'java.lang.RuntimeException: foo'.");
test(x1).passes(x->x.getMessage().equals("foo"));
-
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: \"java.lang.RuntimeException: foo\".");
+
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: 'java.lang.RuntimeException: foo'.");
test(x1).passes(x->x.getMessage().equals("foo"));
-
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: \"java.lang.RuntimeException: foo\".");
+
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: 'java.lang.RuntimeException: foo'.");
test(x1).passes(x->x.getMessage().equals("foo"));
-
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: \"java.lang.RuntimeException: foo\".");
+
assertThrown(()->test(x1).passes(x->x.getMessage().equals("bar"))).message().is("Unexpected
value: 'java.lang.RuntimeException: foo'.");
test(x1).message().is("foo");
test(new RuntimeException()).message().doesNotExist();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
index 8f2cfa4..42a5a44 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/assertions/Verify_Test.java
@@ -33,23 +33,23 @@ public class Verify_Test {
Verify x1 = verify("foo"), x2 = verify(null), x3 = verify(new
Date(0));
test(x1.is("foo")).doesNotExist();
- test(x1.is("bar")).is("Expected \"bar\" but was \"foo\".");
- test(x1.is(null)).is("Expected \"null\" but was \"foo\".");
+ test(x1.is("bar")).is("Expected 'bar' but was 'foo'.");
+ test(x1.is(null)).is("Expected 'null' but was 'foo'.");
test(x2.is(null)).doesNotExist();
- test(x2.is("foo")).is("Expected \"foo\" but was \"null\".");
+ test(x2.is("foo")).is("Expected 'foo' but was 'null'.");
test(x3.is(new Date(0))).doesNotExist();
test(x1.isType(String.class)).doesNotExist();
- test(x1.isType(Integer.class)).is("Expected type
\"java.lang.Integer\" but was \"java.lang.String\".");
+ test(x1.isType(Integer.class)).is("Expected type
'java.lang.Integer' but was 'java.lang.String'.");
test(x2.isType(null)).doesNotExist();
- test(x2.isType(String.class)).is("Expected type
\"java.lang.String\" but was \"null\".");
- test(x1.isType(null)).is("Expected type \"null\" but was
\"java.lang.String\".");
+ test(x2.isType(String.class)).is("Expected type
'java.lang.String' but was 'null'.");
+ test(x1.isType(null)).is("Expected type 'null' but was
'java.lang.String'.");
test(verify(true).isTrue()).doesNotExist();
test(verify(false).isFalse()).doesNotExist();
- test(verify(null).isTrue()).is("Expected \"true\" but was
\"null\".");
- test(verify(null).isFalse()).is("Expected \"false\" but was
\"null\".");
+ test(verify(null).isTrue()).is("Expected 'true' but was
'null'.");
+ test(verify(null).isFalse()).is("Expected 'false' but was
'null'.");
test(verify(Boolean.TRUE).isTrue()).doesNotExist();
test(verify(Boolean.FALSE).isFalse()).doesNotExist();
test(x1.is("foo")).doesNotExist();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
index 13efd32..a869198 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/VersionAssertion_Test.java
@@ -52,61 +52,61 @@ public class VersionAssertion_Test {
test(empty()).isEqual(null);
assertThrown(()->test(empty()).isGreaterThan(of("1"))).message().is("Value was
null.");
-
assertThrown(()->test(of("1")).isGreaterThan(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(of("1")).isGreaterThan(null)).message().is("Argument
'value' cannot be null.");
test(of("2")).isGreaterThan(of("1"));
-
assertThrown(()->test(of("1")).isGreaterThan(of("2"))).message().is("Value was
not greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
-
assertThrown(()->test(of("1")).isGreaterThan(of("1"))).message().is("Value was
not greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("1")).isGreaterThan(of("2"))).message().is("Value was
not greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+
assertThrown(()->test(of("1")).isGreaterThan(of("1"))).message().is("Value was
not greater than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isGt(of("1"))).message().is("Value was null.");
-
assertThrown(()->test(of("1")).isGt(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(of("1")).isGt(null)).message().is("Argument 'value'
cannot be null.");
test(of("2")).isGt(of("1"));
-
assertThrown(()->test(of("1")).isGt(of("2"))).message().is("Value was not
greater than expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
-
assertThrown(()->test(of("1")).isGt(of("1"))).message().is("Value was not
greater than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("1")).isGt(of("2"))).message().is("Value was not
greater than expected.\n\tExpect='2'.\n\tActual='1'.");
+
assertThrown(()->test(of("1")).isGt(of("1"))).message().is("Value was not
greater than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isGreaterThanOrEqual(of("1"))).message().is("Value
was null.");
-
assertThrown(()->test(of("1")).isGreaterThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(of("1")).isGreaterThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(of("2")).isGreaterThanOrEqual(of("1"));
-
assertThrown(()->test(of("1")).isGreaterThanOrEqual(of("2"))).message().is("Value
was not greater than or equals to
expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("1")).isGreaterThanOrEqual(of("2"))).message().is("Value
was not greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(of("1")).isGreaterThanOrEqual(of("1"));
assertThrown(()->test(empty()).isGte(of("1"))).message().is("Value was null.");
-
assertThrown(()->test(of("1")).isGte(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(of("1")).isGte(null)).message().is("Argument 'value'
cannot be null.");
test(of("2")).isGte(of("1"));
-
assertThrown(()->test(of("1")).isGte(of("2"))).message().is("Value was not
greater than or equals to expected.\n\tExpect=\"2\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("1")).isGte(of("2"))).message().is("Value was not
greater than or equals to expected.\n\tExpect='2'.\n\tActual='1'.");
test(of("1")).isGte(of("1"));
assertThrown(()->test(empty()).isLessThan(of("1"))).message().is("Value was
null.");
-
assertThrown(()->test(of("1")).isLessThan(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(of("1")).isLessThan(null)).message().is("Argument 'value'
cannot be null.");
test(of("1")).isLessThan(of("2"));
-
assertThrown(()->test(of("2")).isLessThan(of("1"))).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
-
assertThrown(()->test(of("1")).isLessThan(of("1"))).message().is("Value was not
less than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("2")).isLessThan(of("1"))).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='2'.");
+
assertThrown(()->test(of("1")).isLessThan(of("1"))).message().is("Value was not
less than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLt(of("1"))).message().is("Value was null.");
-
assertThrown(()->test(of("1")).isLt(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(of("1")).isLt(null)).message().is("Argument 'value'
cannot be null.");
test(of("1")).isLt(of("2"));
-
assertThrown(()->test(of("2")).isLt(of("1"))).message().is("Value was not less
than expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
-
assertThrown(()->test(of("1")).isLt(of("1"))).message().is("Value was not less
than expected.\n\tExpect=\"1\".\n\tActual=\"1\".");
+
assertThrown(()->test(of("2")).isLt(of("1"))).message().is("Value was not less
than expected.\n\tExpect='1'.\n\tActual='2'.");
+
assertThrown(()->test(of("1")).isLt(of("1"))).message().is("Value was not less
than expected.\n\tExpect='1'.\n\tActual='1'.");
assertThrown(()->test(empty()).isLessThanOrEqual(of("1"))).message().is("Value
was null.");
-
assertThrown(()->test(of("1")).isLessThanOrEqual(null)).message().is("Argument
\"value\" cannot be null.");
+
assertThrown(()->test(of("1")).isLessThanOrEqual(null)).message().is("Argument
'value' cannot be null.");
test(of("1")).isLessThanOrEqual(of("2"));
-
assertThrown(()->test(of("2")).isLessThanOrEqual(of("1"))).message().is("Value
was not less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+
assertThrown(()->test(of("2")).isLessThanOrEqual(of("1"))).message().is("Value
was not less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(of("1")).isLessThanOrEqual(of("1"));
assertThrown(()->test(empty()).isLte(of("1"))).message().is("Value was null.");
-
assertThrown(()->test(of("1")).isLte(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(of("1")).isLte(null)).message().is("Argument 'value'
cannot be null.");
test(of("1")).isLte(of("2"));
-
assertThrown(()->test(of("2")).isLte(of("1"))).message().is("Value was not less
than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
+
assertThrown(()->test(of("2")).isLte(of("1"))).message().is("Value was not less
than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
test(of("1")).isLte(of("1"));
assertThrown(()->test(empty()).isBetween(of("1"),of("3"))).message().is("Value
was null.");
-
assertThrown(()->test(of("2")).isBetween(null,of("3"))).message().is("Argument
\"lower\" cannot be null.");
-
assertThrown(()->test(of("2")).isBetween(of("1"),null)).message().is("Argument
\"upper\" cannot be null.");
+
assertThrown(()->test(of("2")).isBetween(null,of("3"))).message().is("Argument
'lower' cannot be null.");
+
assertThrown(()->test(of("2")).isBetween(of("1"),null)).message().is("Argument
'upper' cannot be null.");
test(of("2")).isBetween(of("1"),of("3"));
test(of("1")).isBetween(of("1"),of("3"));
test(of("3")).isBetween(of("1"),of("3"));
-
assertThrown(()->test(of("2")).isBetween(of("1"),of("1"))).message().is("Value
was not less than or equals to expected.\n\tExpect=\"1\".\n\tActual=\"2\".");
-
assertThrown(()->test(of("2")).isBetween(of("3"),of("3"))).message().is("Value
was not greater than or equals to expected.\n\tExpect=\"3\".\n\tActual=\"2\".");
+
assertThrown(()->test(of("2")).isBetween(of("1"),of("1"))).message().is("Value
was not less than or equals to expected.\n\tExpect='1'.\n\tActual='2'.");
+
assertThrown(()->test(of("2")).isBetween(of("3"),of("3"))).message().is("Value
was not greater than or equals to expected.\n\tExpect='3'.\n\tActual='2'.");
test(of("2")).isNot("2");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
index 0795515..fde0eb8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.java
@@ -58,12 +58,12 @@ public class ZonedDateTimeAssertion_Test {
assertThrown(()->test(x2).isEqual(x1,
ChronoUnit.DAYS)).message().contains("Unexpected value.");
assertThrown(()->test(empty()).isBefore(x1)).message().is("Value was null.");
-
assertThrown(()->test(x1).isBefore(null)).message().is("Argument \"value\"
cannot be null.");
+
assertThrown(()->test(x1).isBefore(null)).message().is("Argument 'value' cannot
be null.");
test(x1).isBefore(x2);
assertThrown(()->test(x2).isBefore(x1)).message().contains("Value was not
before expected.");
assertThrown(()->test(empty()).isAfter(x1)).message().is("Value
was null.");
- assertThrown(()->test(x1).isAfter(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->test(x1).isAfter(null)).message().is("Argument
'value' cannot be null.");
test(x2).isAfter(x1);
assertThrown(()->test(x1).isAfter(x2)).message().contains("Value was not after
expected.");
@@ -76,8 +76,8 @@ public class ZonedDateTimeAssertion_Test {
assertThrown(()->test(x1).isAfterNow()).message().contains("Value was not after
expected.");
assertThrown(()->test(empty()).isBetween(x1,x2)).message().is("Value was
null.");
-
assertThrown(()->test(now).isBetween(null,x2)).message().is("Argument \"lower\"
cannot be null.");
-
assertThrown(()->test(now).isBetween(x1,null)).message().is("Argument \"upper\"
cannot be null.");
+
assertThrown(()->test(now).isBetween(null,x2)).message().is("Argument 'lower'
cannot be null.");
+
assertThrown(()->test(now).isBetween(x1,null)).message().is("Argument 'upper'
cannot be null.");
test(now).isBetween(x1, x2);
assertThrown(()->test(x1).isBetween(now,x2)).message().contains("Value was not
after expected.");
assertThrown(()->test(x2).isBetween(x1,now)).message().contains("Value was not
before expected.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index ef59774..80e8608 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -52,7 +52,7 @@ public class ConfigTest {
assertNull(c.get("b"));
assertNull(c.get("S/c"));
assertNull(c.get("T/d"));
- assertThrown(()->c.get(null)).message().is("Argument \"key\"
cannot be null.");
+ assertThrown(()->c.get(null)).message().is("Argument 'key'
cannot be null.");
c.close();
}
@@ -800,7 +800,7 @@ public class ConfigTest {
assertObject(c.getKeys("S")).asJson().is("['b1','b2']");
assertTrue(c.getKeys("T").isEmpty());
- assertThrown(()->c.getKeys(null)).message().is("Argument
\"section\" cannot be null.");
+ assertThrown(()->c.getKeys(null)).message().is("Argument
'section' cannot be null.");
}
//====================================================================================================
@@ -823,7 +823,7 @@ public class ConfigTest {
c.writeProperties("", a, true);
assertObject(a).asJson().is("{foo:'qux'}");
- assertThrown(()->c.writeProperties(null, a,
true)).message().is("Argument \"section\" cannot be null.");
+ assertThrown(()->c.writeProperties(null, a,
true)).message().is("Argument 'section' cannot be null.");
}
//====================================================================================================
@@ -852,8 +852,8 @@ public class ConfigTest {
assertThrown(()->c.getSectionAsBean("T",
ABean.class)).message().is("Unknown property 'bar' encountered in configuration
section 'T'.");
assertThrown(()->c.getSectionAsBean("T",
BBean.class)).message().is("Unknown property 'bar' encountered in configuration
section 'T'.");
- assertThrown(()->c.getSectionAsBean(null,
ABean.class)).message().is("Argument \"section\" cannot be null.");
- assertThrown(()->c.getSectionAsBean(null,
BBean.class)).message().is("Argument \"section\" cannot be null.");
+ assertThrown(()->c.getSectionAsBean(null,
ABean.class)).message().is("Argument 'section' cannot be null.");
+ assertThrown(()->c.getSectionAsBean(null,
BBean.class)).message().is("Argument 'section' cannot be null.");
}
//====================================================================================================
@@ -888,7 +888,7 @@ public class ConfigTest {
assertObject(c.getSectionAsMap("T")).asJson().is("{}");
assertNull(c.getSectionAsMap("U"));
-
assertThrown(()->c.getSectionAsMap(null)).message().is("Argument \"section\"
cannot be null.");
+
assertThrown(()->c.getSectionAsMap(null)).message().is("Argument 'section'
cannot be null.");
}
//====================================================================================================
@@ -912,7 +912,7 @@ public class ConfigTest {
assertEquals("qux", a.getFoo());
assertThrown(()->c.getSectionAsInterface("T",
ABean.class)).message().is("Class 'org.apache.juneau.config.ConfigTest$ABean'
passed to getSectionAsInterface() is not an interface.");
- assertThrown(()->c.getSectionAsInterface(null,
AInterface.class)).message().is("Argument \"section\" cannot be null.");
+ assertThrown(()->c.getSectionAsInterface(null,
AInterface.class)).message().is("Argument 'section' cannot be null.");
}
public static interface AInterface {
@@ -956,7 +956,7 @@ public class ConfigTest {
c.setSection("S1", Collections.<String>emptyList());
assertString(c).replaceAll("\\r?\\n", "|").is("#C3|#C4||[S1]|");
- assertThrown(()->c.setSection(null, Arrays.asList("", "#C5",
"#C6"))).message().is("Argument \"section\" cannot be null.");
+ assertThrown(()->c.setSection(null, Arrays.asList("", "#C5",
"#C6"))).message().is("Argument 'section' cannot be null.");
}
//====================================================================================================
@@ -982,7 +982,7 @@ public class ConfigTest {
c.setSection("S1", Collections.<String>emptyList(), m);
assertString(c).replaceAll("\\r?\\n", "|").is("#C3|#C4||a =
b|[S1]|a = b|");
- assertThrown(()->c.setSection(null, Arrays.asList("", "#C5",
"#C6"), m)).message().is("Argument \"section\" cannot be null.");
+ assertThrown(()->c.setSection(null, Arrays.asList("", "#C5",
"#C6"), m)).message().is("Argument 'section' cannot be null.");
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
index 4f9d3e9..57357b0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
@@ -73,7 +73,7 @@ public class EntityTag_Test {
assertThrown(()->new EntityTag("foo")).message().is("Invalid
value for entity-tag: [foo]");
assertThrown(()->new EntityTag("\"")).message().is("Invalid
value for entity-tag: [\"]");
assertThrown(()->new EntityTag("")).message().is("Invalid value
for entity-tag: []");
- assertThrown(()->new EntityTag(null)).message().is("Argument
\"value\" cannot be null.");
+ assertThrown(()->new EntityTag(null)).message().is("Argument
'value' cannot be null.");
assertThrown(()->new EntityTag("\"a")).message().is("Invalid
value for entity-tag: [\"a]");
assertThrown(()->new EntityTag("a\"")).message().is("Invalid
value for entity-tag: [a\"]");
assertThrown(()->new EntityTag("W/\"")).message().is("Invalid
value for entity-tag: [W/\"]");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index f344679..d91c290 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -2134,7 +2134,7 @@ public class ClassInfoTest {
@Test
public void getParameterType_nullParameterizedType() {
- assertThrown(()->aClass.getParameterType(2,
null)).message().is("Argument \"pt\" cannot be null.");
+ assertThrown(()->aClass.getParameterType(2,
null)).message().is("Argument 'pt' cannot be null.");
}
@Test
