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 9486f1f Tests.
9486f1f is described below
commit 9486f1fab076f594348c2900282d0f12d11ad691
Author: JamesBognar <[email protected]>
AuthorDate: Sat Apr 11 10:21:32 2020 -0400
Tests.
---
.../apache/juneau/rest/client2/RestClientTest.java | 138 ++++++++++++++++-----
.../juneau/rest/client2/RestClientBuilder.java | 8 +-
.../apache/juneau/rest/mock2/MockRestClient.java | 16 +--
3 files changed, 121 insertions(+), 41 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
index e60e808..3297537 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
@@ -2457,13 +2457,13 @@ public class RestClientTest {
}
@Test
- public void l21_serializer_trimStringsS() throws Exception {
+ public void l21_serializer_trimStringsOnWrite() throws Exception {
L21 x = new L21();
MockRestClient
.create(A.class)
.simpleJson()
- .trimStringsS()
+ .trimStringsOnWrite()
.build()
.post("/echoBody", x)
.run()
@@ -2472,7 +2472,7 @@ public class RestClientTest {
MockRestClient
.create(A.class)
.simpleJson()
- .trimStringsS(true)
+ .trimStringsOnWrite(true)
.build()
.post("/echoBody", x)
.run()
@@ -2481,7 +2481,7 @@ public class RestClientTest {
MockRestClient
.create(A.class)
.simpleJson()
- .trimStringsS(false)
+ .trimStringsOnWrite(false)
.build()
.post("/echoBody", x)
.run()
@@ -2783,37 +2783,117 @@ public class RestClientTest {
.getBody().as(M5.class);
}
+ public static class M7 {
+ public String f;
+ }
+
@Test
public void m07_parser_trimStringsOnRead() throws Exception {
+ M7 x = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .trimStringsOnRead()
+ .build()
+ .post("/echoBody", new StringReader("{f:' 1 '}"))
+ .run()
+ .getBody().as(M7.class);
+ assertEquals("1", x.f);
+ x = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .trimStringsOnRead(true)
+ .build()
+ .post("/echoBody", new StringReader("{f:' 1 '}"))
+ .run()
+ .getBody().as(M7.class);
+ assertEquals("1", x.f);
+ x = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .trimStringsOnRead(false)
+ .build()
+ .post("/echoBody", new StringReader("{f:' 1 '}"))
+ .run()
+ .getBody().as(M7.class);
+ assertEquals(" 1 ", x.f);
+ }
+
+ @Test
+ public void m09_parser_unbufferedBoolean() throws Exception {
+ RestClient rc = null;
+
+ rc = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .unbuffered()
+ .build();
+
+
assertTrue(rc.parsers.getParser("application/json").toMap().getMap("Parser").getBoolean("unbuffered"));
+
+ M7 x = rc
+ .post("/echoBody", new StringReader("{f:'1'}"))
+ .run()
+ .getBody().as(M7.class);
+ assertEquals("1", x.f);
+
+ rc = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .unbuffered(true)
+ .build();
+
+
assertTrue(rc.parsers.getParser("application/json").toMap().getMap("Parser").getBoolean("unbuffered"));
+
+ rc = MockRestClient
+ .create(A.class)
+ .simpleJson()
+ .unbuffered(false)
+ .build();
+
+
assertFalse(rc.parsers.getParser("application/json").toMap().getMap("Parser").getBoolean("unbuffered",
false));
+ }
+
+ @Test
+ public void m11_parser_fileCharset() throws Exception {
+ RestClient rc = null;
+
+ rc = MockRestClient
+ .create(A.class)
+ .json()
+ .fileCharset("UTF-8")
+ .build();
+
+ assertEquals("UTF-8",
rc.parsers.getParser("application/json").toMap().getMap("ReaderParser").getString("fileCharset"));
+ }
+
+ @Test
+ public void m12_parser_inputStreamCharset() throws Exception {
+ RestClient rc = null;
+
+ rc = MockRestClient
+ .create(A.class)
+ .json()
+ .inputStreamCharset("UTF-8")
+ .build();
+
+ assertEquals("UTF-8",
rc.parsers.getParser("application/json").toMap().getMap("ReaderParser").getString("streamCharset"));
+ }
+
+ @Test
+ public void m13_parser_binaryInputFormat() throws Exception {
+ RestClient rc = null;
+
+ rc = MockRestClient
+ .create(A.class)
+ .msgPack()
+ .binaryInputFormat(BinaryFormat.BASE64)
+ .build();
+
+ assertEquals("BASE64",
rc.parsers.getParser("octal/msgpack").toMap().getMap("InputStreamParser").getString("binaryFormat"));
}
-// public RestClientBuilder trimStringsP(boolean value) {
-// @Test
-// public void m08_parser_trimStringsP() throws Exception { fail(); }
-//// public RestClientBuilder trimStringsP() {
-//
-// @Test
-// public void m09_parser_unbufferedBoolean() throws Exception { fail(); }
-//// public RestClientBuilder unbuffered(boolean value) {
-//
-// @Test
-// public void m10_parser_unbuffered() throws Exception { fail(); }
-//// public RestClientBuilder unbuffered() {
-//
-// @Test
-// public void m11_parser_fileCharset() throws Exception { fail(); }
-//// public RestClientBuilder fileCharset(String value) {
-//
-// @Test
-// public void m12_parser_inputStreamCharset() throws Exception { fail(); }
-//// public RestClientBuilder inputStreamCharset(String value) {
-//
-// @Test
-// public void m13_parser_binaryInputFormat() throws Exception { fail(); }
-//// public RestClientBuilder binaryInputFormat(BinaryFormat value) {
-//
// @Test
// public void m14_parser_paramFormat() throws Exception { fail(); }
//// public RestClientBuilder paramFormat(String value) {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
index 43d26e0..612f351 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
@@ -2343,7 +2343,7 @@ public class RestClientBuilder extends BeanContextBuilder
{
* @return This object (for method chaining).
*/
@ConfigurationProperty
- public RestClientBuilder trimStringsS(boolean value) {
+ public RestClientBuilder trimStringsOnWrite(boolean value) {
return set(SERIALIZER_trimStrings, value);
}
@@ -2360,7 +2360,7 @@ public class RestClientBuilder extends BeanContextBuilder
{
* @return This object (for method chaining).
*/
@ConfigurationProperty
- public RestClientBuilder trimStringsS() {
+ public RestClientBuilder trimStringsOnWrite() {
return set(SERIALIZER_trimStrings, true);
}
@@ -2683,7 +2683,7 @@ public class RestClientBuilder extends BeanContextBuilder
{
* @return This object (for method chaining).
*/
@ConfigurationProperty
- public RestClientBuilder trimStringsP(boolean value) {
+ public RestClientBuilder trimStringsOnRead(boolean value) {
return set(PARSER_trimStrings, value);
}
@@ -2700,7 +2700,7 @@ public class RestClientBuilder extends BeanContextBuilder
{
* @return This object (for method chaining).
*/
@ConfigurationProperty
- public RestClientBuilder trimStringsP() {
+ public RestClientBuilder trimStringsOnRead() {
return set(PARSER_trimStrings, true);
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
index 7a23d3d..ba13a6e 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
@@ -1530,26 +1530,26 @@ public class MockRestClient extends RestClientBuilder {
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClient trimStringsP() {
- super.trimStringsP();
+ public MockRestClient trimStringsOnRead() {
+ super.trimStringsOnRead();
return this;
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClient trimStringsP(boolean value) {
- super.trimStringsP(value);
+ public MockRestClient trimStringsOnRead(boolean value) {
+ super.trimStringsOnRead(value);
return this;
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClient trimStringsS() {
- super.trimStringsS();
+ public MockRestClient trimStringsOnWrite() {
+ super.trimStringsOnWrite();
return this;
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClient trimStringsS(boolean value) {
- super.trimStringsS(value);
+ public MockRestClient trimStringsOnWrite(boolean value) {
+ super.trimStringsOnWrite(value);
return this;
}
