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 54d773e MockRestClient improvements.
54d773e is described below
commit 54d773eb260162de82b02d2f636f1755a0c9add2
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Wed May 27 17:10:54 2020 -0400
MockRestClient improvements.
---
.../apache/juneau/rest/client2/RestRequest.java | 4 +-
.../rest/annotation2/BodyAnnotationTest.java | 98 +++++++++++-----------
.../rest/annotation2/FormDataAnnotationTest.java | 8 +-
.../annotation2/HasFormDataAnnotationTest.java | 2 +-
.../rest/annotation2/HasQueryAnnotationTest.java | 2 +-
.../rest/annotation2/QueryAnnotationTest.java | 10 +--
.../juneau/rest/annotation2/RestHookTest.java | 16 ++--
.../annotation2/RestResourcePojoSwapsTest.java | 10 +--
8 files changed, 75 insertions(+), 75 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
index 8acc59d..fa5323a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
@@ -1890,7 +1890,7 @@ public final class RestRequest extends BeanSession
implements HttpUriRequest, Co
* @throws RestCallException If a retry was attempted, but the entity
was not repeatable.
*/
public RestRequest stringBody(String input) throws RestCallException {
- return body(new StringReader(input));
+ return body(input == null ? null : new StringReader(input));
}
/**
@@ -2803,7 +2803,7 @@ public final class RestRequest extends BeanSession
implements HttpUriRequest, Co
if (hasInput || formData != null) {
- if (hasInput && formData != null)
+ if (hasInput && formData != null && input !=
null)
throw new RestCallException("Both input
and form-data found on same request.");
if (request2 == null)
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
index 1638f94..14b20ea 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
@@ -383,11 +383,11 @@ public class BodyAnnotationTest {
@Override public String toString() { return s; }
}
}
- private static MockRest b = MockRest.build(B.class);
+ private static MockRestClient b = MockRestClient.build(B.class);
@Test
public void b01a_onPojo_StringTransform() throws Exception {
- b.put("/StringTransform", "'foo'").json()
+ b.put("/StringTransform", "'foo'", "application/json")
.run()
.assertBody().is("'foo'");
}
@@ -400,25 +400,25 @@ public class BodyAnnotationTest {
}
@Test
public void b02a_onPojo_Bean() throws Exception {
- b.put("/Bean", "{f1:'a'}").json()
+ b.put("/Bean", "{f1:'a'}", "application/json")
.run()
.assertBody().is("{f1:'a'}");
}
@Test
public void b02b_onPojo_Bean_noContentType() throws Exception {
- b.put("/Bean", "(f1=a)")
+ b.put("/Bean", "(f1=a)", "text/openapi")
.run()
.assertStatus().is(415);
}
@Test
public void b03a_onPojo_BeanList() throws Exception {
- b.put("/BeanList", "[{f1:'a'}]").json()
+ b.put("/BeanList", "[{f1:'a'}]", "application/json")
.run()
.assertBody().is("[{f1:'a'}]");
}
@Test
public void b03b_onPojo_BeanList_noContentType() throws Exception {
- b.put("/BeanList", "(f1=a)")
+ b.put("/BeanList", "(f1=a)", "text/openapi")
.run()
.assertStatus().is(415);
}
@@ -431,7 +431,7 @@ public class BodyAnnotationTest {
@Test
public void b04b_onPojo_InputStreamTransform_withContentType() throws
Exception {
// When Content-Type matched, treated as parsed POJO.
- b.put("/InputStreamTransform?noTrace=true", "a").json()
+ b.put("/InputStreamTransform?noTrace=true", "a",
"application/json")
.run()
.assertBody().contains("Bad Request");
}
@@ -444,7 +444,7 @@ public class BodyAnnotationTest {
@Test
public void b05b_onPojo_ReaderTransform_withContentType() throws
Exception {
// When Content-Type matched, treated as parsed POJO.
- b.put("/ReaderTransform?noTrace=true", "a").json()
+ b.put("/ReaderTransform?noTrace=true", "a", "application/json")
.run()
.assertBody().contains("Bad Request");
}
@@ -730,7 +730,7 @@ public class BodyAnnotationTest {
@Override public String toString() { return s; }
}
}
- private static MockRest d = MockRest.build(D.class);
+ private static MockRestClient d = MockRestClient.build(D.class);
@Test
public void d01a_noMediaTypes_String() throws Exception {
@@ -740,7 +740,7 @@ public class BodyAnnotationTest {
}
@Test
public void d01b_noMediaTypes_String_withContentType() throws Exception
{
- d.put("/String", "a").json()
+ d.put("/String", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -752,7 +752,7 @@ public class BodyAnnotationTest {
}
@Test
public void d02b_noMediaTypes_InputStream_withContentType() throws
Exception {
- d.put("/InputStream", "a").json()
+ d.put("/InputStream", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -764,7 +764,7 @@ public class BodyAnnotationTest {
}
@Test
public void d03b_noMediaTypes_Reader_withContentType() throws Exception
{
- d.put("/Reader", "a").json()
+ d.put("/Reader", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -776,7 +776,7 @@ public class BodyAnnotationTest {
}
@Test
public void d04b_noMediaTypes_StringTransform_withContentType() throws
Exception {
- d.put("/StringTransform?noTrace=true", "a").json()
+ d.put("/StringTransform?noTrace=true", "a", "application/json")
.run()
.assertStatus().is(415);
}
@@ -788,7 +788,7 @@ public class BodyAnnotationTest {
}
@Test
public void d05b_noMediaTypes_InputStreamTransform_withContentType()
throws Exception {
- d.put("/InputStreamTransform", "a").json()
+ d.put("/InputStreamTransform", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -800,7 +800,7 @@ public class BodyAnnotationTest {
}
@Test
public void d06b_noMediaTypes_ReaderTransform_withContentType() throws
Exception {
- d.put("/ReaderTransform", "a").json()
+ d.put("/ReaderTransform", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -812,7 +812,7 @@ public class BodyAnnotationTest {
}
@Test
public void
d07b_noMediaTypes_StringTransformBodyOnPojo_withContentType() throws Exception {
- d.put("/StringTransformBodyOnPojo?noTrace=true", "a").json()
+ d.put("/StringTransformBodyOnPojo?noTrace=true", "a",
"application/json")
.run()
.assertStatus().is(415);
}
@@ -824,7 +824,7 @@ public class BodyAnnotationTest {
}
@Test
public void
d08b_noMediaTypes_InputStreamTransformBodyOnPojo_withContentType() throws
Exception {
- d.put("/InputStreamTransformBodyOnPojo", "a").json()
+ d.put("/InputStreamTransformBodyOnPojo", "a",
"application/json")
.run()
.assertBody().is("a");
}
@@ -836,7 +836,7 @@ public class BodyAnnotationTest {
}
@Test
public void
d09b_noMediaTypes_ReaderTransformBodyOnPojo_withContentType() throws Exception {
- d.put("/ReaderTransformBodyOnPojo", "a").json()
+ d.put("/ReaderTransformBodyOnPojo", "a", "application/json")
.run()
.assertBody().is("a");
}
@@ -856,12 +856,12 @@ public class BodyAnnotationTest {
return c;
}
}
- private static MockRest e = MockRest.build(E.class);
+ private static MockRestClient e = MockRestClient.build(E.class);
@Test
public void e01_complexPojos_B_body() throws Exception {
String expected =
"{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}
[...]
- e.put("/B",
SimpleJsonSerializer.DEFAULT.toString(DTOs.B.INSTANCE)).json()
+ e.put("/B",
SimpleJsonSerializer.DEFAULT.toString(DTOs.B.INSTANCE), "application/json")
.run()
.assertBody().is(expected);
}
@@ -875,7 +875,7 @@ public class BodyAnnotationTest {
@Test
public void e03_complexPojos_C_body() throws Exception {
String expected =
"{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}
[...]
- e.put("/C",
SimpleJsonSerializer.DEFAULT.toString(DTOs.B.INSTANCE)).json()
+ e.put("/C",
SimpleJsonSerializer.DEFAULT.toString(DTOs.B.INSTANCE), "application/json")
.run()
.assertBody().is(expected);
}
@@ -900,12 +900,12 @@ public class BodyAnnotationTest {
return c;
}
}
- private static MockRest e2 = MockRest.build(E2.class);
+ private static MockRestClient e2 = MockRestClient.build(E2.class);
@Test
public void e05_complexPojos_B_body() throws Exception {
String expected =
"{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}
[...]
- e2.put("/B",
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(DTOs2.Annotations.class).build().toString(DTOs2.B.INSTANCE)).json()
+ e2.put("/B",
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(DTOs2.Annotations.class).build().toString(DTOs2.B.INSTANCE),
"application/json")
.run()
.assertBody().is(expected);
}
@@ -919,7 +919,7 @@ public class BodyAnnotationTest {
@Test
public void e07_complexPojos_C_body() throws Exception {
String expected =
"{f01:['a','b'],f02:['c','d'],f03:[1,2],f04:[3,4],f05:[['e','f'],['g','h']],f06:[['i','j'],['k','l']],f07:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f08:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f09:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f10:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f11:['a','b'],f12:['c','d'],f13:[1,2],f14:[3,4],f15:[['e','f'],['g','h']],f16:[['i','j'],['k','l']],f17:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}],f18:[{a:'a',b:1,c:true},{a:'a',b:1,c:true}
[...]
- e2.put("/C",
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(DTOs2.Annotations.class).build().toString(DTOs2.B.INSTANCE)).json()
+ e2.put("/C",
SimpleJsonSerializer.DEFAULT.builder().applyAnnotations(DTOs2.Annotations.class).build().toString(DTOs2.B.INSTANCE),
"application/json")
.run()
.assertBody().is(expected);
}
@@ -949,20 +949,20 @@ public class BodyAnnotationTest {
public int p2;
}
}
- static MockRest f = MockRest.build(F.class);
+ static MockRestClient f = MockRestClient.build(F.class);
@Test
public void f01_formPostAsContent() throws Exception {
- f.post("/", "{p1:'p1',p2:2}").json()
+ f.post("/", "{p1:'p1',p2:2}", "application/json")
.run()
.assertBody().is("bean=[{p1:'p1',p2:2}],qp1=[null],qp2=[0],hqp1=[false],hqp2=[false]");
- f.post("/", "{}").json()
+ f.post("/", "{}", "application/json")
.run()
.assertBody().is("bean=[{p2:0}],qp1=[null],qp2=[0],hqp1=[false],hqp2=[false]");
- f.post("?p1=p3&p2=4", "{p1:'p1',p2:2}").json()
+ f.post("?p1=p3&p2=4", "{p1:'p1',p2:2}", "application/json")
.run()
.assertBody().is("bean=[{p1:'p1',p2:2}],qp1=[p3],qp2=[4],hqp1=[true],hqp2=[true]");
- f.post("?p1=p3&p2=4", "{}").json()
+ f.post("?p1=p3&p2=4", "{}", "application/json")
.run()
.assertBody().is("bean=[{p2:0}],qp1=[p3],qp2=[4],hqp1=[true],hqp2=[true]");
}
@@ -980,7 +980,7 @@ public class BodyAnnotationTest {
return content;
}
}
- static MockRest g = MockRest.build(G.class);
+ static MockRestClient g = MockRestClient.build(G.class);
@Test
public void g01() throws Exception {
@@ -1005,7 +1005,7 @@ public class BodyAnnotationTest {
+ "&f18=(a=a,b=1,c=true)&f18=(a=b,b=2,c=false)"
+ "&f19=@((a=a,b=1,c=true))&f19=@((a=b,b=2,c=false))"
+ "&f20=@((a=a,b=1,c=true))&f20=@((a=b,b=2,c=false))";
- g.post("/", in).urlEnc()
+ g.post("/", in, "application/x-www-form-urlencoded")
.run()
.assertBody().is(in);
}
@@ -1028,7 +1028,7 @@ public class BodyAnnotationTest {
return content;
}
}
- static MockRest h = MockRest.build(H.class);
+ static MockRestClient h = MockRestClient.build(H.class);
@Test
public void h01() throws Exception {
@@ -1053,7 +1053,7 @@ public class BodyAnnotationTest {
+ "&f18=(a=a,b=1,c=true)&f18=(a=b,b=2,c=false)"
+ "&f19=@((a=a,b=1,c=true))&f19=@((a=b,b=2,c=false))"
+ "&f20=@((a=a,b=1,c=true))&f20=@((a=b,b=2,c=false))";
- h.post("/", in).urlEnc()
+ h.post("/", in, "application/x-www-form-urlencoded")
.run()
.assertBody().is(in);
}
@@ -1072,7 +1072,7 @@ public class BodyAnnotationTest {
return content;
}
}
- static MockRest h2 = MockRest.build(H2.class);
+ static MockRestClient h2 = MockRestClient.build(H2.class);
@Test
public void h02() throws Exception {
@@ -1097,7 +1097,7 @@ public class BodyAnnotationTest {
+ "&f18=(a=a,b=1,c=true)&f18=(a=b,b=2,c=false)"
+ "&f19=@((a=a,b=1,c=true))&f19=@((a=b,b=2,c=false))"
+ "&f20=@((a=a,b=1,c=true))&f20=@((a=b,b=2,c=false))";
- h2.post("/", in).urlEnc()
+ h2.post("/", in, "application/x-www-form-urlencoded")
.run()
.assertBody().is(in);
}
@@ -1113,15 +1113,15 @@ public class BodyAnnotationTest {
return content;
}
}
- static MockRest i = MockRest.build(I.class);
+ static MockRestClient i = MockRestClient.build(I.class);
@Test
public void i01() throws Exception {
- i.post("/", "").json()
+ i.post("/", "", "application/json")
.run()
.assertStatus().is(400)
.assertBody().contains("Required value not provided.");
- i.post("/", "{}").json()
+ i.post("/", "{}", "application/json")
.run()
.assertStatus().is(200);
}
@@ -1135,15 +1135,15 @@ public class BodyAnnotationTest {
return content;
}
}
- static MockRest i2 = MockRest.build(I2.class);
+ static MockRestClient i2 = MockRestClient.build(I2.class);
@Test
public void i02() throws Exception {
- i2.post("/", "").json()
+ i2.post("/", "", "application/json")
.run()
.assertStatus().is(400)
.assertBody().contains("Required value not provided.");
- i2.post("/", "{}").json()
+ i2.post("/", "{}", "application/json")
.run()
.assertStatus().is(200);
}
@@ -1174,15 +1174,15 @@ public class BodyAnnotationTest {
return body;
}
}
- static MockRest j = MockRest.buildJson(J.class);
+ static MockRestClient j = MockRestClient.buildJson(J.class);
@Test
public void j01_optionalParam_integer() throws Exception {
- j.post("/a", "123")
+ j.post("/a", 123)
.run()
.assertStatus().is(200)
.assertBody().is("123");
- j.post("/a", "null")
+ j.post("/a", null)
.run()
.assertStatus().is(200)
.assertBody().is("null");
@@ -1194,7 +1194,7 @@ public class BodyAnnotationTest {
.run()
.assertStatus().is(200)
.assertBody().is("{a:1,b:'foo'}");
- j.post("/b", "null")
+ j.post("/b", null)
.run()
.assertStatus().is(200)
.assertBody().is("null");
@@ -1203,11 +1203,11 @@ public class BodyAnnotationTest {
@Test
public void j03_optionalParam_listOfBeans() throws Exception {
String body = SimpleJson.DEFAULT.toString(AList.of(new
ABean().init()));
- j.post("/c", body)
+ j.post("/c", body, "application/json")
.run()
.assertStatus().is(200)
.assertBody().is("[{a:1,b:'foo'}]");
- j.post("/c", "null")
+ j.post("/c", null)
.run()
.assertStatus().is(200)
.assertBody().is("null");
@@ -1216,11 +1216,11 @@ public class BodyAnnotationTest {
@Test
public void j04_optionalParam_listOfOptionals() throws Exception {
String body =
SimpleJson.DEFAULT.toString(AList.of(Optional.of(new ABean().init())));
- j.post("/d", body)
+ j.post("/d", body, "application/json")
.run()
.assertStatus().is(200)
.assertBody().is("[{a:1,b:'foo'}]");
- j.post("/d", "null")
+ j.post("/d", null)
.run()
.assertStatus().is(200)
.assertBody().is("null");
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
index c6c37c2..4354f71 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
@@ -45,7 +45,7 @@ public class FormDataAnnotationTest {
return
"p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1",
String.class)+"],p2=["+p2+","+req.getFormData().getString("p2")+","+f.get("p2",
int.class)+"]";
}
}
- static MockRest a = MockRest.build(A.class);
+ static MockRestClient a = MockRestClient.build(A.class);
@Test
public void a01() throws Exception {
@@ -80,7 +80,7 @@ public class FormDataAnnotationTest {
return
"p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1",
String.class)+"]";
}
}
- static MockRest b = MockRest.build(B.class);
+ static MockRestClient b = MockRestClient.build(B.class);
@Test
public void b01() throws Exception {
@@ -128,7 +128,7 @@ public class FormDataAnnotationTest {
.a("f3", f3);
}
}
- static MockRest c = MockRest.build(C.class);
+ static MockRestClient c = MockRestClient.build(C.class);
@Test
public void c01_defaultFormData() throws Exception {
@@ -180,7 +180,7 @@ public class FormDataAnnotationTest {
return f1;
}
}
- static MockRest d =
MockRest.create(D.class).accept("application/json").contentType("application/x-www-form-urlencoded").build();
+ static MockRestClient d =
MockRestClient.create(D.class).accept("application/json").contentType("application/x-www-form-urlencoded").build();
@Test
public void d01_optionalParam_integer() throws Exception {
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
index dc3c09c..0f1faa0 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasFormDataAnnotationTest.java
@@ -36,7 +36,7 @@ public class HasFormDataAnnotationTest {
}
}
- static MockRest a = MockRest.build(A.class);
+ static MockRestClient a = MockRestClient.build(A.class);
@Test
public void a01_post() throws Exception {
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
index d7dadf7..1defb76 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
@@ -41,7 +41,7 @@ public class HasQueryAnnotationTest {
return
"p1=["+p1+","+q.containsKey("p1")+"],p2=["+p2+","+q.containsKey("p2")+"]";
}
}
- static MockRest a = MockRest.build(A.class);
+ static MockRestClient a = MockRestClient.build(A.class);
@Test
public void a01_get() throws Exception {
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
index a4d63bc..5f5009f 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
@@ -50,7 +50,7 @@ public class QueryAnnotationTest {
return
"p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1",
String.class)+"],p2=["+p2+","+q.getString("p2")+","+q.get("p2", int.class)+"]";
}
}
- static MockRest a = MockRest.build(A.class);
+ static MockRestClient a = MockRestClient.build(A.class);
@Test
public void a01_get() throws Exception {
@@ -110,7 +110,7 @@ public class QueryAnnotationTest {
return
"p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]";
}
}
- static MockRest b = MockRest.build(B.class);
+ static MockRestClient b = MockRestClient.build(B.class);
@Test
public void b01_get1() throws Exception {
@@ -170,7 +170,7 @@ public class QueryAnnotationTest {
return x;
}
}
- static MockRest c = MockRest.build(C.class);
+ static MockRestClient c = MockRestClient.build(C.class);
@Test
public void c01_StringArray() throws Exception {
@@ -238,7 +238,7 @@ public class QueryAnnotationTest {
.a("f3", f3);
}
}
- static MockRest d = MockRest.build(D.class);
+ static MockRestClient d = MockRestClient.build(D.class);
@Test
public void d01_defaultQuery() throws Exception {
@@ -290,7 +290,7 @@ public class QueryAnnotationTest {
return f1;
}
}
- static MockRest e = MockRest.buildJson(E.class);
+ static MockRestClient e = MockRestClient.buildJson(E.class);
@Test
public void e01_optionalParam_integer() throws Exception {
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
index 4eecbbe..e1b1b5b 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
@@ -79,7 +79,7 @@ public class RestHookTest {
return req.getBody().asType(String.class);
}
}
- static MockRest a = MockRest.build(A.class);
+ static MockRestClient a = MockRestClient.build(A.class);
public static class A01 extends ReaderParser {
public A01(PropertyStore ps) {
@@ -159,7 +159,7 @@ public class RestHookTest {
return null;
}
}
- static MockRest b = MockRest.build(B.class);
+ static MockRestClient b = MockRestClient.build(B.class);
public static class B01 extends WriterSerializer {
public B01(PropertyStore ps) {
@@ -214,7 +214,7 @@ public class RestHookTest {
@Rest(children={C_Super.class,C_Sub.class})
public static class C {}
- static MockRest c = MockRest.build(C.class);
+ static MockRestClient c = MockRestClient.build(C.class);
@Rest(path="/super")
public static class C_Super {
@@ -289,7 +289,7 @@ public class RestHookTest {
//====================================================================================================
@Rest(children={D_Super.class,D_Sub.class})
public static class D {}
- static MockRest d = MockRest.build(D.class);
+ static MockRestClient d = MockRestClient.build(D.class);
@Rest(path="/super")
public static class D_Super {
@@ -387,7 +387,7 @@ public class RestHookTest {
}
)
public static class E {}
- static MockRest e = MockRest.build(E.class);
+ static MockRestClient e = MockRestClient.build(E.class);
@Rest(path="/super")
public static class E_Super {
@@ -502,7 +502,7 @@ public class RestHookTest {
.a("4", res.getHeader("start4-called"));
}
}
- static MockRest f = MockRest.build(F.class);
+ static MockRestClient f = MockRestClient.build(F.class);
public static class F_Parent {
private boolean start1Called;
@@ -553,7 +553,7 @@ public class RestHookTest {
.a("4", res.getHeader("pre4-called"));
}
}
- static MockRest g = MockRest.build(G.class);
+ static MockRestClient g = MockRestClient.build(G.class);
public static class G_Parent {
private boolean pre1Called;
@@ -600,7 +600,7 @@ public class RestHookTest {
return "OK";
}
}
- static MockRest h = MockRest.build(H.class);
+ static MockRestClient h = MockRestClient.build(H.class);
public static class H_Parent {
private boolean post1Called;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
index a8cd9d7..1c681bf 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
@@ -119,19 +119,19 @@ public class RestResourcePojoSwapsTest {
return a; // Should return "A3-1".
}
}
- static MockRest a = MockRest.build(A01.class);
+ static MockRestClient a = MockRestClient.build(A01.class);
@Test
public void a01_classTransformOverridesParentClassTransform() throws
Exception {
a.get("/classTransformOverridesParentClassTransform").json().run().assertBody().is("'A2-0'");
- a.put("/classTransformOverridesParentClassTransform",
"'A2-1'").json().run().assertBody().is("'A2-1'");
- a.put("/classTransformOverridesParentClassTransform/A2-2",
null).json().run().assertBody().is("'A2-2'");
+ a.put("/classTransformOverridesParentClassTransform", "'A2-1'",
"application/json").run().assertBody().is("'A2-1'");
+ a.put("/classTransformOverridesParentClassTransform/A2-2",
null, "application/json").run().assertBody().is("'A2-2'");
}
@Test
public void a02_methodTransformOverridesClassTransform() throws
Exception {
a.get("/methodTransformOverridesClassTransform").json().run().assertBody().is("'A3-0'");
- a.put("/methodTransformOverridesClassTransform",
"'A3-1'").json().run().assertBody().is("'A3-1'");
- a.put("/methodTransformOverridesClassTransform/A3-2",
null).json().run().assertBody().is("'A3-2'");
+ a.put("/methodTransformOverridesClassTransform", "'A3-1'",
"application/json").run().assertBody().is("'A3-1'");
+ a.put("/methodTransformOverridesClassTransform/A3-2", null,
"application/json").run().assertBody().is("'A3-2'");
}
}
