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 0e2b81b JUnit tests.
0e2b81b is described below
commit 0e2b81b7d24d9455b0e424298f970ea59ecd26c2
Author: JamesBognar <[email protected]>
AuthorDate: Sat Jul 17 09:35:04 2021 -0400
JUnit tests.
---
.../org/apache/juneau/assertions/Assertions.java | 2 -
.../juneau/assertions/FluentArrayAssertion.java | 37 +-----------
.../assertions/FluentComparableAssertion.java | 68 ++--------------------
.../juneau/assertions/FluentListAssertion.java | 37 +-----------
.../juneau/assertions/FluentObjectAssertion.java | 21 ++-----
.../assertions/FluentPrimitiveArrayAssertion.java | 33 +----------
.../assertions/FluentThrowableAssertion.java | 19 ------
.../juneau/assertions/ArrayAssertion_Test.java | 26 +++------
.../apache/juneau/assertions/Assertions_Test.java | 22 ++++---
.../juneau/assertions/BeanAssertion_Test.java | 4 +-
.../juneau/assertions/BooleanAssertion_Test.java | 2 +-
.../juneau/assertions/ByteArrayAssertion_Test.java | 8 +--
.../assertions/CollectionAssertion_Test.java | 4 +-
.../assertions/ComparableAssertion_Test.java | 2 +-
.../juneau/assertions/DateAssertion_Test.java | 2 +-
.../juneau/assertions/IntegerAssertion_Test.java | 22 +------
.../juneau/assertions/ListAssertion_Test.java | 8 +--
.../juneau/assertions/LongAssertion_Test.java | 24 +-------
.../juneau/assertions/MapAssertion_Test.java | 4 +-
.../juneau/assertions/ObjectAssertion_Test.java | 8 +--
.../juneau/assertions/StringAssertion_Test.java | 6 +-
.../juneau/assertions/ThrowableAssertion_Test.java | 24 ++++----
.../org/apache/juneau/assertions/Verify_Test.java | 22 +++----
.../juneau/assertions/VersionAssertion_Test.java | 22 +------
.../assertions/ZonedDateTimeAssertion_Test.java | 2 +-
.../java/org/apache/juneau/cp/BeanStore_Test.java | 50 ++++++++--------
.../java/org/apache/juneau/cp/FileFinder_Test.java | 68 +++++++++++-----------
.../apache/juneau/http/BasicHttpResource_Test.java | 24 ++++----
.../org/apache/juneau/http/EntityTag_Test.java | 4 +-
.../org/apache/juneau/http/MediaType_Test.java | 6 +-
.../org/apache/juneau/http/StringRanges_Test.java | 4 +-
.../http/header/BasicCsvArrayHeader_Test.java | 2 +-
.../juneau/http/header/BasicUriHeader_Test.java | 2 +-
.../juneau/http/response/HttpException_Test.java | 4 +-
.../apache/juneau/mstat/MethodExecStore_Test.java | 6 +-
.../org/apache/juneau/mstat/ThrownStore_Test.java | 2 +-
.../juneau/rest/Header_AcceptEncoding_Test.java | 12 ++--
.../juneau/rest/annotation/Rest_Debug_Test.java | 2 +-
.../juneau/rest/client/RestClient_Body_Test.java | 36 ++++++------
.../client/RestClient_Response_Headers_Test.java | 8 +--
.../apache/juneau/rest/mock/PathResolverTest.java | 22 +++----
41 files changed, 217 insertions(+), 464 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
index 4b05b84..24a932d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -263,8 +263,6 @@ public class Assertions {
* @return A new {@link ObjectAssertion} object. Never <jk>null</jk>.
*/
public static final <T> ObjectAssertion<T> assertObject(T value) {
- if (value instanceof Optional)
- throw new RuntimeException("XXX");
return ObjectAssertion.create(value);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index c12b444..1f677c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -266,57 +266,26 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R equals(String...entries) throws AssertionError {
- Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
- return is(p);
- }
-
- /**
- * Asserts that the contents of this list contain the specified values
when each entry is converted to a string.
- *
- * @param entries The expected entries in this list.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R equals(Object...entries) throws AssertionError {
+ public R is(String...entries) throws AssertionError {
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return is(p);
}
/**
- * Asserts that the contents of this list contain the specified values
when each entry is converted to a string.
- *
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
- * @param entries The expected entries in this list.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R is(String...entries) throws AssertionError {
- return equals(entries);
- }
-
- /**
* Asserts that the contents of this list contain the specified values.
*
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
* @param entries The expected entries in this list.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
public R is(Object...entries) throws AssertionError {
- return equals(entries);
+ Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
+ return is(p);
}
/**
* Asserts that the contents of this list pass the specified tests.
*
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
* @param tests The tests to run. <jk>null</jk> entries are ignored.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 31454af..cfdc7fc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -82,7 +82,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R isGreaterThan(Comparable value) throws AssertionError {
+ public R isGt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (compareTo(value) <= 0)
throw error(MSG_valueWasNotGreaterThanExpected, value,
value());
@@ -90,27 +90,13 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
}
/**
- * Asserts that the value is greater than the specified value.
- *
- * <p>
- * Equivalent to {@link #isGreaterThan(Comparable)}
- *
- * @param value The values to check against.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R isGt(Comparable value) throws AssertionError {
- return isGreaterThan(value);
- }
-
- /**
* Asserts that the value is greater than or equal to the specified
value.
*
* @param value The values to check against.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R isGreaterThanOrEqual(Comparable value) throws AssertionError {
+ public R isGte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (compareTo(value) < 0)
throw
error(MSG_valueWasNotGreaterOrEqualsToExpected, value, value());
@@ -118,27 +104,13 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
}
/**
- * Asserts that the value is greater than or equal to the specified
value.
- *
- * <p>
- * Equivalent to {@link #isGreaterThanOrEqual(Comparable)}
- *
- * @param value The values to check against.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R isGte(Comparable value) throws AssertionError {
- return isGreaterThanOrEqual(value);
- }
-
- /**
* Asserts that the value is less than the specified value.
*
* @param value The values to check against.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R isLessThan(Comparable value) throws AssertionError {
+ public R isLt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (compareTo(value) >= 0)
throw error(MSG_valueWasNotLessThanExpected,
value, value());
@@ -146,27 +118,13 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
}
/**
- * Asserts that the value is less than the specified value.
- *
- * <p>
- * Equivalent to {@link #isLessThan(Comparable)}
- *
- * @param value The values to check against.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R isLt(Comparable value) throws AssertionError {
- return isLessThan(value);
- }
-
- /**
* Asserts that the value is less than or equals to the specified value.
*
* @param value The values to check against.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R isLessThanOrEqual(Comparable value) throws AssertionError {
+ public R isLte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (compareTo(value) > 0)
throw
error(MSG_valueWasNotLessOrEqualsToExpected, value, value());
@@ -174,20 +132,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
}
/**
- * Asserts that the value is less than or equals to the specified value.
- *
- * <p>
- * Equivalent to {@link #isLessThanOrEqual(Comparable)}
- *
- * @param value The values to check against.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R isLte(Comparable value) throws AssertionError {
- return isLessThanOrEqual(value);
- }
-
- /**
* Asserts that the value is between (inclusive) the specified upper
and lower values.
*
* @param lower The lower value to check against.
@@ -199,8 +143,8 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
exists();
assertArgNotNull("lower", lower);
assertArgNotNull("upper", upper);
- isLessThanOrEqual(upper);
- isGreaterThanOrEqual(lower);
+ isLte(upper);
+ isGte(lower);
return returns();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index 27f5585..a1f12a8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -118,58 +118,27 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R equals(String...entries) throws AssertionError {
+ public R is(String...entries) throws AssertionError {
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return each(p);
}
/**
- * Asserts that the contents of this list contain the specified values
when each entry is converted to a string.
- *
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
- * @param entries The expected entries in this list.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R is(String...entries) throws AssertionError {
- return equals(entries);
- }
-
- /**
- * Asserts that the contents of this list contain the specified values
when each entry is converted to a string.
+ * Asserts that the contents of this list contain the specified values.
*
* @param entries The expected entries in this list.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
@SuppressWarnings("unchecked")
- public R equals(E...entries) throws AssertionError {
+ public R is(E...entries) throws AssertionError {
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return each(p);
}
/**
- * Asserts that the contents of this list contain the specified values.
- *
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
- * @param entries The expected entries in this list.
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R is(@SuppressWarnings("unchecked") E...entries) throws
AssertionError {
- return equals(entries);
- }
-
- /**
* Asserts that the contents of this list pass the specified tests.
*
- * <p>
- * Equivalent to {@link #equals(String...)}
- *
* @param tests
* The tests to run.
* <jk>null</jk> predicates are ignored.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index dfb4929..d52a8a4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -553,7 +553,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R doesNotEqual(Object value) throws AssertionError {
+ public R isNotEqual(Object value) throws AssertionError {
if (this.value == null && value != null || this.value != null
&& value == null)
return returns();
if (this.value == null || this.value.equals(equivalent(value)))
@@ -568,7 +568,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
- public R isSameObjectAs(Object value) throws AssertionError {
+ public R isSame(Object value) throws AssertionError {
if (this.value == value)
return returns();
throw error(MSG_notTheSameValue, value, this.value);
@@ -601,19 +601,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
}
/**
- * Asserts that the object is null.
- *
- * <p>
- * Equivalent to {@link #isNotNull()}.
- *
- * @return The response object (for method chaining).
- * @throws AssertionError If assertion failed.
- */
- public R doesNotExist() throws AssertionError {
- return isNull();
- }
-
- /**
* Asserts that the object is not null.
*
* <p>
@@ -647,14 +634,14 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* Asserts that the value equals the specified value.
*
* <p>
- * Equivalent to {@link #doesNotEqual(Object)}.
+ * Equivalent to {@link #isNotEqual(Object)}.
*
* @param value The value to check against.
* @return The response object (for method chaining).
* @throws AssertionError If assertion failed.
*/
public R isNot(Object value) throws AssertionError {
- return doesNotEqual(equivalent(value));
+ return isNotEqual(equivalent(value));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 310078b..ad10737 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -213,7 +213,7 @@ public class FluentPrimitiveArrayAssertion<T,R> extends
FluentObjectAssertion<T,
* @return The object to return after the test.
* @throws AssertionError If assertion failed.
*/
- public R equals(String...entries) throws AssertionError {
+ public R is(String...entries) throws AssertionError {
Predicate<T>[] p =
stream(entries).map(StringUtils::stringify).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return each(p);
}
@@ -221,46 +221,17 @@ public class FluentPrimitiveArrayAssertion<T,R> extends
FluentObjectAssertion<T,
/**
* Asserts that the array contains the expected entries.
*
- * <p>
- * Equivalent to {@link #equals(String...)}.
- *
- * @param entries The values to check for after being converted to
strings.
- * @return The object to return after the test.
- * @throws AssertionError If assertion failed.
- */
- public R is(String...entries) throws AssertionError {
- return equals(entries);
- }
-
- /**
- * Asserts that the array contains the expected entries.
- *
* @param entries The values to check for. Uses {@link
Object#equals(Object)} for equivalency on entries.
* @return The object to return after the test.
* @throws AssertionError If assertion failed.
*/
@SuppressWarnings("unchecked")
- public R equals(T...entries) throws AssertionError {
+ public R is(T...entries) throws AssertionError {
Predicate<T>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return each(p);
}
/**
- * Asserts that the array contains the expected entries.
- *
- * <p>
- * Equivalent to {@link #equals(T...)}.
- *
- * @param entries The values to check for. Uses {@link
Object#equals(Object)} for equivalency on entries.
- * @return The object to return after the test.
- * @throws AssertionError If assertion failed.
- */
- @SuppressWarnings("unchecked")
- public R is(T...entries) throws AssertionError {
- return equals(entries);
- }
-
- /**
* Asserts that the entries in this array pass the specified tests for
each entry.
*
* @param tests The tests to run. <jk>null</jk> values are ignored.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 619101f..ebbb48b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -35,7 +35,6 @@ public class FluentThrowableAssertion<T extends Throwable,R>
extends FluentObjec
private static final String
MSG_exceptionWasNotExpectedType =
MESSAGES.getString("exceptionWasNotExpectedType"),
MSG_exceptionWasNotThrown =
MESSAGES.getString("exceptionWasNotThrown"),
- MSG_exceptionWasThrown =
MESSAGES.getString("exceptionWasThrown"),
MSG_causedByExceptionNotExpectedType =
MESSAGES.getString("causedByExceptionNotExpectedType");
//-----------------------------------------------------------------------------------------------------------------
@@ -294,24 +293,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
return returns();
}
- /**
- * Asserts that this throwable doesn't exist.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <jc>// Asserts that the specified method doesn't throw any
exception.</jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() ->
{<jv>foo</jv>.getBar();}).notExists();
- * </p>
- *
- * @return This object (for method chaining).
- */
- @Override
- public R doesNotExist() {
- if (valueIsNotNull())
- throw error(MSG_exceptionWasThrown);
- return returns();
- }
-
//-----------------------------------------------------------------------------------------------------------------
// Fluent setters
//-----------------------------------------------------------------------------------------------------------------
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 09e1cf0..cc809ea 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
@@ -40,11 +40,11 @@ public class ArrayAssertion_Test {
assertThrown(()->test(null).exists()).message().is("Value was
null.");
test(x1).exists();
- test(null).doesNotExist();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ test(null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
- test(null).item(0).doesNotExist();
- test(x1).item(0).doesNotExist();
+ test(null).item(0).isNull();
+ test(x1).item(0).isNull();
test(x2).item(0).exists();
}
@@ -84,9 +84,9 @@ public class ArrayAssertion_Test {
public void b04_item() throws Exception {
ABean[] x = new ABean[]{ABean.get(),ABean.get()};
test(x).item(0).asBean().property("a").is(1);
- test(x).item(-1).doesNotExist();
- test(x).item(2).doesNotExist();
- test((Object[])null).item(0).doesNotExist();
+ test(x).item(-1).isNull();
+ test(x).item(2).isNull();
+ test((Object[])null).item(0).isNull();
}
@Test
@@ -181,18 +181,6 @@ public class ArrayAssertion_Test {
}
@Test
- public void c08_equals() throws Exception {
- String[] x1 = {null,"foo","bar"};
- test(x1).equals(null,"foo","bar");
-
assertThrown(()->test(x1).equals(null,"foo","baz")).message().is("Array did not
contain expected value at index 2.\n\tValue did not match
expected.\n\tExpect='baz'.\n\tActual='bar'.");
-
- Integer[] x2={null,1,2};
- test(x2).equals(null,1,2);
- test(x2).equals(null,"1","2");
- assertThrown(()->test(x2).equals(null,1,3)).message().is("Array
did not contain expected value at index 2.\n\tValue did not match
expected.\n\tExpect='3'.\n\tActual='2'.");
- }
-
- @Test
public void c09_is() throws Exception {
String[] x1 = {null,"foo","bar"};
test(x1).is(null,"foo","bar");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index ffb329b..531ef64 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -55,11 +55,13 @@ public class Assertions_Test {
@Test
public void a05_assertString() throws Exception {
assertString("foo").is("foo");
+ assertString(Optional.of("foo")).is("foo");
+ assertString(Optional.empty()).isNull();
}
@Test
public void a06_assertThrowable() throws Exception {
- assertThrowable(null).doesNotExist();
+ assertThrowable(null).isNull();
}
@Test
@@ -80,25 +82,25 @@ public class Assertions_Test {
@Test
public void a10_assertStream() throws Exception {
assertStream(new
ByteArrayInputStream("foo".getBytes())).asString().is("foo");
- assertStream((InputStream)null).asString().doesNotExist();
+ assertStream((InputStream)null).asString().isNull();
}
@Test
public void a11_assertBytes() throws Exception {
assertBytes("foo".getBytes()).asString().is("foo");
- assertBytes((byte[])null).asString().doesNotExist();
+ assertBytes((byte[])null).asString().isNull();
}
@Test
public void a12_assertReader() throws Exception {
assertReader(new StringReader("foo")).is("foo");
- assertReader((Reader)null).doesNotExist();
+ assertReader((Reader)null).isNull();
}
@Test
public void a13_assertThrown() throws Exception {
assertThrown(()->{throw new
RuntimeException("foo");}).message().is("foo");
- assertThrown(()->{}).doesNotExist();
+ assertThrown(()->{}).isNull();
assertThrown(StringIndexOutOfBoundsException.class,
()->"x".charAt(1)).message().is("String index out of range: 1");
assertThrown(
()
->assertThrown(StringIndexOutOfBoundsException.class, ()->{throw new
RuntimeException();})
@@ -122,12 +124,12 @@ public class Assertions_Test {
@Test
public void a17_assertVersion() throws Exception {
- assertVersion(Version.of("2")).isGreaterThan(Version.of("1"));
+ assertVersion(Version.of("2")).isGt(Version.of("1"));
}
@Test
public void a18_assertComparable() throws Exception {
- assertComparable(2).isGreaterThan(1);
+ assertComparable(2).isGt(1);
}
@Test
@@ -156,4 +158,10 @@ public class Assertions_Test {
assertArg(true, "foo {0}", 1);
assertThrown(()->assertArg(false, "foo {0}",
1)).message().is("foo 1");
}
+
+ @Test
+ public void a24_assertOptional() throws Exception {
+ assertOptional(Optional.empty()).isNull();
+ assertOptional(Optional.of(1)).isNotNull();
+ }
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
index e25fa30..d578ce6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BeanAssertion_Test.java
@@ -35,8 +35,8 @@ public class BeanAssertion_Test {
assertThrown(()->test((Object)null).exists()).message().is("Value was null.");
test(a).exists();
- assertCollection(null).doesNotExist();
- assertThrown(()->test(a).doesNotExist()).message().is("Value
was not null.");
+ assertCollection(null).isNull();
+ assertThrown(()->test(a).isNull()).message().is("Value was not
null.");
test(a).property("f1").asInteger().is(1);
test(a).property("x").asInteger().isNull();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
index da8eab7..6d0fc93 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
@@ -31,7 +31,7 @@ public class BooleanAssertion_Test {
test(true).exists();
test(true).exists();
- assertThrown(()->test(true).doesNotExist()).message().is("Value
was not null.");
+ assertThrown(()->test(true).isNull()).message().is("Value was
not null.");
test(true).isEqual(true);
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 1e29248..c73604c 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
@@ -32,9 +32,9 @@ public class ByteArrayAssertion_Test {
test(x1).exists();
test(x1).exists();
- test((byte[])null).doesNotExist();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ test((byte[])null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
test(x1).length().is(0);
assertThrown(()->test(x1).isSize(1)).message().is("Array did
not have the expected size.\n\tExpect=1.\n\tActual=0.");
@@ -48,7 +48,7 @@ public class ByteArrayAssertion_Test {
assertThrown(()->test(x1).isNotEmpty()).message().is("Array was
empty.");
test(x2).isNotEmpty();
- test(x1).item(0).doesNotExist();
+ test(x1).item(0).isNull();
test(x2).item(0).exists();
test(x1).asString().is("");
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 eb8ed7a..229b479 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
@@ -34,8 +34,8 @@ public class CollectionAssertion_Test {
assertThrown(()->test(null).exists()).message().is("Value was
null.");
test(x1).exists();
- test(null).doesNotExist();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ test(null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
assertThrown(()->test(null).isSize(0)).message().is("Value was
null.");
test(x1).isSize(0);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
index 4353263..d4d380e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/ComparableAssertion_Test.java
@@ -26,7 +26,7 @@ public class ComparableAssertion_Test {
@Test
public void a01_basic() throws Exception {
- test(null).doesNotExist();
+ test(null).isNull();
test(1).isGte(1);
}
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 231454c..b022160 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
@@ -34,7 +34,7 @@ public class DateAssertion_Test {
test(x1).exists();
test(x1).exists();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
test(x1).isEqual(x1);
test(x1).isEqual(x1, ChronoUnit.DAYS);
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 54f6c59..5e39b4a 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
@@ -31,47 +31,27 @@ public class IntegerAssertion_Test {
test(1).exists();
test(1).exists();
- assertThrown(()->test(1).doesNotExist()).message().is("Value
was not null.");
+ assertThrown(()->test(1).isNull()).message().is("Value was not
null.");
test(1).isEqual(1);
assertThrown(()->test(1).isEqual(2)).message().contains("Unexpected value.");
-
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).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).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'.");
- test(1).isGreaterThanOrEqual(1);
-
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'.");
test(1).isGte(1);
-
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(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(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'.");
- test(1).isLessThanOrEqual(1);
-
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'.");
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 7167a2a..4386501 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
@@ -34,8 +34,8 @@ public class ListAssertion_Test {
assertThrown(()->test(null).exists()).message().is("Value was
null.");
test(x1).exists();
- test(null).doesNotExist();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ test(null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
assertThrown(()->test(null).isSize(0)).message().is("Value was
null.");
test(x1).isSize(0);
@@ -51,8 +51,8 @@ public class ListAssertion_Test {
assertThrown(()->test(x1).isNotEmpty()).message().is("Collection was empty.");
test(x2).isNotEmpty();
- test(null).item(0).doesNotExist();
- test(x1).item(0).doesNotExist();
+ test(null).item(0).isNull();
+ test(x1).item(0).isNull();
test(x2).item(0).exists();
}
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 ee676ff..2347908 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
@@ -31,49 +31,27 @@ public class LongAssertion_Test {
test(1l).exists();
test(1l).exists();
- assertThrown(()->test(1l).doesNotExist()).message().is("Value
was not null.");
+ assertThrown(()->test(1l).isNull()).message().is("Value was not
null.");
test(1l).isEqual(1l);
assertThrown(()->test(1l).isEqual(2)).message().contains("Unexpected value.");
-
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'.");
-
- test(2l).asInteger().isGreaterThan(1);
-
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).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'.");
- test(1l).isGreaterThanOrEqual(1);
-
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'.");
test(1l).isGte(1l);
-
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(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(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'.");
- test(1l).isLessThanOrEqual(1);
-
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'.");
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 47e8bf4..115c0a3 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
@@ -34,8 +34,8 @@ public class MapAssertion_Test {
assertThrown(()->test(null).exists()).message().is("Value was
null.");
test(x1).exists();
- assertCollection(null).doesNotExist();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ assertCollection(null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
assertThrown(()->test(null).isSize(0)).message().is("Value was
null.");
test(x1).isSize(0);
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 a232bb5..6700fcf 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
@@ -47,7 +47,7 @@ public class ObjectAssertion_Test {
@Test
public void a01_basic() throws Exception {
- test((Object)null).doesNotExist();
+ test((Object)null).isNull();
test(1).exists();
assertThrown(()->test("foo").isType(null)).message().is("Argument 'parent'
cannot be null.");
@@ -76,10 +76,10 @@ public class ObjectAssertion_Test {
test(x1).isSameSortedAs(x2);
assertThrown(()->test(x1).isSameJsonAs(null)).message().is("Unexpected
comparison.\n\tExpect='null'.\n\tActual='[1,2]'.");
- test(x1).doesNotEqual(null);
- test(x1).doesNotEqual(x2);
+ test(x1).isNotEqual(null);
+ test(x1).isNotEqual(x2);
-
assertThrown(()->test(x1).doesNotEqual(x1)).message().is("Unexpected
value.\n\tDid not expect='[1, 2]'.\n\tActual='[1, 2]'.");
+
assertThrown(()->test(x1).isNotEqual(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]'.");
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 e1e1ae9..fb1ef3e 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
@@ -34,8 +34,8 @@ public class StringAssertion_Test {
@Test
public void a01_basic() throws Exception {
- test((String)null).doesNotExist();
- test(empty()).doesNotExist();
+ test((String)null).isNull();
+ test(empty()).isNull();
test(1).exists();
test("foobar").replaceAll("fo+","bar").is("barbar").is("foobar");
@@ -53,7 +53,7 @@ public class StringAssertion_Test {
test(empty()).urlDecode().isNull();
test("foo\nbar\nbaz").sort().is("bar\nbaz\nfoo").is("foo\nbar\nbaz");
- test(empty()).sort().doesNotExist();
+ test(empty()).sort().isNull();
test("FOOBAR").lc().is("foobar").is("FOOBAR");
test(empty()).lc().isNull();
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 3a60d02..b1e524d 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
@@ -37,8 +37,8 @@ public class ThrowableAssertion_Test {
test(x1).message().is("foo");
- test(null).doesNotExist();
-
assertThrown(()->test(x1).doesNotExist()).message().is("Exception was thrown.");
+ test(null).isNull();
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
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'.");
@@ -53,28 +53,28 @@ public class ThrowableAssertion_Test {
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();
- test(null).message().doesNotExist();
+ test(new RuntimeException()).message().isNull();
+ test(null).message().isNull();
test(x1).localizedMessage().is("foo");
- test(new RuntimeException()).localizedMessage().doesNotExist();
- test(null).localizedMessage().doesNotExist();
+ test(new RuntimeException()).localizedMessage().isNull();
+ test(null).localizedMessage().isNull();
test(x1).stackTrace().contains("RuntimeException");
test(new
RuntimeException()).stackTrace().contains("RuntimeException");
- test(null).stackTrace().doesNotExist();
+ test(null).stackTrace().isNull();
test(new RuntimeException(x1)).causedBy().message().is("foo");
- test(new RuntimeException()).message().doesNotExist();
- test(null).causedBy().message().doesNotExist();
+ test(new RuntimeException()).message().isNull();
+ test(null).causedBy().message().isNull();
test(new RuntimeException(new
IOException())).find(RuntimeException.class).exists();
test(new RuntimeException(new
IOException())).find(IOException.class).exists();
test(new RuntimeException(new
IOException())).find(Exception.class).exists();
- test(new RuntimeException(new
IOException())).find(FileNotFoundException.class).doesNotExist();
+ test(new RuntimeException(new
IOException())).find(FileNotFoundException.class).isNull();
test(new
RuntimeException()).find(RuntimeException.class).exists();
- test(new
RuntimeException()).find(IOException.class).doesNotExist();
- test(null).find(RuntimeException.class).doesNotExist();
+ test(new RuntimeException()).find(IOException.class).isNull();
+ test(null).find(RuntimeException.class).isNull();
}
@Test
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 42a5a44..fa91fa5 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
@@ -32,29 +32,29 @@ public class Verify_Test {
public void a01_basic() {
Verify x1 = verify("foo"), x2 = verify(null), x3 = verify(new
Date(0));
- test(x1.is("foo")).doesNotExist();
+ test(x1.is("foo")).isNull();
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(null)).isNull();
test(x2.is("foo")).is("Expected 'foo' but was 'null'.");
- test(x3.is(new Date(0))).doesNotExist();
+ test(x3.is(new Date(0))).isNull();
- test(x1.isType(String.class)).doesNotExist();
+ test(x1.isType(String.class)).isNull();
test(x1.isType(Integer.class)).is("Expected type
'java.lang.Integer' but was 'java.lang.String'.");
- test(x2.isType(null)).doesNotExist();
+ test(x2.isType(null)).isNull();
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(true).isTrue()).isNull();
+ test(verify(false).isFalse()).isNull();
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();
+ test(verify(Boolean.TRUE).isTrue()).isNull();
+ test(verify(Boolean.FALSE).isFalse()).isNull();
+ test(x1.is("foo")).isNull();
- test(verify("foo").msg("bar{0}",
"baz").is("foo")).doesNotExist();
+ test(verify("foo").msg("bar{0}", "baz").is("foo")).isNull();
test(verify("foo").msg("bar{0}", "baz").is("bar")).is("barbaz");
test(verify("foo").msg("bar{0}",
"baz").isType(Integer.class)).is("barbaz");
test(verify(null).msg("bar{0}", "baz").is("bar")).is("barbaz");
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 6c6ed2d..0ca9247 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
@@ -35,46 +35,26 @@ public class VersionAssertion_Test {
test(of("1")).exists();
test(of("1")).exists();
-
assertThrown(()->test(of("1")).doesNotExist()).message().is("Value was not
null.");
+ assertThrown(()->test(of("1")).isNull()).message().is("Value
was not null.");
assertThrown(()->test(of("1")).isEqual(of("2"))).message().contains("Unexpected
value.");
-
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")).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")).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'.");
- test(of("1")).isGreaterThanOrEqual(of("1"));
-
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'.");
test(of("1")).isGte(of("1"));
-
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("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("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'.");
- test(of("1")).isLessThanOrEqual(of("1"));
-
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'.");
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 cff3732..746fd9b 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
@@ -34,7 +34,7 @@ public class ZonedDateTimeAssertion_Test {
test(x1).exists();
test(x1).exists();
- assertThrown(()->test(x1).doesNotExist()).message().is("Value
was not null.");
+ assertThrown(()->test(x1).isNull()).message().is("Value was not
null.");
test(x1).isEqual(x1);
test(x1).isEqual(x1, ChronoUnit.DAYS);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index d1c9213..603cd5f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -37,7 +37,7 @@ public class BeanStore_Test {
public void a01_addBean() {
BeanStore bs = new BeanStore();
assertBoolean(bs.hasBean(A.class)).isFalse();
- assertOptional(bs.getBean(A.class)).doesNotExist();
+ assertOptional(bs.getBean(A.class)).isNull();
bs.addBean(A.class, new A());
assertBoolean(bs.hasBean(A.class)).isTrue();
assertOptional(bs.getBean(A.class)).exists();
@@ -402,47 +402,47 @@ public class BeanStore_Test {
BeanStore bs = BeanStore.create().build();
E1 x = new E1();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA0").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA0").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA2").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA3").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA4").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA5").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA6").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA2").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA3").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA4").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA5").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA6").run()).isNull();
assertThrown(()->bs.beanCreateMethodFinder(E.class,
x).find("createA7").run()).message().is("foo");
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB0").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB0").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB1").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB2").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB3").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB4").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB5").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB6").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB2").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB3").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB4").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB5").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createB6").run()).isNull();
assertThrown(()->bs.beanCreateMethodFinder(E.class,
x).find("createB7").run()).message().is("foo");
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).isNull();
bs.addBean(A.class, new A());
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).exists();
bs.addSupplier(A.class, ()->(A)null);
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).isNull();
bs.addSupplier(A.class, ()->new A());
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC4").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC4").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC5").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC5").run().a).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC5").run().a).isNull();
bs.addSupplier("Foo", ()->new A());
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC4").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC5").run()).exists();
@@ -450,14 +450,14 @@ public class BeanStore_Test {
bs.addSupplier("Foo", null);
bs.addSupplier(A.class, ()->null);
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).doesNotExist();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC1").run()).isNull();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC2").run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createC3").run().a).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createAx").thenFind("createA1").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1").thenFind("createAx").run()).exists();
- assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1", A.class).thenFind("createA2",
A.class).run()).doesNotExist();
+ assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1", A.class).thenFind("createA2", A.class).run()).isNull();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1", A.class).thenFind("createA1").run()).exists();
assertObject(bs.beanCreateMethodFinder(E.class,
x).find("createA1", A.class).withDefault(new E()).run()).exists();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index abc42be..e211ee3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -47,7 +47,7 @@ public class FileFinder_Test {
.create()
.build();
-
assertStream(stream(x,"files/test1a")).asString().doesNotExist();
+ assertStream(stream(x,"files/test1a")).asString().isNull();
}
//-----------------------------------------------------------------------------------------------------------------
@@ -75,7 +75,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"files/test1/bad.txt","files/test1/../test1/_a.txt","files/test1/%2E%2E/test1/_a.txt","files/bad.txt",null,"",".","..","%2E","%2E%2E","j.class","k.properties"};
for (String p : badPatterns) {
- assertStream(stream(x,p)).doesNotExist();
+ assertStream(stream(x,p)).isNull();
}
}
@@ -100,7 +100,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p)).doesNotExist();
+ assertStream(stream(x,p)).isNull();
}
}
@@ -143,9 +143,9 @@ public class FileFinder_Test {
String[] badPatterns =
{"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".","..","j.class","k.properties"};
for (String p : badPatterns) {
- assertStream(stream(x,p,null)).doesNotExist();
- assertStream(stream(x,p,JAPANESE)).doesNotExist();
- assertStream(stream(x,p,JAPAN)).doesNotExist();
+ assertStream(stream(x,p,null)).isNull();
+ assertStream(stream(x,p,JAPANESE)).isNull();
+ assertStream(stream(x,p,JAPAN)).isNull();
}
}
@@ -203,7 +203,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".","..","LocalizedFileStore_Test.class"};
for (String p : badPatterns) {
- assertStream(stream(x,p)).msg("pattern=[{0}]",
p).doesNotExist();
+ assertStream(stream(x,p)).msg("pattern=[{0}]",
p).isNull();
}
}
@@ -228,7 +228,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p)).doesNotExist();
+ assertStream(stream(x,p)).isNull();
}
}
@@ -272,9 +272,9 @@ public class FileFinder_Test {
String[] badPatterns =
{"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p,null)).doesNotExist();
- assertStream(stream(x,p,JAPANESE)).doesNotExist();
- assertStream(stream(x,p,JAPAN)).doesNotExist();
+ assertStream(stream(x,p,null)).isNull();
+ assertStream(stream(x,p,JAPANESE)).isNull();
+ assertStream(stream(x,p,JAPAN)).isNull();
}
}
@@ -335,7 +335,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p)).doesNotExist();
+ assertStream(stream(x,p)).isNull();
}
}
@@ -379,7 +379,7 @@ public class FileFinder_Test {
String[] badPatterns =
{"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p)).doesNotExist();
+ assertStream(stream(x,p)).isNull();
}
}
@@ -442,9 +442,9 @@ public class FileFinder_Test {
String[] badPatterns =
{"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
for (String p : badPatterns) {
- assertStream(stream(x,p,null)).doesNotExist();
- assertStream(stream(x,p,JAPANESE)).doesNotExist();
- assertStream(stream(x,p,JAPAN)).doesNotExist();
+ assertStream(stream(x,p,null)).isNull();
+ assertStream(stream(x,p,JAPANESE)).isNull();
+ assertStream(stream(x,p,JAPAN)).isNull();
}
}
@@ -558,17 +558,17 @@ public class FileFinder_Test {
.exclude("(?i).*\\.(txt)")
.build();
- assertStream(stream(x,"a.txt", null)).doesNotExist();
- assertStream(stream(x,"a.txt", JAPANESE)).doesNotExist();
- assertStream(stream(x,"a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"a.txt", null)).isNull();
+ assertStream(stream(x,"a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"a.txt", JAPAN)).isNull();
- assertStream(stream(x,"dir/a.txt", null)).doesNotExist();
- assertStream(stream(x,"dir/a.txt", JAPANESE)).doesNotExist();
- assertStream(stream(x,"dir/a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"dir/a.txt", null)).isNull();
+ assertStream(stream(x,"dir/a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"dir/a.txt", JAPAN)).isNull();
- assertStream(stream(x,"dir/dir/a.txt", null)).doesNotExist();
- assertStream(stream(x,"dir/dir/a.txt",
JAPANESE)).doesNotExist();
- assertStream(stream(x,"dir/dir/a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"dir/dir/a.txt", null)).isNull();
+ assertStream(stream(x,"dir/dir/a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"dir/dir/a.txt", JAPAN)).isNull();
x = FileFinder
.create()
@@ -576,17 +576,17 @@ public class FileFinder_Test {
.exclude("(?i).*\\.(TXT)")
.build();
- assertStream(stream(x,"a.txt", null)).doesNotExist();
- assertStream(stream(x,"a.txt", JAPANESE)).doesNotExist();
- assertStream(stream(x,"a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"a.txt", null)).isNull();
+ assertStream(stream(x,"a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"a.txt", JAPAN)).isNull();
- assertStream(stream(x,"dir/a.txt", null)).doesNotExist();
- assertStream(stream(x,"dir/a.txt", JAPANESE)).doesNotExist();
- assertStream(stream(x,"dir/a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"dir/a.txt", null)).isNull();
+ assertStream(stream(x,"dir/a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"dir/a.txt", JAPAN)).isNull();
- assertStream(stream(x,"dir/dir/a.txt", null)).doesNotExist();
- assertStream(stream(x,"dir/dir/a.txt",
JAPANESE)).doesNotExist();
- assertStream(stream(x,"dir/dir/a.txt", JAPAN)).doesNotExist();
+ assertStream(stream(x,"dir/dir/a.txt", null)).isNull();
+ assertStream(stream(x,"dir/dir/a.txt", JAPANESE)).isNull();
+ assertStream(stream(x,"dir/dir/a.txt", JAPAN)).isNull();
x = FileFinder
.create()
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index 6f741c7..1c92a78 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -110,8 +110,8 @@ public class BasicHttpResource_Test {
assertString(x.getContentEncoding().getValue()).is("identity");
x = stringResource("foo",
null).contentEncoding((String)null).build();
- assertObject(x.getContentType()).doesNotExist();
- assertObject(x.getContentEncoding()).doesNotExist();
+ assertObject(x.getContentType()).isNull();
+ assertObject(x.getContentEncoding()).isNull();
}
@Test
@@ -119,8 +119,8 @@ public class BasicHttpResource_Test {
HeaderList x =
stringResource("foo").header("Foo","bar").header("Foo","baz").header(null,"bar").header("foo",null).build().getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertOptional(x.getFirst("Bar")).doesNotExist();
- assertOptional(x.getLast("Bar")).doesNotExist();
+ assertOptional(x.getFirst("Bar")).isNull();
+ assertOptional(x.getLast("Bar")).isNull();
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo: baz']");
}
@@ -129,8 +129,8 @@ public class BasicHttpResource_Test {
HeaderList x =
stringResource("foo").header(null).header(header("Foo","bar")).header(header("Foo","baz")).header(header(null,"bar")).header(header("Bar",null)).header(null).build().getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).doesNotExist();
- assertObject(x.getLast("Bar").get().getValue()).doesNotExist();
+ assertObject(x.getFirst("Bar").get().getValue()).isNull();
+ assertObject(x.getLast("Bar").get().getValue()).isNull();
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','null: bar','Bar: null']");
}
@@ -139,8 +139,8 @@ public class BasicHttpResource_Test {
HeaderList x =
stringResource("foo").headers(AList.of(header("Foo","bar"),header("Foo","baz"),header(null,"bar"),header("Bar",null),null)).build().getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).doesNotExist();
- assertObject(x.getLast("Bar").get().getValue()).doesNotExist();
+ assertObject(x.getFirst("Bar").get().getValue()).isNull();
+ assertObject(x.getLast("Bar").get().getValue()).isNull();
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','null: bar','Bar: null']");
}
@@ -149,8 +149,8 @@ public class BasicHttpResource_Test {
HeaderList x =
stringResource("foo").headers(header("Foo","bar"),header("Foo","baz"),header(null,"bar"),header("Bar",null),null).build().getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertObject(x.getFirst("Bar").get().getValue()).doesNotExist();
- assertObject(x.getLast("Bar").get().getValue()).doesNotExist();
+ assertObject(x.getFirst("Bar").get().getValue()).isNull();
+ assertObject(x.getLast("Bar").get().getValue()).isNull();
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
@@ -176,7 +176,7 @@ public class BasicHttpResource_Test {
StringResource x1 =
stringResource("foo").contentType("text/plain").build();
assertString(x1.getContentType().getValue()).is("text/plain");
StringResource x2 =
stringResource("foo").contentType((String)null).build();
- assertObject(x2.getContentType()).doesNotExist();
+ assertObject(x2.getContentType()).isNull();
}
@Test
@@ -184,7 +184,7 @@ public class BasicHttpResource_Test {
StringResource x1 =
stringResource("foo").contentEncoding("identity").build();
assertString(x1.getContentEncoding().getValue()).is("identity");
StringResource x2 =
stringResource("foo").contentEncoding((String)null).build();
- assertObject(x2.getContentEncoding()).doesNotExist();
+ assertObject(x2.getContentEncoding()).isNull();
}
//------------------------------------------------------------------------------------------------------------------
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 57357b0..a9ad98a 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
@@ -67,8 +67,8 @@ public class EntityTag_Test {
assertBoolean(x7.isWeak()).isFalse();
assertBoolean(x7.isAny()).isFalse();
- assertObject(EntityTag.of(null)).doesNotExist();
-
assertObject(EntityTag.of((Supplier<?>)()->null)).doesNotExist();
+ assertObject(EntityTag.of(null)).isNull();
+ assertObject(EntityTag.of((Supplier<?>)()->null)).isNull();
assertThrown(()->new EntityTag("foo")).message().is("Invalid
value for entity-tag: [foo]");
assertThrown(()->new EntityTag("\"")).message().is("Invalid
value for entity-tag: [\"]");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
index 6ced509..f30765f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
@@ -59,9 +59,9 @@ public class MediaType_Test {
public void a03_getParameter() {
MediaType x1 = MediaType.of("text/json;x=1;q=1;y=2");
assertString(x1.getParameter("x")).is("1");
- assertString(x1.getParameter("q")).doesNotExist();
- assertString(x1.getParameter("y")).doesNotExist();
- assertString(x1.getParameter(null)).doesNotExist();
+ assertString(x1.getParameter("q")).isNull();
+ assertString(x1.getParameter("y")).isNull();
+ assertString(x1.getParameter(null)).isNull();
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
index 9f2b078..f7edea1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
@@ -49,8 +49,8 @@ public class StringRanges_Test {
assertString(of("foo").getRange(0)).isNotNull();
assertString(of(null).getRange(0)).isNull();
assertString(of("").getRange(0)).isNull();
- assertString(of(null).getRange(-1)).doesNotExist();
- assertString(of(null).getRange(1)).doesNotExist();
+ assertString(of(null).getRange(-1)).isNull();
+ assertString(of(null).getRange(1)).isNull();
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
index b41c9f7..8b5a304 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
@@ -91,7 +91,7 @@ public class BasicCsvArrayHeader_Test {
@Test
public void a03_assertList() throws Exception {
csvArrayHeader("Foo",
AList.of("bar")).assertList().contains("bar").assertList().doesNotContain("baz");
- new BasicCsvArrayHeader("Foo",
(String)null).assertList().doesNotExist();
+ new BasicCsvArrayHeader("Foo",
(String)null).assertList().isNull();
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
index 3d2a443..70d0ca2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
@@ -71,7 +71,7 @@ public class BasicUriHeader_Test {
@Test
public void a02_asUri() throws Exception {
assertString(uriHeader(HEADER,"http://foo";).asURI()).is("http://foo";);
- assertString(new
BasicUriHeader(HEADER,(URI)null).asURI()).doesNotExist();
+ assertString(new
BasicUriHeader(HEADER,(URI)null).asURI()).isNull();
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
index 1bc2a69..bc3bb8b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
@@ -75,10 +75,10 @@ public class HttpException_Test {
@Test
public void a02_getRootCause() throws Exception {
BasicHttpException x = new BasicHttpException(100, null);
- assertObject(x.getRootCause()).doesNotExist();
+ assertObject(x.getRootCause()).isNull();
x = new BasicHttpException(100, new
BasicHttpException(100,"foo"));
- assertObject(x.getRootCause()).doesNotExist();
+ assertObject(x.getRootCause()).isNull();
x = new BasicHttpException(100, new RuntimeException("foo"));
assertObject(x.getRootCause()).isType(RuntimeException.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
index be0f3fc..a5238f6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
@@ -131,12 +131,12 @@ public class MethodExecStore_Test {
MethodExecStore store =
MethodExecStore.create().thrownStore(s).build();
store.getStats(m).error(new Throwable());
assertList(s.getStats()).isSize(1);
- assertObject(store.getThrownStore()).isSameObjectAs(s);
+ assertObject(store.getThrownStore()).isSame(s);
ThrownStore s2 = ThrownStore.create().build();
BeanStore bs =
BeanStore.create().build().addBean(ThrownStore.class, s2);
store = MethodExecStore.create().beanStore(bs).build();
- assertObject(store.getThrownStore()).isSameObjectAs(s2);
+ assertObject(store.getThrownStore()).isSame(s2);
}
//------------------------------------------------------------------------------------------------------------------
@@ -169,7 +169,7 @@ public class MethodExecStore_Test {
MethodExecStats stats = store.getStats(m);
assertLong(stats.getGuid()).isNot(0l);
- assertObject(stats.getMethod()).isSameObjectAs(m);
+ assertObject(stats.getMethod()).isSame(m);
assertInteger(stats.getRuns()).is(0);
assertInteger(stats.getRunning()).is(0);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 7beb877..aab2dd8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -43,7 +43,7 @@ public class ThrownStore_Test {
assertInteger(db.add(t2).getCount()).is(1);
assertLong(db.getStats(t1).get().getHash()).isEqual(db.getStats(t1).get().getHash());
-
assertLong(db.getStats(t1).get().getHash()).doesNotEqual(db.getStats(t2).get().getHash());
+
assertLong(db.getStats(t1).get().getHash()).isNotEqual(db.getStats(t2).get().getHash());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
index 3d7acbf..c33677d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
@@ -194,25 +194,25 @@ public class Header_AcceptEncoding_Test {
c.get("/a")
.acceptEncoding("mycoding")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertHeader("Content-Type").is("text/direct")
.assertBody().is("foo");
c.get("/a")
.acceptEncoding("*")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertHeader("Content-Type").is("text/direct")
.assertBody().is("foo");
c.get("/b")
.acceptEncoding("mycoding")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertBody().is("foo");
c.get("/b")
.acceptEncoding("*")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertBody().is("foo");
byte[] body;
@@ -232,12 +232,12 @@ public class Header_AcceptEncoding_Test {
c.get("/d")
.acceptEncoding("mycoding")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertBody().is("foo");
c.get("/d")
.acceptEncoding("*")
.run()
- .assertHeader("Content-Encoding").doesNotExist() //
Should not be set
+ .assertHeader("Content-Encoding").isNull() // Should
not be set
.assertBody().is("foo");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
index 39370eb..fd10e24 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
@@ -38,7 +38,7 @@ public class Rest_Debug_Test {
}
private static void assertNotLogged() {
- LOGGER.assertMessageAndReset().doesNotExist();
+ LOGGER.assertMessageAndReset().isNull();
}
private static void assertLogged(String msg) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index bd06e82..93a5290 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -53,9 +53,9 @@ public class RestClient_Body_Test {
HttpResource x1 = stringResource("foo").build();
client().build().post("/", x1).run()
.assertHeader("X-Content-Length").asInteger().is(3)
- .assertHeader("X-Content-Encoding").doesNotExist()
- .assertHeader("X-Content-Type").doesNotExist()
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Content-Encoding").isNull()
+ .assertHeader("X-Content-Type").isNull()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpResource x2 =
stringResource("foo").contentType("text/plain").contentEncoding("identity").build();
@@ -63,12 +63,12 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Length").asInteger().is(3)
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpResource x3 =
stringResource("foo").contentType(contentType("text/plain")).contentEncoding(contentEncoding("identity")).chunked().build();
client().build().post("/",x3).run()
- .assertHeader("X-Content-Length").doesNotExist() //
Missing when chunked.
+ .assertHeader("X-Content-Length").isNull() // Missing
when chunked.
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
.assertHeader("X-Transfer-Encoding").is("chunked")
@@ -79,7 +79,7 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Length").asInteger().is(3)
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpResource x5 =
stringResource("foo").header("Foo","bar").header(header("Baz","qux")).build();
@@ -110,9 +110,9 @@ public class RestClient_Body_Test {
HttpEntity x1 = stringEntity("foo").build();
client().build().post("/", x1).run()
.assertHeader("X-Content-Length").asInteger().is(3)
- .assertHeader("X-Content-Encoding").doesNotExist()
- .assertHeader("X-Content-Type").doesNotExist()
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Content-Encoding").isNull()
+ .assertHeader("X-Content-Type").isNull()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpEntity x2 =
stringEntity("foo").contentType("text/plain").contentEncoding("identity").build();
@@ -120,12 +120,12 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Length").asInteger().is(3)
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpEntity x3 =
stringEntity("foo").contentType(contentType("text/plain")).contentEncoding(contentEncoding("identity")).chunked().build();
client().build().post("/",x3).run()
- .assertHeader("X-Content-Length").doesNotExist() //
Missing when chunked.
+ .assertHeader("X-Content-Length").isNull() // Missing
when chunked.
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
.assertHeader("X-Transfer-Encoding").is("chunked")
@@ -136,7 +136,7 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Length").asInteger().is(3)
.assertHeader("X-Content-Encoding").is("identity")
.assertHeader("X-Content-Type").is("text/plain")
- .assertHeader("X-Transfer-Encoding").doesNotExist()
+ .assertHeader("X-Transfer-Encoding").isNull()
;
HttpEntity x7 = readerEntity(new StringReader("foo")).build();
@@ -160,23 +160,23 @@ public class RestClient_Body_Test {
SerializedEntity x1 =
serializedEntity(ABean.get(),null,null).build();
client().build().post("/",x1).run()
- .assertHeader("X-Content-Length").doesNotExist()
- .assertHeader("X-Content-Encoding").doesNotExist()
+ .assertHeader("X-Content-Length").isNull()
+ .assertHeader("X-Content-Encoding").isNull()
.assertHeader("X-Content-Type").is("application/json+simple")
.assertHeader("X-Transfer-Encoding").is("chunked") //
Because content length is -1.
;
SerializedEntity x2 =
serializedEntity(ABean.get(),js,null).build();
client().build().post("/",x2).run()
- .assertHeader("X-Content-Length").doesNotExist()
- .assertHeader("X-Content-Encoding").doesNotExist()
+ .assertHeader("X-Content-Length").isNull()
+ .assertHeader("X-Content-Encoding").isNull()
.assertHeader("X-Content-Type").is("application/json")
.assertBody().asObject(ABean.class).asJson().is("{a:1,b:'foo'}");
SerializedEntity x3 =
serializedEntity(()->ABean.get(),js,null).build();
client().build().post("/",x3).run()
- .assertHeader("X-Content-Length").doesNotExist()
- .assertHeader("X-Content-Encoding").doesNotExist()
+ .assertHeader("X-Content-Length").isNull()
+ .assertHeader("X-Content-Encoding").isNull()
.assertHeader("X-Content-Type").is("application/json")
.assertBody().asObject(ABean.class).asJson().is("{a:1,b:'foo'}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index ac024ec..4e33d3b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -165,13 +165,13 @@ public class RestClient_Response_Headers_Test {
@Test
public void b01_assertions() throws Exception {
checkFooClient().build().get("/echo").header("Foo","bar").run().getHeader("Foo").assertValue().is("bar");
-
checkFooClient().build().get("/echo").header("Foo","bar").run().getHeader("Bar").assertValue().doesNotExist();
+
checkFooClient().build().get("/echo").header("Foo","bar").run().getHeader("Bar").assertValue().isNull();
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asInteger().is(123);
-
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().doesNotExist();
+
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().isNull();
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").assertValue().asLong().is(123l);
-
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().asLong().doesNotExist();
+
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Bar").assertValue().asLong().isNull();
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Foo").assertValue().asZonedDateTime().exists();
-
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Bar").assertValue().asZonedDateTime().doesNotExist();
+
checkFooClient().build().get("/echo").header(dateHeader("Foo",ZONEDDATETIME)).run().getHeader("Bar").assertValue().asZonedDateTime().isNull();
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
index f8b2a71..8bebf80 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/mock/PathResolverTest.java
@@ -239,7 +239,7 @@ public class PathResolverTest {
.assertPathInfo().is("/foo/bar");
create(null, "/foo", null, "http://foobar/foo/bar";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -247,7 +247,7 @@ public class PathResolverTest {
.assertPathInfo().is("/bar");
create(null, "/", "/foo", "http://foobar/foo/bar";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("")
@@ -255,7 +255,7 @@ public class PathResolverTest {
.assertPathInfo().is("/bar");
create(null, "/foo", "/bar", "http://foobar/foo/bar";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -263,7 +263,7 @@ public class PathResolverTest {
.assertPathInfo().is("");
create(null, "/foo", "/bar", "http://foobar/foo/bar/baz";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -271,7 +271,7 @@ public class PathResolverTest {
.assertPathInfo().is("/baz");
create(null, "/foo/bar", "/baz", "http://foobar/foo/bar/baz";,
vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo/bar")
@@ -279,7 +279,7 @@ public class PathResolverTest {
.assertPathInfo().is("");
create(null, "/foo", "/bar/baz", "http://foobar/foo/bar/baz";,
vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -287,7 +287,7 @@ public class PathResolverTest {
.assertPathInfo().is("");
create(null, "/foo", "/bar/baz",
"http://foobar/foo/bar/baz/qux";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz/qux";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -295,7 +295,7 @@ public class PathResolverTest {
.assertPathInfo().is("/qux");
create(null, "/foo", "/bar/baz",
"http://foobar/foo/bar/baz/qux/quux";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz/qux/quux";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
@@ -303,21 +303,21 @@ public class PathResolverTest {
.assertPathInfo().is("/qux/quux");
create(null, "/foo", "/bar/{x}",
"http://foobar/foo/bar/baz/qux/quux";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz/qux/quux";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
.assertServletPath().is("/bar/baz")
.assertPathInfo().is("/qux/quux");
create(null, "/{x}", "/{x}/{x}",
"http://foobar/foo/bar/baz/qux/quux";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz/qux/quux";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
.assertServletPath().is("/bar/baz")
.assertPathInfo().is("/qux/quux");
create(null, "/{bar}", "/{bar}/{bar}",
"http://foobar/foo/bar/baz/qux/quux";, vars)
- .assertError().doesNotExist()
+ .assertError().isNull()
.assertUri().is("http://foobar/foo/bar/baz/qux/quux";)
.assertTarget().is("http://foobar";)
.assertContextPath().is("/foo")
