Repository: incubator-juneau Updated Branches: refs/heads/master 268a3e37f -> 097b81032
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java index 8a19e64..724a3dd 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ContentTest.java @@ -23,7 +23,7 @@ import org.apache.juneau.rest.client.*; import org.apache.juneau.urlencoding.*; import org.junit.*; -public class ContentTest { +public class ContentTest extends RestTestcase { private static String URL = "/testContent"; @@ -41,18 +41,10 @@ public class ContentTest { // } r = c.doPost(URL + "/boolean?body=true", null).getResponseAsString(); assertEquals("true", r); - r = c.doPost(URL + "/boolean?body=(true)", null).getResponseAsString(); - assertEquals("true", r); - r = c.doPost(URL + "/boolean?body=$b(true)", null).getResponseAsString(); - assertEquals("true", r); r = c.doPost(URL + "/boolean?body=false", null).getResponseAsString(); assertEquals("false", r); - r = c.doPost(URL + "/boolean?body=(false)", null).getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/boolean?body=$b(false)", null).getResponseAsString(); - assertEquals("false", r); try { - r = c.doPost(URL + "/boolean?body=%00&noTrace=true", null).getResponseAsString(); + r = c.doPost(URL + "/boolean?body=null&noTrace=true", null).getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -71,17 +63,9 @@ public class ContentTest { // } r = c.doPost(URL + "/Boolean?body=true", null).getResponseAsString(); assertEquals("true", r); - r = c.doPost(URL + "/Boolean?body=(true)", null).getResponseAsString(); - assertEquals("true", r); - r = c.doPost(URL + "/Boolean?body=$b(true)", null).getResponseAsString(); - assertEquals("true", r); r = c.doPost(URL + "/Boolean?body=false", null).getResponseAsString(); assertEquals("false", r); - r = c.doPost(URL + "/Boolean?body=(false)", null).getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/Boolean?body=$b(false)", null).getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/Boolean?body=%00", null).getResponseAsString(); + r = c.doPost(URL + "/Boolean?body=null", null).getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Boolean?body=bad&noTrace=true", null).getResponseAsString(); @@ -96,12 +80,8 @@ public class ContentTest { // } r = c.doPost(URL + "/int?body=-123", null).getResponseAsString(); assertEquals("-123", r); - r = c.doPost(URL + "/int?body=(-123)", null).getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/int?body=$n(-123)", null).getResponseAsString(); - assertEquals("-123", r); try { - r = c.doPost(URL + "/int?body=%00&noTrace=true", null).getResponseAsString(); + r = c.doPost(URL + "/int?body=null&noTrace=true", null).getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -119,11 +99,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Integer?body=-123", null).getResponseAsString(); assertEquals("-123", r); - r = c.doPost(URL + "/Integer?body=(-123)", null).getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/Integer?body=$n(-123)", null).getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/Integer?body=%00", null).getResponseAsString(); + r = c.doPost(URL + "/Integer?body=null", null).getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Integer?body=bad&noTrace=true", null).getResponseAsString(); @@ -138,12 +114,8 @@ public class ContentTest { // } r = c.doPost(URL + "/float?body=-1.23", null).getResponseAsString(); assertEquals("-1.23", r); - r = c.doPost(URL + "/float?body=(-1.23)", null).getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/float?body=$n(-1.23)", null).getResponseAsString(); - assertEquals("-1.23", r); try { - r = c.doPost(URL + "/float?body=%00&noTrace=true", null).getResponseAsString(); + r = c.doPost(URL + "/float?body=null&noTrace=true", null).getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -161,11 +133,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Float?body=-1.23", null).getResponseAsString(); assertEquals("-1.23", r); - r = c.doPost(URL + "/Float?body=(-1.23)", null).getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/Float?body=$n(-1.23)", null).getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/Float?body=%00", null).getResponseAsString(); + r = c.doPost(URL + "/Float?body=null", null).getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Float?body=bad&noTrace=true", null).getResponseAsString(); @@ -180,7 +148,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Map?body=(a=b,c=d)", null).getResponseAsString(); assertEquals("{a:'b',c:'d'}", r); - r = c.doPost(URL + "/Map?body=%00", null).getResponseAsString(); + r = c.doPost(URL + "/Map?body=null", null).getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Map?body=bad&noTrace=true", null).getResponseAsString(); @@ -196,8 +164,6 @@ public class ContentTest { DTOs.B b = DTOs.B.create(); r = c.doPost(URL + "/B?body=" + UonSerializer.DEFAULT.serialize(b), null).getResponseAsString(); assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - r = c.doPost(URL + "/B?body=" + UonSerializer.DEFAULT_SIMPLE.serialize(b), null).getResponseAsString(); - assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); // @RestMethod(name="POST", path="/C") // public DTO2s.C testPojo2(@Body DTO2s.C c) { @@ -206,8 +172,6 @@ public class ContentTest { DTOs.C x = DTOs.C.create(); r = c.doPost(URL + "/C?body=" + UonSerializer.DEFAULT.serialize(x), null).getResponseAsString(); assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - r = c.doPost(URL + "/C?body=" + UonSerializer.DEFAULT_SIMPLE.serialize(x), null).getResponseAsString(); - assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); c.closeQuietly(); } @@ -524,18 +488,10 @@ public class ContentTest { // } r = c.doPost(URL + "/boolean", "true").getResponseAsString(); assertEquals("true", r); - r = c.doPost(URL + "/boolean", "(true)").getResponseAsString(); - assertEquals("true", r); - r = c.doPost(URL + "/boolean", "$b(true)").getResponseAsString(); - assertEquals("true", r); r = c.doPost(URL + "/boolean", "false").getResponseAsString(); assertEquals("false", r); - r = c.doPost(URL + "/boolean", "(false)").getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/boolean", "$b(false)").getResponseAsString(); - assertEquals("false", r); try { - r = c.doPost(URL + "/boolean?noTrace=true", "%00").getResponseAsString(); + r = c.doPost(URL + "/boolean?noTrace=true", "null").getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -554,17 +510,9 @@ public class ContentTest { // } r = c.doPost(URL + "/Boolean", "true").getResponseAsString(); assertEquals("true", r); - r = c.doPost(URL + "/Boolean", "(true)").getResponseAsString(); - assertEquals("true", r); - r = c.doPost(URL + "/Boolean", "$b(true)").getResponseAsString(); - assertEquals("true", r); r = c.doPost(URL + "/Boolean", "false").getResponseAsString(); assertEquals("false", r); - r = c.doPost(URL + "/Boolean", "(false)").getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/Boolean", "$b(false)").getResponseAsString(); - assertEquals("false", r); - r = c.doPost(URL + "/Boolean", "\u0000").getResponseAsString(); + r = c.doPost(URL + "/Boolean", "null").getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Boolean?noTrace=true", "bad").getResponseAsString(); @@ -579,12 +527,8 @@ public class ContentTest { // } r = c.doPost(URL + "/int", "-123").getResponseAsString(); assertEquals("-123", r); - r = c.doPost(URL + "/int", "(-123)").getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/int", "$n(-123)").getResponseAsString(); - assertEquals("-123", r); try { - r = c.doPost(URL + "/int?noTrace=true", "%00").getResponseAsString(); + r = c.doPost(URL + "/int?noTrace=true", "null").getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -602,11 +546,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Integer", "-123").getResponseAsString(); assertEquals("-123", r); - r = c.doPost(URL + "/Integer", "(-123)").getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/Integer", "$n(-123)").getResponseAsString(); - assertEquals("-123", r); - r = c.doPost(URL + "/Integer", "\u0000").getResponseAsString(); + r = c.doPost(URL + "/Integer", "null").getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Integer?noTrace=true", "bad").getResponseAsString(); @@ -621,12 +561,8 @@ public class ContentTest { // } r = c.doPost(URL + "/float", "-1.23").getResponseAsString(); assertEquals("-1.23", r); - r = c.doPost(URL + "/float", "(-1.23)").getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/float", "$n(-1.23)").getResponseAsString(); - assertEquals("-1.23", r); try { - r = c.doPost(URL + "/float?noTrace=true", "\u0000").getResponseAsString(); + r = c.doPost(URL + "/float?noTrace=true", "null").getResponseAsString(); fail("Exception expected!"); } catch (RestCallException e) { assertEquals(400, e.getResponseCode()); @@ -644,11 +580,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Float", "-1.23").getResponseAsString(); assertEquals("-1.23", r); - r = c.doPost(URL + "/Float", "(-1.23)").getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/Float", "$n(-1.23)").getResponseAsString(); - assertEquals("-1.23", r); - r = c.doPost(URL + "/Float", "\u0000").getResponseAsString(); + r = c.doPost(URL + "/Float", "null").getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Float?noTrace=true", "bad").getResponseAsString(); @@ -663,7 +595,7 @@ public class ContentTest { // } r = c.doPost(URL + "/Map", "(a=b,c=d)").getResponseAsString(); assertEquals("{a:'b',c:'d'}", r); - r = c.doPost(URL + "/Map", "\u0000").getResponseAsString(); + r = c.doPost(URL + "/Map", "null").getResponseAsString(); assertEquals("null", r); try { r = c.doPost(URL + "/Map?noTrace=true", "bad").getResponseAsString(); @@ -679,8 +611,6 @@ public class ContentTest { DTOs.B b = DTOs.B.create(); r = c.doPost(URL + "/B", "" + UonSerializer.DEFAULT.serialize(b)).getResponseAsString(); assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - r = c.doPost(URL + "/B", "" + UonSerializer.DEFAULT_SIMPLE.serialize(b)).getResponseAsString(); - assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); // @RestMethod(name="POST", path="/C") // public DTO2s.C testPojo2(@Body DTO2s.C c) { @@ -689,8 +619,6 @@ public class ContentTest { DTOs.C x = DTOs.C.create(); r = c.doPost(URL + "/C", "" + UonSerializer.DEFAULT.serialize(x)).getResponseAsString(); assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); - r = c.doPost(URL + "/C", "" + UonSerializer.DEFAULT_SIMPLE.serialize(x)).getResponseAsString(); - assertEquals("{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}],f19:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]],f20:[[{a:'a',b:1,c:true}],[{a:'a',b:1,c:true}]]}", r); c.closeQuietly(); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DefaultContentTypesTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DefaultContentTypesTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DefaultContentTypesTest.java index a508ee2..aa662d8 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DefaultContentTypesTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DefaultContentTypesTest.java @@ -21,7 +21,7 @@ import org.apache.juneau.rest.client.*; import org.junit.*; -public class DefaultContentTypesTest { +public class DefaultContentTypesTest extends RestTestcase { private static String URL = "/testDefaultContentTypes"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ErrorConditionsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ErrorConditionsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ErrorConditionsTest.java index 46d0f69..7a6f7ce 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ErrorConditionsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ErrorConditionsTest.java @@ -22,7 +22,7 @@ import org.apache.juneau.rest.client.*; import org.junit.*; -public class ErrorConditionsTest { +public class ErrorConditionsTest extends RestTestcase { private static String URL = "/testErrorConditions"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GroupsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GroupsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GroupsTest.java index f28f051..ad0d052 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GroupsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GroupsTest.java @@ -23,7 +23,7 @@ import org.apache.juneau.rest.client.*; import org.junit.*; -public class GroupsTest { +public class GroupsTest extends RestTestcase { private static String URL = "/testGroups"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GzipTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GzipTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GzipTest.java index d73fdb6..4869b64 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GzipTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/GzipTest.java @@ -30,7 +30,7 @@ import org.junit.*; * Note: WAS does automatic gzip decompression on http request messages, so we have to invent * our own 'mycoding' compression. */ -public class GzipTest { +public class GzipTest extends RestTestcase { private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InheritanceTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InheritanceTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InheritanceTest.java index 93500c7..25acda5 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InheritanceTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InheritanceTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class InheritanceTest { +public class InheritanceTest extends RestTestcase { private static RestClient client; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/LargePojosTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/LargePojosTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/LargePojosTest.java index f9e8414..dc5c944 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/LargePojosTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/LargePojosTest.java @@ -20,7 +20,7 @@ import org.apache.juneau.xml.*; import org.junit.*; @Ignore -public class LargePojosTest { +public class LargePojosTest extends RestTestcase { private static String URL = "/testLargePojos"; boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java index 7201784..e833de7 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java @@ -23,7 +23,7 @@ import org.junit.*; /** * Validates that resource bundles can be defined on both parent and child classes. */ -public class MessagesTest { +public class MessagesTest extends RestTestcase { //==================================================================================================== // Return contents of resource bundle. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsPropertyTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsPropertyTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsPropertyTest.java index 770eaf9..ddd9c5d 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsPropertyTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsPropertyTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class NlsPropertyTest { +public class NlsPropertyTest extends RestTestcase { private static String URL = "/testNlsProperty"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsTest.java index 3013a10..6869df8 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NlsTest.java @@ -19,7 +19,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class NlsTest { +public class NlsTest extends RestTestcase { private static String URL = "/testNls"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NoParserInputTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NoParserInputTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NoParserInputTest.java index 7219d05..b63d14a 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NoParserInputTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/NoParserInputTest.java @@ -20,7 +20,7 @@ import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class NoParserInputTest { +public class NoParserInputTest extends RestTestcase { private static String URL = "/testNoParserInput"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPostCallTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPostCallTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPostCallTest.java index 91039cc..aa52ca6 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPostCallTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPostCallTest.java @@ -19,7 +19,7 @@ import java.io.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class OnPostCallTest { +public class OnPostCallTest extends RestTestcase { private static String URL = "/testOnPostCall"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPreCallTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPreCallTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPreCallTest.java index eb845ec..8159dad 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPreCallTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OnPreCallTest.java @@ -19,7 +19,7 @@ import java.io.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class OnPreCallTest { +public class OnPreCallTest extends RestTestcase { private static String URL = "/testOnPreCall"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OptionsWithoutNlsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OptionsWithoutNlsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OptionsWithoutNlsTest.java index 5774864..36529af 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OptionsWithoutNlsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OptionsWithoutNlsTest.java @@ -19,7 +19,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class OptionsWithoutNlsTest { +public class OptionsWithoutNlsTest extends RestTestcase { private static String URL = "/testOptionsWithoutNls"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OverlappingMethodsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OverlappingMethodsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OverlappingMethodsTest.java index fff7a3f..4b4cb43 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OverlappingMethodsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/OverlappingMethodsTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class OverlappingMethodsTest { +public class OverlappingMethodsTest extends RestTestcase { private static String URL = "/testOverlappingMethods"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java index fd42791..9e14c52 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParamsTest.java @@ -27,7 +27,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class ParamsTest { +public class ParamsTest extends RestTestcase { private static String URL = "/testParams"; private static boolean debug = false; @@ -82,12 +82,12 @@ public class ParamsTest { // This should match /get1/{foo} and not /get1/{foo}/{bar} // NOTE: When testing on Tomcat, must specify the following system property: // -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true - String x = "x%2Fy+z"; // [x/y z] + String x = "x%2Fy"; // [x/y] r = client.doGet(URL + "/get1/"+x); - assertEquals("GET /get1a x/y z", r.getResponse(String.class)); + assertEquals("GET /get1a x/y", r.getResponse(String.class)); r = client.doGet(URL + "/get1/"+x+"/"+x); - assertEquals("GET /get1b x/y z,x/y z", r.getResponse(String.class)); + assertEquals("GET /get1b x/y,x/y", r.getResponse(String.class)); r = client.doGet(URL + "/get1/foo"); assertEquals("GET /get1a foo", r.getResponse(String.class)); @@ -137,7 +137,7 @@ public class ParamsTest { // public void doPost(RestRequest req, RestResponse res, Person p) { // res.setOutput("POST, /person, name="+p.name+", age="+p.age+" remainder="+req.getRemainder()); // } - r = client.doPost(URL + "/person/(name=John+Smith,birthDate=Jan+12~,+1952)", ""); + r = client.doPost(URL + "/person/(name='John+Smith',birthDate='Jan+12,+1952')", ""); assertEquals("POST /person/{name=John Smith,birthDate.year=1952} remainder=null", r.getResponse(String.class)); // Fall through to top-level POST @@ -218,11 +218,11 @@ public class ParamsTest { String r; String url = URL + "/testPlainParamGet"; - r = client.doGet(url + "?p1=(p1)").getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); + r = client.doGet(url + "?p1=p1").getResponseAsString(); + assertEquals("p1=[p1,p1,p1]", r); - r = client.doGet(url + "?p1=$s(p1)").getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); + r = client.doGet(url + "?p1='p1'").getResponseAsString(); + assertEquals("p1=['p1','p1',p1]", r); client.closeQuietly(); } @@ -237,28 +237,28 @@ public class ParamsTest { String url = URL + "/testParamPost"; r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("p1=[p1,p1,p1],p2=[2,$n(2),2]", r); + assertEquals("p1=[p1,p1,p1],p2=[2,2,2]", r); r = client.doFormPost(url, new ObjectMap("{p1:null,p2:0}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[0,$n(0),0]", r); + assertEquals("p1=[null,null,null],p2=[0,0,0]", r); r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); assertEquals("p1=[null,null,null],p2=[0,null,0]", r); r = client.doFormPost(url, new ObjectMap("{p1:null}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[0,null,0]", r); + assertEquals("p1=[null,null,null],p2=[0,null,0]", r); r = client.doFormPost(url, new ObjectMap("{p2:0}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,$n(0),0]", r); + assertEquals("p1=[null,null,null],p2=[0,0,0]", r); r = client.doFormPost(url, new ObjectMap("{p1:'foo',p2:0}")).getResponseAsString(); - assertEquals("p1=[foo,foo,foo],p2=[0,$n(0),0]", r); + assertEquals("p1=[foo,foo,foo],p2=[0,0,0]", r); r = client.doFormPost(url, new ObjectMap("{p1:null,p2:1}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[1,$n(1),1]", r); + assertEquals("p1=[null,null,null],p2=[1,1,1]", r); r = client.doFormPost(url, new ObjectMap("{p1:'a/b%c=d e,f/g%h=i j',p2:1}")).getResponseAsString(); - assertEquals("p1=[a/b%c=d e,f/g%h=i j,a/b%c=d e,f/g%h=i j,a/b%c=d e,f/g%h=i j],p2=[1,$n(1),1]", r); + assertEquals("p1=[a/b%c=d e,f/g%h=i j,'a/b%c=d e,f/g%h=i j',a/b%c=d e,f/g%h=i j],p2=[1,1,1]", r); client.closeQuietly(); } @@ -273,18 +273,18 @@ public class ParamsTest { String url = URL + "/testPlainParamPost"; List<NameValuePair> nvps = new ArrayList<NameValuePair>(); - nvps.add(new BasicNameValuePair("p1", "(p1)")); + nvps.add(new BasicNameValuePair("p1", "p1")); HttpEntity he = new UrlEncodedFormEntity(nvps); r = client.doPost(url, he).getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); + assertEquals("p1=[p1,p1,p1]", r); nvps = new ArrayList<NameValuePair>(); - nvps.add(new BasicNameValuePair("p1", "$s(p1)")); + nvps.add(new BasicNameValuePair("p1", "'p1'")); he = new UrlEncodedFormEntity(nvps); r = client.doFormPost(url, he).getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); + assertEquals("p1=['p1','p1',p1]", r); client.closeQuietly(); } @@ -335,11 +335,11 @@ public class ParamsTest { String r; String url = URL + "/testPlainQParamGet"; - r = client.doGet(url + "?p1=(p1)").getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); + r = client.doGet(url + "?p1=p1").getResponseAsString(); + assertEquals("p1=[p1,p1,p1]", r); - r = client.doGet(url + "?p1=$s(p1)").getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); + r = client.doGet(url + "?p1='p1'").getResponseAsString(); + assertEquals("p1=['p1','p1',p1]", r); client.closeQuietly(); } @@ -652,22 +652,22 @@ public class ParamsTest { + "&f02=c&f02=d" + "&f03=1&f03=2" + "&f04=3&f04=4" - + "&f05=(e,f)&f05=(g,h)" - + "&f06=(i,j)&f06=(k,l)" + + "&f05=@(e,f)&f05=@(g,h)" + + "&f06=@(i,j)&f06=@(k,l)" + "&f07=(a=a,b=1,c=true)&f07=(a=b,b=2,c=false)" + "&f08=(a=a,b=1,c=true)&f08=(a=b,b=2,c=false)" - + "&f09=((a=a,b=1,c=true))&f09=((a=b,b=2,c=false))" - + "&f10=((a=a,b=1,c=true))&f10=((a=b,b=2,c=false))" + + "&f09=@((a=a,b=1,c=true))&f09=@((a=b,b=2,c=false))" + + "&f10=@((a=a,b=1,c=true))&f10=@((a=b,b=2,c=false))" + "&f11=a&f11=b" + "&f12=c&f12=d" + "&f13=1&f13=2" + "&f14=3&f14=4" - + "&f15=(e,f)&f15=(g,h)" - + "&f16=(i,j)&f16=(k,l)" + + "&f15=@(e,f)&f15=@(g,h)" + + "&f16=@(i,j)&f16=@(k,l)" + "&f17=(a=a,b=1,c=true)&f17=(a=b,b=2,c=false)" + "&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))"; + + "&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))"; r = client.doPost(url, new StringEntity(in)).getResponseAsString(); assertEquals(in, r); @@ -692,22 +692,22 @@ public class ParamsTest { + "&f02=c&f02=d" + "&f03=1&f03=2" + "&f04=3&f04=4" - + "&f05=(e,f)&f05=(g,h)" - + "&f06=(i,j)&f06=(k,l)" + + "&f05=@(e,f)&f05=@(g,h)" + + "&f06=@(i,j)&f06=@(k,l)" + "&f07=(a=a,b=1,c=true)&f07=(a=b,b=2,c=false)" + "&f08=(a=a,b=1,c=true)&f08=(a=b,b=2,c=false)" - + "&f09=((a=a,b=1,c=true))&f09=((a=b,b=2,c=false))" - + "&f10=((a=a,b=1,c=true))&f10=((a=b,b=2,c=false))" + + "&f09=@((a=a,b=1,c=true))&f09=@((a=b,b=2,c=false))" + + "&f10=@((a=a,b=1,c=true))&f10=@((a=b,b=2,c=false))" + "&f11=a&f11=b" + "&f12=c&f12=d" + "&f13=1&f13=2" + "&f14=3&f14=4" - + "&f15=(e,f)&f15=(g,h)" - + "&f16=(i,j)&f16=(k,l)" + + "&f15=@(e,f)&f15=@(g,h)" + + "&f16=@(i,j)&f16=@(k,l)" + "&f17=(a=a,b=1,c=true)&f17=(a=b,b=2,c=false)" + "&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))"; + + "&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))"; r = client.doPost(url, new StringEntity(in)).getResponseAsString(); assertEquals(in, r); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParsersTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParsersTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParsersTest.java index 8d2a0d4..48f86ce 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParsersTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/ParsersTest.java @@ -20,7 +20,7 @@ import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class ParsersTest { +public class ParsersTest extends RestTestcase { private static String URL = "/testParsers"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathTest.java index 5af0423..733a685 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class PathTest { +public class PathTest extends RestTestcase { private static String URL = "/testPath"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java index 1561e27..4282a80 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PathsTest.java @@ -19,7 +19,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class PathsTest { +public class PathsTest extends RestTestcase { private static String URL = "/testPaths"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PropertiesTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PropertiesTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PropertiesTest.java index ed4d6f5..67b827a 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PropertiesTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/PropertiesTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class PropertiesTest { +public class PropertiesTest extends RestTestcase { private static String URL = "/testProperties"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestClientTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestClientTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestClientTest.java index ad22033..7902f5b 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestClientTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestClientTest.java @@ -23,7 +23,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class RestClientTest { +public class RestClientTest extends RestTestcase { private static String URL = "/testRestClient"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java new file mode 100644 index 0000000..70d4a5d --- /dev/null +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestTestcase.java @@ -0,0 +1,36 @@ +// *************************************************************************************************************************** +// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * +// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * +// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * +// * with the License. You may obtain a copy of the License at * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.rest.test; + +import org.junit.*; + +/** + * Superclass of REST testcases that start up the REST test microservice before running the tests locally. + * + * @author James Bognar ([email protected]) + */ +public class RestTestcase { + + private static boolean microserviceStarted; + + @BeforeClass + public static void setUp() { + microserviceStarted = TestMicroservice.startMicroservice(); + } + + @AfterClass + public static void tearDown() { + if (microserviceStarted) + TestMicroservice.stopMicroservice(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestUtilsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestUtilsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestUtilsTest.java index 45f0eb7..23ad14d 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestUtilsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/RestUtilsTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.*; import org.junit.*; -public class RestUtilsTest { +public class RestUtilsTest extends RestTestcase { //==================================================================================================== // decode(String) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/SerializersTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/SerializersTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/SerializersTest.java index 515f384..ab0649c 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/SerializersTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/SerializersTest.java @@ -20,7 +20,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class SerializersTest { +public class SerializersTest extends RestTestcase { private static String URL = "/testSerializers"; private static boolean debug = false; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/StaticFilesTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/StaticFilesTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/StaticFilesTest.java index e71510b..96e31f8 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/StaticFilesTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/StaticFilesTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class StaticFilesTest { +public class StaticFilesTest extends RestTestcase { private static String URL = "/testStaticFiles"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java new file mode 100644 index 0000000..8c5300f --- /dev/null +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java @@ -0,0 +1,60 @@ +// *************************************************************************************************************************** +// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * +// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * +// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * +// * with the License. You may obtain a copy of the License at * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.rest.test; + +import java.util.*; + +import org.apache.juneau.microservice.*; + +/** + * Utility class for starting up the tests microservice. + * @author james.bognar + */ +public class TestMicroservice { + static Microservice microservice; + + /** + * Starts the microservice. + * @return <jk>true</jk> if the service started, <jk>false</jk> if it's already started. + * If this returns <jk>false</jk> then don't call stopMicroservice()!. + */ + public static boolean startMicroservice() { + if (microservice != null) + return false; + try { + Locale.setDefault(Locale.US); + microservice = new RestMicroservice() + .setConfig("juneau-rest-test.cfg", false) + .setManifestContents( + "Test-Entry: test-value" + ); + microservice.start(); + return true; + } catch (Throwable e) { + System.err.println(e); // NOT DEBUG + return false; + } + } + + /** + * Stops the microservice. + */ + public static void stopMicroservice() { + try { + microservice.stop(); + microservice = null; + } catch (Exception e) { + System.err.println(e); // NOT DEBUG + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestUtils.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestUtils.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestUtils.java index a1cd6c2..164a04e 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestUtils.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestUtils.java @@ -44,7 +44,7 @@ public class TestUtils { public static void checkErrorResponse(boolean debug, RestCallException e, int status, String...contains) throws AssertionFailedError { String r = e.getResponseMessage(); if (debug) { - System.err.println(r); + System.err.println(r); // NOT DEBUG e.printStackTrace(); } if (status != e.getResponseCode()) @@ -52,7 +52,7 @@ public class TestUtils { for (String s : contains) { if (r == null || ! r.contains(s)) { if (! debug) - System.err.println(r); + System.err.println(r); // NOT DEBUG throw new AssertionFailedError(MessageFormat.format("Response did not have the following expected text: ''{0}''", s)); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java index aafc861..d758fd8 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class TransformsTest { +public class TransformsTest extends RestTestcase { private static String URL = "/testTransforms"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java index 673ef83..42ed4ab 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrisTest.java @@ -24,7 +24,7 @@ import org.junit.*; /** * Verifies that all the RestRequest.getXXX() methods involving URIs work correctly. */ -public class UrisTest { +public class UrisTest extends RestTestcase { private static String URL2 = Constants.getServerTestUrl() + "/testuris"; // /jazz/juneau/sample/testuris private static int port = getPort(Constants.getServerTestUrl()); // 9443 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlContentTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlContentTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlContentTest.java index a4424b4..4ecee25 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlContentTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlContentTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.*; import org.apache.juneau.rest.client.*; import org.junit.*; -public class UrlContentTest { +public class UrlContentTest extends RestTestcase { private static String URL = "/testUrlContent"; private static RestClient client; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java index c122074..f577d5f 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java @@ -20,7 +20,7 @@ import org.apache.juneau.json.*; import org.apache.juneau.rest.*; import org.junit.*; -public class UrlPathPatternTest { +public class UrlPathPatternTest extends RestTestcase { @Test public void testComparison() throws Exception { List<UrlPathPattern> l = new LinkedList<UrlPathPattern>(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java index 43f1b6e..2eb975c 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java @@ -12,9 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; -import java.util.*; - -import org.apache.juneau.microservice.*; import org.junit.*; import org.junit.runner.*; import org.junit.runners.*; @@ -64,29 +61,14 @@ import org.junit.runners.Suite.*; UrlPathPatternTest.class }) public class _TestSuite { - static Microservice microservice; @BeforeClass public static void setUp() { - try { - Locale.setDefault(Locale.US); - microservice = new RestMicroservice() - .setConfig("juneau-rest-test.cfg", false) - .setManifestContents( - "Test-Entry: test-value" - ); - microservice.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } + TestMicroservice.startMicroservice(); } @AfterClass public static void tearDown() { - try { - microservice.stop(); - } catch (Exception e) { - throw new RuntimeException(e); - } + TestMicroservice.stopMicroservice(); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java index 7269178..64a5a2a 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java @@ -761,9 +761,10 @@ public final class RestRequest extends HttpServletRequestWrapper { * <li>This method returns the raw unparsed value, and differs from calling <code>getFormDataParameter(name, String.<jk>class</js>)</code> * which will convert the value from UON notation: * <ul> - * <li><js>"\u0000"</js> => <jk>null</jk> - * <li><js>"$s(foo)"</js> => <js>"foo"</js> - * <li><js>"(foo)"</js> => <js>"foo"</js> + * <li><js>"null"</js> => <jk>null</jk> + * <li><js>"'null'"</js> => <js>"null"</js> + * <li><js>"'foo bar'"</js> => <js>"foo bar"</js> + * <li><js>"foo~~bar"</js> => <js>"foo~bar"</js> * </ul> * </ul> * @@ -1643,7 +1644,7 @@ public final class RestRequest extends HttpServletRequestWrapper { ParserMatch pm = parserGroup.getParserMatch(mediaType); // If no patching parser for URL-encoding, use the one defined on the servlet. - if (pm == null && mediaType.equals("application/x-www-form-urlencoded")) + if (pm == null && mediaType.equals(MediaType.URLENCODING)) pm = new ParserMatch(MediaType.URLENCODING, urlEncodingParser); return pm; @@ -1900,13 +1901,18 @@ public final class RestRequest extends HttpServletRequestWrapper { private <T> T parseParameter(String val, ClassMeta<T> c) throws ParseException { if (val == null) return null; - // Shortcut - If we're returning a string and the value doesn't start with '$' or '(', then + + // Shortcut - If we're returning a string and the value doesn't start with "'" or is "null", then // just return the string since it's a plain value. + // This allows us to bypass the creation of a UonParserSession object. if (c.getInnerClass() == String.class && val.length() > 0) { char x = val.charAt(0); - if (x != '(' && x != '$' && x != '\u0000' && val.indexOf('~') == -1) + if (x != '\'' && x != 'n' && val.indexOf('~') == -1) return (T)val; + if (x == 'n' && "null".equals(val)) + return null; } + return urlEncodingParser.parseParameter(val, c); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java index f61c213..a95ae6d 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java @@ -78,21 +78,11 @@ import org.apache.juneau.xml.*; * <td>{@link UonSerializer}</td> * </tr> * <tr> - * <td class='code'>text/uon-simple</td> - * <td class='code'>text/uon</td> - * <td>{@link org.apache.juneau.urlencoding.UonSerializer.Simple}</td> - * </tr> - * <tr> * <td class='code'>application/x-www-form-urlencoded</td> * <td class='code'>application/x-www-form-urlencoded</td> * <td>{@link UrlEncodingSerializer}</td> * </tr> * <tr> - * <td class='code'>application/x-www-form-urlencoded-simple</td> - * <td class='code'>application/x-www-form-urlencoded</td> - * <td>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer.Simple}</td> - * </tr> - * <tr> * <td class='code'>text/xml+soap</td> * <td class='code'>text/xml</td> * <td>{@link SoapXmlSerializer}</td> @@ -178,9 +168,7 @@ import org.apache.juneau.xml.*; XmlDocSerializer.class, XmlSchemaDocSerializer.class, UonSerializer.class, - UonSerializer.Simple.class, UrlEncodingSerializer.class, - UrlEncodingSerializer.Simple.class, MsgPackSerializer.class, SoapXmlSerializer.class, PlainTextSerializer.class, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java index ce8823a..f2d7ae5 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java @@ -83,21 +83,11 @@ import org.apache.juneau.xml.*; * <td>{@link UonSerializer}</td> * </tr> * <tr> - * <td class='code'>text/uon-simple</td> - * <td class='code'>text/uon</td> - * <td>{@link org.apache.juneau.urlencoding.UonSerializer.Simple}</td> - * </tr> - * <tr> * <td class='code'>application/x-www-form-urlencoded</td> * <td class='code'>application/x-www-form-urlencoded</td> * <td>{@link UrlEncodingSerializer}</td> * </tr> * <tr> - * <td class='code'>application/x-www-form-urlencoded-simple</td> - * <td class='code'>application/x-www-form-urlencoded</td> - * <td>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer.Simple}</td> - * </tr> - * <tr> * <td class='code'>text/xml+soap</td> * <td class='code'>text/xml</td> * <td>{@link SoapXmlSerializer}</td> @@ -209,9 +199,7 @@ import org.apache.juneau.xml.*; XmlDocSerializer.Simple.class, XmlSchemaDocSerializer.class, UonSerializer.class, - UonSerializer.Simple.class, UrlEncodingSerializer.class, - UrlEncodingSerializer.Simple.class, MsgPackSerializer.class, SoapXmlSerializer.class, JavaSerializedObjectSerializer.class, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/097b8103/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java index 1e1d1bd..52650e1 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java @@ -55,7 +55,7 @@ public class DefaultHandler implements ResponseHandler { try { ObjectMap p = res.getProperties(); if (req.isPlainText()) { - p.put(SerializerContext.SERIALIZER_useIndentation, true); + p.put(SerializerContext.SERIALIZER_useWhitespace, true); res.setContentType("text/plain"); } p.append("mediaType", mediaType).append("characterEncoding", res.getCharacterEncoding());
