You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2021/02/23 15:09:34 UTC
[juneau] branch master updated: Assertions should display to stderr
by default.
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 afde3b9 Assertions should display to stderr by default.
afde3b9 is described below
commit afde3b9fafa5f8c97ad23c6e8ed67e74303b4fc8
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Tue Feb 23 10:09:19 2021 -0500
Assertions should display to stderr by default.
---
TODO.txt | 2 +-
.../apache/juneau/assertions/ArrayAssertion.java | 12 ++++++--
.../org/apache/juneau/assertions/Assertion.java | 33 ++++++++++++++--------
.../apache/juneau/assertions/BeanAssertion.java | 12 ++++++--
.../apache/juneau/assertions/BooleanAssertion.java | 12 ++++++--
.../juneau/assertions/ByteArrayAssertion.java | 12 ++++++--
.../juneau/assertions/CollectionAssertion.java | 11 ++++++--
.../juneau/assertions/ComparableAssertion.java | 12 ++++++--
.../apache/juneau/assertions/DateAssertion.java | 11 ++++++--
.../juneau/assertions/FluentArrayAssertion.java | 11 ++++++--
.../apache/juneau/assertions/FluentAssertion.java | 12 ++++++--
.../juneau/assertions/FluentBaseAssertion.java | 11 ++++++--
.../juneau/assertions/FluentBeanAssertion.java | 12 ++++++--
.../juneau/assertions/FluentBooleanAssertion.java | 12 ++++++--
.../assertions/FluentByteArrayAssertion.java | 11 ++++++--
.../assertions/FluentCollectionAssertion.java | 11 ++++++--
.../assertions/FluentComparableAssertion.java | 12 ++++++--
.../juneau/assertions/FluentDateAssertion.java | 11 ++++++--
.../juneau/assertions/FluentIntegerAssertion.java | 12 ++++++--
.../juneau/assertions/FluentListAssertion.java | 11 ++++++--
.../juneau/assertions/FluentLongAssertion.java | 12 ++++++--
.../juneau/assertions/FluentMapAssertion.java | 11 ++++++--
.../juneau/assertions/FluentObjectAssertion.java | 11 ++++++--
.../juneau/assertions/FluentStringAssertion.java | 11 ++++++--
.../assertions/FluentThrowableAssertion.java | 12 ++++++--
.../assertions/FluentZonedDateTimeAssertion.java | 11 ++++++--
.../apache/juneau/assertions/IntegerAssertion.java | 12 ++++++--
.../apache/juneau/assertions/ListAssertion.java | 11 ++++++--
.../apache/juneau/assertions/LongAssertion.java | 12 ++++++--
.../org/apache/juneau/assertions/MapAssertion.java | 11 ++++++--
.../apache/juneau/assertions/ObjectAssertion.java | 12 ++++++--
.../apache/juneau/assertions/StringAssertion.java | 12 ++++++--
.../juneau/assertions/ThrowableAssertion.java | 12 ++++++--
.../juneau/assertions/ZonedDateTimeAssertion.java | 11 ++++++--
.../assertion/FluentResponseBodyAssertion.java | 11 ++++++--
.../assertion/FluentResponseHeaderAssertion.java | 12 ++++++--
.../assertions/FluentProtocolVersionAssertion.java | 12 ++++++--
.../assertions/FluentRequestBodyAssertion.java | 10 +++++--
.../FluentRequestFormParamAssertion.java | 12 ++++++--
.../assertions/FluentRequestHeaderAssertion.java | 12 ++++++--
.../assertions/FluentRequestLineAssertion.java | 12 ++++++--
.../FluentRequestQueryParamAssertion.java | 12 ++++++--
.../java/org/apache/juneau/PojoExamplesTest.java | 2 +-
.../juneau/assertions/ArrayAssertion_Test.java | 2 +-
.../apache/juneau/assertions/Assertions_Test.java | 4 +--
.../juneau/assertions/BeanAssertion_Test.java | 2 +-
.../juneau/assertions/BooleanAssertion_Test.java | 2 +-
.../juneau/assertions/ByteArrayAssertion_Test.java | 2 +-
.../assertions/CollectionAssertion_Test.java | 2 +-
.../assertions/ComparableAssertion_Test.java | 2 +-
.../juneau/assertions/DateAssertion_Test.java | 2 +-
.../juneau/assertions/IntegerAssertion_Test.java | 2 +-
.../juneau/assertions/ListAssertion_Test.java | 2 +-
.../juneau/assertions/LongAssertion_Test.java | 2 +-
.../juneau/assertions/MapAssertion_Test.java | 6 ++--
.../juneau/assertions/ObjectAssertion_Test.java | 18 ++++++------
.../juneau/assertions/StringAssertion_Test.java | 28 +++++++++---------
.../juneau/assertions/ThrowableAssertion_Test.java | 2 +-
.../assertions/ZonedDateTimeAssertion_Test.java | 2 +-
.../java/org/apache/juneau/cp/BeanStore_Test.java | 24 ++++++++--------
.../apache/juneau/http/HeaderSupplier_Test.java | 2 +-
.../juneau/http/NameValuePairSupplier_Test.java | 2 +-
.../apache/juneau/http/header/RetryAfter_Test.java | 2 +-
.../org/apache/juneau/mstat/ThrownStore_Test.java | 8 +++---
.../rest/annotation/RestAnnotation_Test.java | 2 +-
.../juneau/rest/annotation/Rest_Messages_Test.java | 4 +--
.../rest/client/RestClient_Logging_Test.java | 4 +--
67 files changed, 469 insertions(+), 158 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index 6dd1bce..a07a6b4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,4 +13,4 @@ HttpException subclasses can set status, but does it use code?
HttpException should use list of Headers and have a headers(Header...) method.
JsonSchema should have fluent getters and setters.
-Assertions should display to stderr by default.
+
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index f3e1085..4e67a8e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -59,8 +61,14 @@ public class ArrayAssertion extends FluentArrayAssertion<ArrayAssertion> {
}
@Override /* GENERATED - Assertion */
- public ArrayAssertion stderr() {
- super.stderr();
+ public ArrayAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ArrayAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
index f05aeb1..1bb24d0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -14,6 +14,8 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.StringUtils.*;
+import java.io.*;
+
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
@@ -26,7 +28,7 @@ public class Assertion {
String msg;
Object[] msgArgs;
- boolean stdout, stderr;
+ PrintStream out = System.err;
Class<? extends RuntimeException> throwable;
/**
@@ -37,8 +39,7 @@ public class Assertion {
if (creator != null) {
this.msg = creator.msg;
this.msgArgs = creator.msgArgs;
- this.stdout = creator.stdout;
- this.stderr = creator.stderr;
+ this.out = creator.out;
this.throwable = creator.throwable;
}
}
@@ -67,22 +68,32 @@ public class Assertion {
*/
@FluentSetter
public Assertion stdout() {
- this.stdout = true;
- return this;
+ return out(System.out);
}
/**
- * If an error occurs, send the error message to STDERR.
+ * If an error occurs, send the error message to the specified stream.
*
+ * @param value The output stream. Can be <jk>null</jk>.
* @return This object (for method chaining).
*/
@FluentSetter
- public Assertion stderr() {
- this.stderr = true;
+ public Assertion out(PrintStream value) {
+ this.out = value;
return this;
}
/**
+ * Suppresses output.
+ *
+ * @return This object (for method chaining).
+ */
+ @FluentSetter
+ public Assertion silent() {
+ return out(null);
+ }
+
+ /**
* If an error occurs, throw this exception when {@link #error(String, Object...)} is called.
*
* @param value The new value for this setting.
@@ -117,10 +128,8 @@ public class Assertion {
msg = format(msg, args);
if (this.msg != null)
msg = format(this.msg, this.msgArgs).replace("<<<MSG>>>", msg).replace("<<<CAUSED-BY>>>", cause == null ? "" : "Caused by: " + cause.getMessage());
- if (stdout)
- System.out.println(msg); // NOT DEBUG
- if (stderr)
- System.err.println(msg); // NOT DEBUG
+ if (out != null)
+ out.println(msg);
if (throwable != null) {
try {
throw BeanStore.create().build().addBean(Throwable.class, cause).addBean(String.class, msg).addBean(Object[].class, new Object[0]).createBean(throwable);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index 16906af..e9a23fd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -61,8 +63,14 @@ public class BeanAssertion<V> extends FluentBeanAssertion<Object,BeanAssertion<V
}
@Override /* GENERATED - Assertion */
- public BeanAssertion<V> stderr() {
- super.stderr();
+ public BeanAssertion<V> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public BeanAssertion<V> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index 3f18d8e..ef7aff1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -53,8 +55,14 @@ public class BooleanAssertion extends FluentBooleanAssertion<BooleanAssertion> {
}
@Override /* GENERATED - Assertion */
- public BooleanAssertion stderr() {
- super.stderr();
+ public BooleanAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public BooleanAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index a4edb9d..37b8c74 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -59,8 +61,14 @@ public class ByteArrayAssertion extends FluentByteArrayAssertion<ByteArrayAssert
}
@Override /* GENERATED - Assertion */
- public ByteArrayAssertion stderr() {
- super.stderr();
+ public ByteArrayAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ByteArrayAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index c38db1b..6f36b77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -62,8 +63,14 @@ public class CollectionAssertion extends FluentCollectionAssertion<CollectionAss
}
@Override /* GENERATED - Assertion */
- public CollectionAssertion stderr() {
- super.stderr();
+ public CollectionAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public CollectionAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 5820f55..e0f93ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -54,8 +56,14 @@ public class ComparableAssertion extends FluentComparableAssertion<Comparable,Co
}
@Override /* GENERATED - Assertion */
- public ComparableAssertion stderr() {
- super.stderr();
+ public ComparableAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ComparableAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index f18a94e..5da9f76 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -61,8 +62,14 @@ public class DateAssertion extends FluentDateAssertion<DateAssertion> {
}
@Override /* GENERATED - Assertion */
- public DateAssertion stderr() {
- super.stderr();
+ public DateAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public DateAssertion silent() {
+ super.silent();
return this;
}
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 bfe2d4d..70d73e4 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
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.ObjectUtils.*;
+import java.io.*;
import java.lang.reflect.*;
import org.apache.juneau.*;
@@ -171,8 +172,14 @@ public class FluentArrayAssertion<R> extends FluentBaseAssertion<Object,R> {
}
@Override /* GENERATED - Assertion */
- public FluentArrayAssertion<R> stderr() {
- super.stderr();
+ public FluentArrayAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentArrayAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index eca42e6..9f76314 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -53,8 +55,14 @@ public abstract class FluentAssertion<R> extends Assertion {
}
@Override /* GENERATED - Assertion */
- public FluentAssertion<R> stderr() {
- super.stderr();
+ public FluentAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
index ca7c8ab..163c36d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBaseAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.function.*;
import org.apache.juneau.internal.*;
@@ -421,8 +422,14 @@ public class FluentBaseAssertion<V,R> extends FluentAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentBaseAssertion<V,R> stderr() {
- super.stderr();
+ public FluentBaseAssertion<V,R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentBaseAssertion<V,R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index fcbc1a5..5742d91 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.*;
import org.apache.juneau.internal.*;
@@ -105,8 +107,14 @@ public class FluentBeanAssertion<V,R> extends FluentBaseAssertion<Object,R> {
}
@Override /* GENERATED - Assertion */
- public FluentBeanAssertion<V,R> stderr() {
- super.stderr();
+ public FluentBeanAssertion<V,R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentBeanAssertion<V,R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index 2727821..4d8a63e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -13,6 +13,8 @@
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -82,8 +84,14 @@ public class FluentBooleanAssertion<R> extends FluentComparableAssertion<Boolean
}
@Override /* GENERATED - Assertion */
- public FluentBooleanAssertion<R> stderr() {
- super.stderr();
+ public FluentBooleanAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentBooleanAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 76ecd0b..9d950c1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.StringUtils.*;
+import java.io.*;
import java.nio.charset.*;
import org.apache.juneau.internal.*;
@@ -136,8 +137,14 @@ public class FluentByteArrayAssertion<R> extends FluentArrayAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentByteArrayAssertion<R> stderr() {
- super.stderr();
+ public FluentByteArrayAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentByteArrayAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 66d956a..ed1a894 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.ObjectUtils.*;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -131,8 +132,14 @@ public class FluentCollectionAssertion<R> extends FluentBaseAssertion<Collection
}
@Override /* GENERATED - Assertion */
- public FluentCollectionAssertion<R> stderr() {
- super.stderr();
+ public FluentCollectionAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentCollectionAssertion<R> silent() {
+ super.silent();
return this;
}
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 05df64e..cacf9d9 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
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -201,8 +203,14 @@ public class FluentComparableAssertion<V extends Comparable,R> extends FluentBas
}
@Override /* GENERATED - Assertion */
- public FluentComparableAssertion<V,R> stderr() {
- super.stderr();
+ public FluentComparableAssertion<V,R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentComparableAssertion<V,R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index b4845df..fd33f0f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.ObjectUtils.*;
+import java.io.*;
import java.time.temporal.*;
import java.util.*;
@@ -150,8 +151,14 @@ public class FluentDateAssertion<R> extends FluentComparableAssertion<Date,R> {
}
@Override /* GENERATED - Assertion */
- public FluentDateAssertion<R> stderr() {
- super.stderr();
+ public FluentDateAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentDateAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index 8e67d0e..220ba7e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -13,6 +13,8 @@
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -77,8 +79,14 @@ public class FluentIntegerAssertion<R> extends FluentComparableAssertion<Integer
}
@Override /* GENERATED - Assertion */
- public FluentIntegerAssertion<R> stderr() {
- super.stderr();
+ public FluentIntegerAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentIntegerAssertion<R> silent() {
+ super.silent();
return this;
}
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 eb708e9..d852b39 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
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -96,8 +97,14 @@ public class FluentListAssertion<R> extends FluentCollectionAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentListAssertion<R> stderr() {
- super.stderr();
+ public FluentListAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentListAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 0d35af6..b7940f4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -13,6 +13,8 @@
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -86,8 +88,14 @@ public class FluentLongAssertion<R> extends FluentComparableAssertion<Long,R> {
}
@Override /* GENERATED - Assertion */
- public FluentLongAssertion<R> stderr() {
- super.stderr();
+ public FluentLongAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentLongAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 56e1ecf..da7d053 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -165,8 +166,14 @@ public class FluentMapAssertion<R> extends FluentBaseAssertion<Map,R> {
}
@Override /* GENERATED - Assertion */
- public FluentMapAssertion<R> stderr() {
- super.stderr();
+ public FluentMapAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentMapAssertion<R> silent() {
+ super.silent();
return this;
}
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 250655b..8fa6e2b 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
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.time.*;
import java.util.*;
@@ -178,8 +179,14 @@ public class FluentObjectAssertion<V,R> extends FluentBaseAssertion<V,R> {
}
@Override /* GENERATED - Assertion */
- public FluentObjectAssertion<V,R> stderr() {
- super.stderr();
+ public FluentObjectAssertion<V,R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentObjectAssertion<V,R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 4b3ca1c..a27b7e9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.StringUtils.*;
+import java.io.*;
import java.util.*;
import java.util.function.*;
import java.util.regex.*;
@@ -531,8 +532,14 @@ public class FluentStringAssertion<R> extends FluentBaseAssertion<String,R> {
}
@Override /* GENERATED - Assertion */
- public FluentStringAssertion<R> stderr() {
- super.stderr();
+ public FluentStringAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentStringAssertion<R> silent() {
+ super.silent();
return this;
}
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 866acb1..6eae78a 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
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -263,8 +265,14 @@ public class FluentThrowableAssertion<V extends Throwable,R> extends FluentBaseA
}
@Override /* GENERATED - Assertion */
- public FluentThrowableAssertion<V,R> stderr() {
- super.stderr();
+ public FluentThrowableAssertion<V,R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentThrowableAssertion<V,R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index 41ed346..765e098 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -14,6 +14,7 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.ObjectUtils.*;
+import java.io.*;
import java.time.*;
import java.time.temporal.*;
@@ -150,8 +151,14 @@ public class FluentZonedDateTimeAssertion<R> extends FluentComparableAssertion<Z
}
@Override /* GENERATED - Assertion */
- public FluentZonedDateTimeAssertion<R> stderr() {
- super.stderr();
+ public FluentZonedDateTimeAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentZonedDateTimeAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index 0aa1c7b..85fa84e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -59,8 +61,14 @@ public class IntegerAssertion extends FluentIntegerAssertion<IntegerAssertion> {
}
@Override /* GENERATED - Assertion */
- public IntegerAssertion stderr() {
- super.stderr();
+ public IntegerAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public IntegerAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index c6a179b..308c7ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -62,8 +63,14 @@ public class ListAssertion extends FluentListAssertion<ListAssertion> {
}
@Override /* GENERATED - Assertion */
- public ListAssertion stderr() {
- super.stderr();
+ public ListAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ListAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index f12d25c..e7ac213 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -59,8 +61,14 @@ public class LongAssertion extends FluentLongAssertion<LongAssertion> {
}
@Override /* GENERATED - Assertion */
- public LongAssertion stderr() {
- super.stderr();
+ public LongAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public LongAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index be8eef9..9b86734 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.util.*;
import org.apache.juneau.internal.*;
@@ -62,8 +63,14 @@ public class MapAssertion extends FluentMapAssertion<MapAssertion> {
}
@Override /* GENERATED - Assertion */
- public MapAssertion stderr() {
- super.stderr();
+ public MapAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public MapAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index 7c3cb68..5f6da25 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -61,8 +63,14 @@ public class ObjectAssertion<V> extends FluentObjectAssertion<V,ObjectAssertion<
}
@Override /* GENERATED - Assertion */
- public ObjectAssertion<V> stderr() {
- super.stderr();
+ public ObjectAssertion<V> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ObjectAssertion<V> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 81941e2..26484fa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -14,6 +14,8 @@ package org.apache.juneau.assertions;
import static org.apache.juneau.internal.StringUtils.*;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -61,8 +63,14 @@ public class StringAssertion extends FluentStringAssertion<StringAssertion> {
}
@Override /* GENERATED - Assertion */
- public StringAssertion stderr() {
- super.stderr();
+ public StringAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public StringAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index 09d0d8f..fae7ab1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
+
import org.apache.juneau.internal.*;
/**
@@ -61,8 +63,14 @@ public class ThrowableAssertion<V extends Throwable> extends FluentThrowableAsse
}
@Override /* GENERATED - Assertion */
- public ThrowableAssertion<V> stderr() {
- super.stderr();
+ public ThrowableAssertion<V> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ThrowableAssertion<V> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index 9a41a08..779a67a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
+import java.io.*;
import java.time.*;
import org.apache.juneau.internal.*;
@@ -61,8 +62,14 @@ public class ZonedDateTimeAssertion extends FluentZonedDateTimeAssertion<ZonedDa
}
@Override /* GENERATED - Assertion */
- public ZonedDateTimeAssertion stderr() {
- super.stderr();
+ public ZonedDateTimeAssertion out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public ZonedDateTimeAssertion silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
index c6138d4..b1ec0dc 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.client.assertion;
+import java.io.*;
import java.util.function.*;
import org.apache.juneau.assertions.*;
@@ -281,8 +282,14 @@ public class FluentResponseBodyAssertion<R> extends FluentAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentResponseBodyAssertion<R> stderr() {
- super.stderr();
+ public FluentResponseBodyAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentResponseBodyAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
index 22108ec..66467dc 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.client.assertion;
+import java.io.*;
+
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.internal.*;
@@ -130,8 +132,14 @@ public class FluentResponseHeaderAssertion<R> extends FluentBaseAssertion<String
}
@Override /* GENERATED - Assertion */
- public FluentResponseHeaderAssertion<R> stderr() {
- super.stderr();
+ public FluentResponseHeaderAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentResponseHeaderAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
index 8686b1e..0716ac4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.assertions;
+import java.io.*;
+
import org.apache.http.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
@@ -75,8 +77,14 @@ public class FluentProtocolVersionAssertion<R> extends FluentAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentProtocolVersionAssertion<R> stderr() {
- super.stderr();
+ public FluentProtocolVersionAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentProtocolVersionAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
index 642b31f..57bab7e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
@@ -241,8 +241,14 @@ public class FluentRequestBodyAssertion<R> extends FluentAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentRequestBodyAssertion<R> stderr() {
- super.stderr();
+ public FluentRequestBodyAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentRequestBodyAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
index 0b96bd7..ac032b0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.assertions;
+import java.io.*;
+
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.internal.*;
@@ -109,8 +111,14 @@ public class FluentRequestFormParamAssertion<R> extends FluentBaseAssertion<Stri
}
@Override /* GENERATED - Assertion */
- public FluentRequestFormParamAssertion<R> stderr() {
- super.stderr();
+ public FluentRequestFormParamAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentRequestFormParamAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
index 2fc14e4..356a3b1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.assertions;
+import java.io.*;
+
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.internal.*;
@@ -109,8 +111,14 @@ public class FluentRequestHeaderAssertion<R> extends FluentBaseAssertion<String,
}
@Override /* GENERATED - Assertion */
- public FluentRequestHeaderAssertion<R> stderr() {
- super.stderr();
+ public FluentRequestHeaderAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentRequestHeaderAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
index 7e7a987..0ac36d2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.assertions;
+import java.io.*;
+
import org.apache.http.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
@@ -75,8 +77,14 @@ public class FluentRequestLineAssertion<R> extends FluentAssertion<R> {
}
@Override /* GENERATED - Assertion */
- public FluentRequestLineAssertion<R> stderr() {
- super.stderr();
+ public FluentRequestLineAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentRequestLineAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
index 2b680bc..9b7c2dd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
@@ -12,6 +12,8 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.assertions;
+import java.io.*;
+
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.internal.*;
@@ -109,8 +111,14 @@ public class FluentRequestQueryParamAssertion<R> extends FluentBaseAssertion<Str
}
@Override /* GENERATED - Assertion */
- public FluentRequestQueryParamAssertion<R> stderr() {
- super.stderr();
+ public FluentRequestQueryParamAssertion<R> out(PrintStream value) {
+ super.out(value);
+ return this;
+ }
+
+ @Override /* GENERATED - Assertion */
+ public FluentRequestQueryParamAssertion<R> silent() {
+ super.silent();
return this;
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java b/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
index a81b2b4..79bf37b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/PojoExamplesTest.java
@@ -321,7 +321,7 @@ public class PojoExamplesTest {
@Test
public void testInvalidUsesOfExample() throws Exception {
BeanSession bs = BeanContext.create().build().createSession();
- assertThrown(()->bs.getClassMeta(F1.class)).stderr().contains("invalid method 'example(String)'");
+ assertThrown(()->bs.getClassMeta(F1.class)).contains("invalid method 'example(String)'");
assertThrown(()->bs.getClassMeta(F2.class)).contains("invalid method 'example()'");
assertThrown(()->bs.getClassMeta(F3.class)).contains("invalid field","$F3.F3");
assertThrown(()->bs.getClassMeta(F4.class)).contains("invalid field ","$F4.f4");
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 db3a552..db94217 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
@@ -59,6 +59,6 @@ public class ArrayAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ArrayAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ArrayAssertion.create(null).stdout().stderr();
+ ArrayAssertion.create(null).stdout().silent();
}
}
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 c506049..f705e8c 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
@@ -78,7 +78,7 @@ public class Assertions_Test {
@Test
public void a02_stdout_stderr() throws Exception {
- assertThrown(()->assertObject(null).msg("Test message").stderr().stdout().exists()).exists();
- assertObject(assertObject("foo").stderr().stdout().error("test {0}", "message").getMessage()).is("test message");
+ assertThrown(()->assertObject(null).msg("Test message").stdout().exists()).exists();
+ assertObject(assertObject("foo").silent().error("test {0}", "message").getMessage()).is("test message");
}
}
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 d2ef0e9..f521aa7 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
@@ -45,6 +45,6 @@ public class BeanAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->BeanAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- BeanAssertion.create(null).stdout().stderr();
+ BeanAssertion.create(null).stdout().silent();
}
}
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 d6593a7..a4a884e 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
@@ -51,6 +51,6 @@ public class BooleanAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->BooleanAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- BooleanAssertion.create(null).stdout().stderr();
+ BooleanAssertion.create(null).stdout().silent();
}
}
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 87444f5..bfd1d03 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
@@ -79,6 +79,6 @@ public class ByteArrayAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ByteArrayAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ByteArrayAssertion.create(null).stdout().stderr();
+ ByteArrayAssertion.create(null).stdout().silent();
}
}
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 8edb22b..68fbecd 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
@@ -57,6 +57,6 @@ public class CollectionAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->CollectionAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- CollectionAssertion.create(null).stdout().stderr();
+ CollectionAssertion.create(null).stdout().silent();
}
}
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 a6fb5f3..a5413e4 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
@@ -29,6 +29,6 @@ public class ComparableAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ComparableAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ComparableAssertion.create(null).stdout().stderr();
+ ComparableAssertion.create(null).stdout().silent();
}
}
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 4ea5f8c..ad96d6c 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
@@ -76,6 +76,6 @@ public class DateAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->DateAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- DateAssertion.create(null).stdout().stderr();
+ DateAssertion.create(null).stdout().silent();
}
}
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 35cb114..ce52acf 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
@@ -103,6 +103,6 @@ public class IntegerAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->IntegerAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- IntegerAssertion.create(null).stdout().stderr();
+ IntegerAssertion.create(null).stdout().silent();
}
}
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 502d09b..de6062f 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
@@ -55,6 +55,6 @@ public class ListAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ListAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ListAssertion.create(null).stdout().stderr();
+ ListAssertion.create(null).stdout().silent();
}
}
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 3d11fce..d4b9b19 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
@@ -105,6 +105,6 @@ public class LongAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->LongAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- LongAssertion.create(null).stdout().stderr();
+ LongAssertion.create(null).stdout().silent();
}
}
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 b151755..f83e898 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
@@ -52,8 +52,8 @@ public class MapAssertion_Test {
assertMap((Map<?,?>)null).value("a").asInteger().isNull();
assertMap(x2).containsKey("a");
- assertThrown(()->assertMap(x2).containsKey("x")).stderr().is("Map did not contain expected key.\n\tContents: {a:1,b:2}\n\tExpected key: x");
- assertThrown(()->assertMap((Map<?,?>)null).containsKey("x")).stderr().is("Value was null.");
+ assertThrown(()->assertMap(x2).containsKey("x")).is("Map did not contain expected key.\n\tContents: {a:1,b:2}\n\tExpected key: x");
+ assertThrown(()->assertMap((Map<?,?>)null).containsKey("x")).is("Value was null.");
assertMap(x2).doesNotContainKey("x");
assertThrown(()->assertMap(x2).doesNotContainKey("a")).is("Map contained unexpected key.\n\tContents: {a:1,b:2}\n\tUnexpected key: a");
@@ -63,6 +63,6 @@ public class MapAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->MapAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- MapAssertion.create(null).stdout().stderr();
+ MapAssertion.create(null).stdout().silent();
}
}
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 ab3696b..65712c7 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
@@ -67,17 +67,17 @@ public class ObjectAssertion_Test {
int[] x1 = {1,2}, x2 = {2,1};
assertObject(x2).asJsonSorted().is("[1,2]");
- assertThrown(()->assertObject(x2).asJsonSorted().is("[2,1]")).stderr().is("Unexpected value.\n\tExpect=[[2,1]]\n\tActual=[[1,2]]");
+ assertThrown(()->assertObject(x2).asJsonSorted().is("[2,1]")).is("Unexpected value.\n\tExpect=[[2,1]]\n\tActual=[[1,2]]");
assertObject(empty()).asJsonSorted().is("null");
assertObject(x1).isSameJsonAs(x1);
- assertThrown(()->assertObject(x1).isSameJsonAs(x2)).stderr().is("Unexpected comparison.\n\tExpect=[[2,1]]\n\tActual=[[1,2]]");
+ assertThrown(()->assertObject(x1).isSameJsonAs(x2)).is("Unexpected comparison.\n\tExpect=[[2,1]]\n\tActual=[[1,2]]");
assertObject(empty()).isSameJsonAs(null);
assertThrown(()->assertObject(new A1()).isSameJsonAs(null)).contains("Could not call getValue() on property 'foo'");
assertObject(x1).isSameSortedAs(x1);
assertObject(x1).isSameSortedAs(x2);
- assertThrown(()->assertObject(x1).isSameJsonAs(null)).stderr().is("Unexpected comparison.\n\tExpect=[null]\n\tActual=[[1,2]]");
+ assertThrown(()->assertObject(x1).isSameJsonAs(null)).is("Unexpected comparison.\n\tExpect=[null]\n\tActual=[[1,2]]");
assertObject(empty()).isSameSortedAs(null);
assertObject(x1).doesNotEqual(null);
@@ -87,18 +87,18 @@ public class ObjectAssertion_Test {
assertThrown(()->assertObject(x1).doesNotEqual(x1)).is("Unexpected value.\n\tExpected not=[[1,2]]\n\tActual=[[1,2]]");
assertObject(x1).passes(x->x != null);
- assertThrown(()->assertObject(x1).passes(x->x == null)).stderr().is("Value did not pass predicate test.\n\tValue=[[1,2]]");
+ assertThrown(()->assertObject(x1).passes(x->x == null)).is("Value did not pass predicate test.\n\tValue=[[1,2]]");
assertObject(x1).passes(x->x[0] == 1);
- assertThrown(()->assertObject(x1).passes(x->x[0]==2)).stderr().is("Value did not pass predicate test.\n\tValue=[[1,2]]");
+ assertThrown(()->assertObject(x1).passes(x->x[0]==2)).is("Value did not pass predicate test.\n\tValue=[[1,2]]");
assertObject(x1).isNot(null);
assertObject(x1).isAny(x1,x2);
- assertThrown(()->assertObject(x1).isAny(x2)).stderr().is("Expected value not found.\n\tExpect=[[[2,1]]]\n\tActual=[[1,2]]");
+ assertThrown(()->assertObject(x1).isAny(x2)).is("Expected value not found.\n\tExpect=[[[2,1]]]\n\tActual=[[1,2]]");
assertObject(x1).isNotAny(x2);
- assertThrown(()->assertObject(x1).isNotAny(x1,x2)).stderr().is("Unexpected value found.\n\tUnexpected=[[1,2]]\n\tActual=[[1,2]]");
+ assertThrown(()->assertObject(x1).isNotAny(x1,x2)).is("Unexpected value found.\n\tUnexpected=[[1,2]]\n\tActual=[[1,2]]");
Date d1 = new Date(0), d2 = new Date(0);
assertObject(d1).is(d2);
@@ -113,7 +113,7 @@ public class ObjectAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ObjectAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ObjectAssertion.create(null).stdout().stderr();
+ ObjectAssertion.create(null).stdout().silent();
}
@Test
@@ -122,7 +122,7 @@ public class ObjectAssertion_Test {
assertThrown(()->assertObject("foo").asArray()).contains("Object was not an array");
assertObject(true).asBoolean().isTrue();
- assertThrown(()->assertObject("foo").asBoolean()).stderr().contains("Object was not type 'java.lang.Boolean'. Actual='java.lang.String'");
+ assertThrown(()->assertObject("foo").asBoolean()).contains("Object was not type 'java.lang.Boolean'. Actual='java.lang.String'");
assertObject(new byte[]{123}).asByteArray().asJson().is("[123]");
assertObject(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 0ded6b5..b63ef07 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
@@ -53,29 +53,29 @@ public class StringAssertion_Test {
assertString("foo\nbar\nbaz").isEqualLinesTo("foo","bar","baz");
assertThrown(()->assertString(empty()).isEqualLinesTo((String[])null)).is("Parameter 'lines' cannot be null.");
assertThrown(()->assertString(empty()).isEqualLinesTo((String)null)).is("Text differed at position -1.\n\tExpect=[]\n\tActual=[null]");
- assertThrown(()->assertString("foo\nbar\nbaz").javaStrings().isEqualLinesTo("foo","bar","bar")).stderr().is("Text differed at position 10.\n\tExpect=[foo\\nbar\\nbar]\n\tActual=[foo\\nbar\\nbaz]");
+ assertThrown(()->assertString("foo\nbar\nbaz").javaStrings().isEqualLinesTo("foo","bar","bar")).is("Text differed at position 10.\n\tExpect=[foo\\nbar\\nbar]\n\tActual=[foo\\nbar\\nbaz]");
assertString("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","baz");
assertThrown(()->assertString(empty()).isEqualSortedLinesTo((String[])null)).is("Parameter 'lines' cannot be null.");
assertString("").isEqualSortedLinesTo((String)null);
assertThrown(()->assertString(empty()).isEqualSortedLinesTo()).is("Value was null.");
- assertThrown(()->assertString("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","bar")).stderr().is("Expected text had different values at line 2.\n\tExpect=[bar]\n\tActual=[baz]");
- assertThrown(()->assertString("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo")).stderr().is("Expected text had different numbers of lines.\n\tExpect=[2]\n\tActual=[3]");
- assertThrown(()->assertString(empty()).isEqualSortedLinesTo("foo")).stderr().is("Value was null.");
- assertThrown(()->assertString("foo").isEqualSortedLinesTo((String)null)).stderr().is("Expected text had different values at line 1.\n\tExpect=[]\n\tActual=[foo]");
+ assertThrown(()->assertString("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo","bar")).is("Expected text had different values at line 2.\n\tExpect=[bar]\n\tActual=[baz]");
+ assertThrown(()->assertString("foo\nbar\nbaz").isEqualSortedLinesTo("bar","foo")).is("Expected text had different numbers of lines.\n\tExpect=[2]\n\tActual=[3]");
+ assertThrown(()->assertString(empty()).isEqualSortedLinesTo("foo")).is("Value was null.");
+ assertThrown(()->assertString("foo").isEqualSortedLinesTo((String)null)).is("Expected text had different values at line 1.\n\tExpect=[]\n\tActual=[foo]");
assertString("foo\nbar\nbaz").isEqualLinesTo("foo","bar","baz");
assertString("foobar").isEqualIgnoreCaseTo("FOOBAR");
assertString(empty()).isEqualIgnoreCaseTo(null);
- assertThrown(()->assertString("foobar").isEqualIgnoreCaseTo("FOOBAZ")).stderr().is("Text differed at position 5.\n\tExpect=[FOOBAZ]\n\tActual=[foobar]");
- assertThrown(()->assertString(empty()).isEqualIgnoreCaseTo("FOOBAZ")).stderr().is("Text differed at position 0.\n\tExpect=[FOOBAZ]\n\tActual=[null]");
- assertThrown(()->assertString("foobar").isEqualIgnoreCaseTo(null)).stderr().is("Text differed at position 0.\n\tExpect=[null]\n\tActual=[foobar]");
+ assertThrown(()->assertString("foobar").isEqualIgnoreCaseTo("FOOBAZ")).is("Text differed at position 5.\n\tExpect=[FOOBAZ]\n\tActual=[foobar]");
+ assertThrown(()->assertString(empty()).isEqualIgnoreCaseTo("FOOBAZ")).is("Text differed at position 0.\n\tExpect=[FOOBAZ]\n\tActual=[null]");
+ assertThrown(()->assertString("foobar").isEqualIgnoreCaseTo(null)).is("Text differed at position 0.\n\tExpect=[null]\n\tActual=[foobar]");
assertString("foobar").doesNotEqual("foobaz");
- assertThrown(()->assertString("foobar").doesNotEqual("foobar")).stderr().is("Text equaled unexpected.\n\tText=[foobar]");
+ assertThrown(()->assertString("foobar").doesNotEqual("foobar")).is("Text equaled unexpected.\n\tText=[foobar]");
- assertThrown(()->assertString("foobar").isEqualTo("foobaz")).stderr().is("Text differed at position 5.\n\tExpect=[foobaz]\n\tActual=[foobar]");
+ assertThrown(()->assertString("foobar").isEqualTo("foobaz")).is("Text differed at position 5.\n\tExpect=[foobaz]\n\tActual=[foobar]");
assertString("foobar").isNot("foobaz");
assertThrown(()->assertString("foobar").isNot("foobar")).is("Text equaled unexpected.\n\tText=[foobar]");
@@ -117,7 +117,7 @@ public class StringAssertion_Test {
assertThrown(()->assertString("").matches((String)null)).is("Parameter 'regex' cannot be null.");
assertString("foo").matchesSimple("fo*");
- assertThrown(()->assertString("foo").matchesSimple("b*")).stderr().is("Text did not match expected pattern.\n\tPattern=[\\Qb\\E.*\\Q\\E]\n\tText=[foo]");
+ assertThrown(()->assertString("foo").matchesSimple("b*")).is("Text did not match expected pattern.\n\tPattern=[\\Qb\\E.*\\Q\\E]\n\tText=[foo]");
assertThrown(()->assertString(empty()).matchesSimple("b*")).is("Value was null.");
assertThrown(()->assertString("").matchesSimple(null)).is("Parameter 'searchPattern' cannot be null.");
@@ -127,15 +127,15 @@ public class StringAssertion_Test {
assertThrown(()->assertString("").doesNotMatch((String)null)).is("Parameter 'regex' cannot be null.");
assertString("foo").startsWith("fo");
- assertThrown(()->assertString("foo").startsWith("x")).stderr().is("Text did not start with expected string.\n\tString=[x]\n\tText=[foo]");
+ assertThrown(()->assertString("foo").startsWith("x")).is("Text did not start with expected string.\n\tString=[x]\n\tText=[foo]");
assertString("foo").endsWith("oo");
- assertThrown(()->assertString("foo").endsWith("x")).stderr().is("Text did not end with expected string.\n\tString=[x]\n\tText=[foo]");
+ assertThrown(()->assertString("foo").endsWith("x")).is("Text did not end with expected string.\n\tString=[x]\n\tText=[foo]");
}
@Test
public void a02_other() throws Exception {
assertThrown(()->StringAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- StringAssertion.create(null).stdout().stderr().javaStrings();
+ StringAssertion.create(null).stdout().silent().javaStrings();
}
}
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 455539c..0454e1a 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
@@ -80,6 +80,6 @@ public class ThrowableAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ThrowableAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ThrowableAssertion.create(null).stdout().stderr();
+ ThrowableAssertion.create(null).stdout().silent();
}
}
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 ccad093..8d04bd4 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
@@ -77,6 +77,6 @@ public class ZonedDateTimeAssertion_Test {
@Test
public void a02_other() throws Exception {
assertThrown(()->ZonedDateTimeAssertion.create(null).msg("Foo {0}", 1).exists()).is("Foo 1");
- ZonedDateTimeAssertion.create(null).stdout().stderr();
+ ZonedDateTimeAssertion.create(null).stdout().silent();
}
}
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 956a436..f8deea5 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
@@ -185,7 +185,7 @@ public class BeanStore_Test {
@Test
public void c01_createBean_create_withArgs() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C1a.class)).stderr().is("Could not instantiate class "+CNAME+"$C1a: Static creator found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(C1a.class)).is("Could not instantiate class "+CNAME+"$C1a: Static creator found but could not find prerequisites: A.");
bs.addBean(A.class, new A());
assertObject(bs.createBean(C1a.class)).exists();
assertObject(bs.createBean(C1a.class)).exists();
@@ -200,7 +200,7 @@ public class BeanStore_Test {
@Test
public void c02a_createBean_create_withArgs_interface() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C2a.class)).stderr().is("Could not instantiate class "+CNAME+"$C2a: Static creator found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(C2a.class)).is("Could not instantiate class "+CNAME+"$C2a: Static creator found but could not find prerequisites: A.");
bs.addBean(A.class, new A());
assertObject(bs.createBean(C2a.class)).exists();
assertObject(bs.createBean(C2a.class)).exists();
@@ -215,7 +215,7 @@ public class BeanStore_Test {
@Test
public void c02b_createBean_create_withArgs_abstractClass() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C2b.class)).stderr().is("Could not instantiate class "+CNAME+"$C2b: Static creator found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(C2b.class)).is("Could not instantiate class "+CNAME+"$C2b: Static creator found but could not find prerequisites: A.");
bs.addBean(A.class, new A());
assertObject(bs.createBean(C2b.class)).exists();
assertObject(bs.createBean(C2b.class)).exists();
@@ -226,9 +226,9 @@ public class BeanStore_Test {
@Test
public void c02c_createBean_create_withArgs_interface() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C2c.class)).stderr().is("Could not instantiate class "+CNAME+"$C2c: Class is an interface.");
+ assertThrown(()->bs.createBean(C2c.class)).is("Could not instantiate class "+CNAME+"$C2c: Class is an interface.");
bs.addBean(A.class, new A());
- assertThrown(()->bs.createBean(C2c.class)).stderr().is("Could not instantiate class "+CNAME+"$C2c: Class is an interface.");
+ assertThrown(()->bs.createBean(C2c.class)).is("Could not instantiate class "+CNAME+"$C2c: Class is an interface.");
}
public static abstract class C2d {}
@@ -236,9 +236,9 @@ public class BeanStore_Test {
@Test
public void c02d_createBean_create_withArgs_abstractClass() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C2d.class)).stderr().is("Could not instantiate class "+CNAME+"$C2d: Class is abstract.");
+ assertThrown(()->bs.createBean(C2d.class)).is("Could not instantiate class "+CNAME+"$C2d: Class is abstract.");
bs.addBean(A.class, new A());
- assertThrown(()->bs.createBean(C2d.class)).stderr().is("Could not instantiate class "+CNAME+"$C2d: Class is abstract.");
+ assertThrown(()->bs.createBean(C2d.class)).is("Could not instantiate class "+CNAME+"$C2d: Class is abstract.");
}
public static class C3a {
@@ -254,7 +254,7 @@ public class BeanStore_Test {
@Test
public void c03_createBean_create_withNamedArgs() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(C3a.class)).stderr().is("Could not instantiate class "+CNAME+"$C3a: Static creator found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(C3a.class)).is("Could not instantiate class "+CNAME+"$C3a: Static creator found but could not find prerequisites: A.");
bs.addBean("Foo", new A());
assertObject(bs.createBean(C3a.class)).exists();
assertObject(bs.createBean(C3a.class)).exists();
@@ -274,7 +274,7 @@ public class BeanStore_Test {
@Test
public void d01a_createBean_construct_withArgs() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(D1a.class)).stderr().is("Could not instantiate class "+CNAME+"$D1a: Public constructor found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(D1a.class)).is("Could not instantiate class "+CNAME+"$D1a: Public constructor found but could not find prerequisites: A.");
bs.addBean(A.class, new A());
assertObject(bs.createBean(D1a.class)).exists();
assertObject(bs.createBean(D1a.class)).exists();
@@ -290,9 +290,9 @@ public class BeanStore_Test {
@Test
public void d01b_createBean_construct_withArgs_inner() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(D1b.class)).stderr().is("Could not instantiate class "+CNAME+"$D1b: Public constructor found but could not find prerequisites: BeanStore_Test,A.");
+ assertThrown(()->bs.createBean(D1b.class)).is("Could not instantiate class "+CNAME+"$D1b: Public constructor found but could not find prerequisites: BeanStore_Test,A.");
BeanStore bs2 = BeanStore.of(null,this);
- assertThrown(()->bs2.createBean(D1b.class)).stderr().is("Could not instantiate class "+CNAME+"$D1b: Public constructor found but could not find prerequisites: A.");
+ assertThrown(()->bs2.createBean(D1b.class)).is("Could not instantiate class "+CNAME+"$D1b: Public constructor found but could not find prerequisites: A.");
bs2.addBean(A.class, new A());
assertObject(bs2.createBean(D1b.class)).exists();
assertObject(bs2.createBean(D1b.class)).exists();
@@ -308,7 +308,7 @@ public class BeanStore_Test {
@Test
public void d02a_createBean_construct_withNamedArgs() throws Exception {
BeanStore bs = new BeanStore();
- assertThrown(()->bs.createBean(D2a.class)).stderr().is("Could not instantiate class "+CNAME+"$D2a: Public constructor found but could not find prerequisites: A.");
+ assertThrown(()->bs.createBean(D2a.class)).is("Could not instantiate class "+CNAME+"$D2a: Public constructor found but could not find prerequisites: A.");
bs.addBean("Foo", new A());
assertObject(bs.createBean(D2a.class)).exists();
assertObject(bs.createBean(D2a.class)).exists();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
index aed766a..d79c863 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
@@ -81,7 +81,7 @@ public class HeaderSupplier_Test {
x.add("X5","bar",openApiSession(),null,false);
x.add("X6","$S{"+pname+"}",openApiSession(),null,false);
- assertString(x.toString()).stderr().is("['X1: bar','X2: y','X3: bar','X4: y','X5: bar','X6: y']");
+ assertString(x.toString()).is("['X1: bar','X2: y','X3: bar','X4: y','X5: bar','X6: y']");
System.setProperty(pname, "z");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
index 690fd96..d0b3691 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/NameValuePairSupplier_Test.java
@@ -81,7 +81,7 @@ public class NameValuePairSupplier_Test {
x.add("X5","bar",HttpPartType.QUERY,openApiSession(),null,false);
x.add("X6","$S{"+pname+"}",HttpPartType.QUERY,openApiSession(),null,false);
- assertString(x.toString()).stderr().is("X1=bar&X2=y&X3=bar&X4=y&X5=bar&X6=y");
+ assertString(x.toString()).is("X1=bar&X2=y&X3=bar&X4=y&X5=bar&X6=y");
System.setProperty(pname, "z");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
index ca4f676..513b128 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
@@ -62,7 +62,7 @@ public class RetryAfter_Test {
c.get().header(of(INT_VALUE)).run().assertBody().is(INT_VALUE);
c.get().header(of(new StringBuilder(INT_VALUE))).run().assertBody().is(INT_VALUE);
c.get().header(of(()->INT_VALUE)).run().assertBody().is(INT_VALUE);
- c.get().header(of(CALENDAR_VALUE)).run().assertBody().stderr().is("Sun, 31 Dec 2000 12:34:56 GMT");
+ c.get().header(of(CALENDAR_VALUE)).run().assertBody().is("Sun, 31 Dec 2000 12:34:56 GMT");
c.get().header(of(()->CALENDAR_VALUE)).run().assertBody().is("Sun, 31 Dec 2000 12:34:56 GMT");
c.get().header(new RetryAfter(INT_VALUE)).run().assertBody().is(INT_VALUE);
}
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 4bb67e7..3570d5b 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
@@ -364,8 +364,8 @@ public class ThrownStore_Test {
db.add(t1);
db.add(t2);
- assertObject(db.getStats(t1).get().getStackTrace()).asJson().stderr().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
- assertObject(db.getStats(t2).get().getStackTrace()).asJson().stderr().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
+ assertObject(db.getStats(t1).get().getStackTrace()).asJson().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
+ assertObject(db.getStats(t2).get().getStackTrace()).asJson().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
assertInteger(db.getStats(t1).get().getCount()).is(2);
assertInteger(db.getStats(t2).get().getCount()).is(2);
@@ -375,8 +375,8 @@ public class ThrownStore_Test {
db2.add(t1);
db2.add(t2);
- assertObject(db2.getStats(t1).get().getStackTrace()).asJson().stderr().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
- assertObject(db2.getStats(t2).get().getStackTrace()).asJson().stderr().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
+ assertObject(db2.getStats(t1).get().getStackTrace()).asJson().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
+ assertObject(db2.getStats(t2).get().getStackTrace()).asJson().is("['Foo.bar(Foo.class:1)','Foo.baz(Foo.class:2)','<ignored>','<ignored>','Object.baz(Object.class:5)']");
assertInteger(db2.getStats(t1).get().getCount()).is(2);
assertInteger(db2.getStats(t2).get().getCount()).is(2);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
index 59150e4..279904a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
@@ -148,7 +148,7 @@ public class RestAnnotation_Test {
@Test
public void a01_basic() {
- assertObject(a1).asJson().stderr().is(""
+ assertObject(a1).asJson().is(""
+ "{"
+ "allowedHeaderParams:'allowedHeaderParams',"
+ "allowedMethodHeaders:'allowedMethodHeaders',"
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
index 04ac2e8..49173e5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Messages_Test.java
@@ -106,7 +106,7 @@ public class Rest_Messages_Test {
@Test
public void b02_subclassed_customName() throws Exception {
MockRestClient b2 = MockRestClient.build(B2.class);
- b2.get("/a").run().assertBody().stderr().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b',key3:'B2.value3b'}");
+ b2.get("/a").run().assertBody().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b',key3:'B2.value3b'}");
b2.get("/b").run().assertBody().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b',key3:'B2.value3b'}");
b2.get("/c?name=key1").run().assertBody().is("value1a");
b2.get("/c?name=key2").run().assertBody().is("value2b");
@@ -125,7 +125,7 @@ public class Rest_Messages_Test {
@Test
public void b03_viaBuilder() throws Exception {
MockRestClient b3 = MockRestClient.build(B3.class);
- b3.get("/a").run().assertBody().stderr().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b'}");
+ b3.get("/a").run().assertBody().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b'}");
b3.get("/b").run().assertBody().is("{'B1.key2':'B1.value2a','B2.key3':'B2.value3b',key1:'value1a',key2:'value2b'}");
b3.get("/c?name=key1").run().assertBody().is("value1a");
b3.get("/c?name=key2").run().assertBody().is("value2b");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
index 1ed58a9..b3d5bbe 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Logging_Test.java
@@ -148,7 +148,7 @@ public class RestClient_Logging_Test {
client().logger(l).logRequests(DetailLevel.SIMPLE,Level.WARNING,null).build().post("/bean",bean).complete();
l.assertLastLevel(Level.WARNING);
- l.assertLastMessage().stderr().is("HTTP POST http://localhost/bean, HTTP/1.1 200 ");
+ l.assertLastMessage().is("HTTP POST http://localhost/bean, HTTP/1.1 200 ");
l.assertContents().contains("WARNING: HTTP POST http://localhost/bean, HTTP/1.1 200 \n");
l.reset();
@@ -173,7 +173,7 @@ public class RestClient_Logging_Test {
"{f:1}",
"=== END ======================================================================="
);
- l.assertContents().stderr().javaStrings().contains(
+ l.assertContents().javaStrings().contains(
"WARNING: ",
"=== HTTP Call (outgoing) ======================================================",
"=== REQUEST ===",