Repository: incubator-juneau Updated Branches: refs/heads/master 3e79baeb0 -> 21f238a42
Interface proxy testcases. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/21f238a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/21f238a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/21f238a4 Branch: refs/heads/master Commit: 21f238a42c216e85302bf24365fcc467f4d1e7fb Parents: 3e79bae Author: JamesBognar <[email protected]> Authored: Tue Mar 28 17:18:55 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Tue Mar 28 17:18:55 2017 -0400 ---------------------------------------------------------------------- .../apache/juneau/rest/test/InterfaceProxy.java | 10 +++--- .../rest/test/InterfaceProxyResource.java | 32 ++++++++++---------- .../juneau/rest/test/InterfaceProxyTest.java | 18 ++++++----- 3 files changed, 32 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/21f238a4/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java index 787efe3..ecc26b3 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java @@ -25,6 +25,8 @@ import org.apache.juneau.transform.*; */ public interface InterfaceProxy { + public static final String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/"; + //-------------------------------------------------------------------------------- // Test return types. //-------------------------------------------------------------------------------- @@ -188,13 +190,13 @@ public interface InterfaceProxy { public static class SwappedPojoSwap extends PojoSwap<SwappedPojo,String> { @Override public String swap(BeanSession session, SwappedPojo c) throws SerializeException { - return "[{(<swapped>)}]"; // Use special characters. + return SWAP; } @Override public SwappedPojo unswap(BeanSession session, String f, ClassMeta<?> hint) throws ParseException { SwappedPojo c = new SwappedPojo(); - if (f.equals("[{(<swapped>)}]")) + if (f.equals(SWAP)) c.wasUnswapped = true; return c; } @@ -205,12 +207,12 @@ public interface InterfaceProxy { public boolean wasUnswapped; @Override public String toString() { - return "[{(<swapped>)}]"; + return SWAP; } public ImplicitSwappedPojo() { } public ImplicitSwappedPojo(String fromString) { - if (fromString.equals("[{(<swapped>)}]")) + if (fromString.equals(SWAP)) wasUnswapped = true; } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/21f238a4/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java index 18fa8e9..ade87a1 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java @@ -356,19 +356,19 @@ public class InterfaceProxyResource extends RestServletJenaDefault { } @Override public void setSwappedPojo3dArray(SwappedPojo[][][] x) { - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } @Override public void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x) { - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue().wasUnswapped); } @Override public void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x) { - assertObjectEquals("{'[{(<swapped>)}]':[[['[{(<swapped>)}]',null],null],null]}", x); + assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue()[0][0][0].wasUnswapped); @@ -381,19 +381,19 @@ public class InterfaceProxyResource extends RestServletJenaDefault { } @Override public void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x) { - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } @Override public void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) { - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue().wasUnswapped); } @Override public void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) { - assertObjectEquals("{'[{(<swapped>)}]':[[['[{(<swapped>)}]',null],null],null]}", x); + assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue()[0][0][0].wasUnswapped); @@ -509,28 +509,28 @@ public class InterfaceProxyResource extends RestServletJenaDefault { } @Override public void setMultiParamsSwappedPojo(SwappedPojo x1, SwappedPojo[][][] x2, SwappedPojo[][][] x2n, List<SwappedPojo[][][]> x3, List<SwappedPojo[][][]> x3n, Map<SwappedPojo,SwappedPojo> x4, Map<SwappedPojo,SwappedPojo> x4n, Map<SwappedPojo,List<SwappedPojo[][][]>> x5, Map<SwappedPojo,List<SwappedPojo[][][]>> x5n) { - assertObjectEquals("'[{(<swapped>)}]'", x1); - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x2); + assertObjectEquals("'"+SWAP+"'", x1); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2); assertNull(x2n); - assertObjectEquals("[[[['[{(<swapped>)}]',null],null],null],null]", x3); + assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3); assertEquals(SwappedPojo[][][].class, x3.get(0).getClass()); assertNull(x3n); - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x4); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4); assertNull(x4n); - assertObjectEquals("{'[{(<swapped>)}]':[[[['[{(<swapped>)}]',null],null],null],null]}", x5); + assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5); assertNull(x5n); } @Override public void setMultiParamsImplicitSwappedPojo(ImplicitSwappedPojo x1, ImplicitSwappedPojo[][][] x2, ImplicitSwappedPojo[][][] x2n, List<ImplicitSwappedPojo[][][]> x3, List<ImplicitSwappedPojo[][][]> x3n, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4, Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x4n, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5, Map<ImplicitSwappedPojo,List<ImplicitSwappedPojo[][][]>> x5n) { - assertObjectEquals("'[{(<swapped>)}]'", x1); - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x2); + assertObjectEquals("'"+SWAP+"'", x1); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x2); assertNull(x2n); - assertObjectEquals("[[[['[{(<swapped>)}]',null],null],null],null]", x3); + assertObjectEquals("[[[['"+SWAP+"',null],null],null],null]", x3); assertEquals(ImplicitSwappedPojo[][][].class, x3.get(0).getClass()); assertNull(x3n); - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x4); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x4); assertNull(x4n); - assertObjectEquals("{'[{(<swapped>)}]':[[[['[{(<swapped>)}]',null],null],null],null]}", x5); + assertObjectEquals("{'"+SWAP+"':[[[['"+SWAP+"',null],null],null],null]}", x5); assertNull(x5n); } @Override http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/21f238a4/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java index 7840798..b7d9928 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java @@ -12,6 +12,7 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.rest.test.InterfaceProxy.*; import static org.apache.juneau.rest.test.TestUtils.*; import static org.junit.Assert.*; @@ -31,6 +32,7 @@ import org.junit.*; import org.junit.runner.*; import org.junit.runners.*; +@SuppressWarnings("unused") @RunWith(Parameterized.class) public class InterfaceProxyTest extends RestTestcase { @@ -215,21 +217,21 @@ public class InterfaceProxyTest extends RestTestcase { @Test public void returnSwappedPojo() { SwappedPojo x = getProxy().returnSwappedPojo(); - assertObjectEquals("'[{(<swapped>)}]'", x); + assertObjectEquals("'"+SWAP+"'", x); assertTrue(x.wasUnswapped); } @Test public void returnSwappedPojo3dArray() { SwappedPojo[][][] x = getProxy().returnSwappedPojo3dArray(); - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } @Test public void returnSwappedPojoMap() { Map<SwappedPojo,SwappedPojo> x = getProxy().returnSwappedPojoMap(); - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue().wasUnswapped); @@ -238,7 +240,7 @@ public class InterfaceProxyTest extends RestTestcase { @Test public void returnSwappedPojo3dMap() { Map<SwappedPojo,SwappedPojo[][][]> x = getProxy().returnSwappedPojo3dMap(); - assertObjectEquals("{'[{(<swapped>)}]':[[['[{(<swapped>)}]',null],null],null]}", x); + assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue()[0][0][0].wasUnswapped); @@ -248,21 +250,21 @@ public class InterfaceProxyTest extends RestTestcase { @Test public void returnImplicitSwappedPojo() { ImplicitSwappedPojo x = getProxy().returnImplicitSwappedPojo(); - assertObjectEquals("'[{(<swapped>)}]'", x); + assertObjectEquals("'"+SWAP+"'", x); assertTrue(x.wasUnswapped); } @Test public void returnImplicitSwappedPojo3dArray() { ImplicitSwappedPojo[][][] x = getProxy().returnImplicitSwappedPojo3dArray(); - assertObjectEquals("[[['[{(<swapped>)}]',null],null],null]", x); + assertObjectEquals("[[['"+SWAP+"',null],null],null]", x); assertTrue(x[0][0][0].wasUnswapped); } @Test public void returnImplicitSwappedPojoMap() { Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x = getProxy().returnImplicitSwappedPojoMap(); - assertObjectEquals("{'[{(<swapped>)}]':'[{(<swapped>)}]'}", x); + assertObjectEquals("{'"+SWAP+"':'"+SWAP+"'}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue().wasUnswapped); @@ -271,7 +273,7 @@ public class InterfaceProxyTest extends RestTestcase { @Test public void returnImplicitSwappedPojo3dMap() { Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x = getProxy().returnImplicitSwappedPojo3dMap(); - assertObjectEquals("{'[{(<swapped>)}]':[[['[{(<swapped>)}]',null],null],null]}", x); + assertObjectEquals("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}", x); Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next(); assertTrue(e.getKey().wasUnswapped); assertTrue(e.getValue()[0][0][0].wasUnswapped);
