Repository: cxf Updated Branches: refs/heads/3.1.x-fixes c47e3ae4c -> a6bd0f9c0
[CXF-7493] Adding a test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6bd0f9c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6bd0f9c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6bd0f9c Branch: refs/heads/3.1.x-fixes Commit: a6bd0f9c051f56ec01a59ec6029488e10c99a9fc Parents: c47e3ae Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Wed Sep 6 10:42:38 2017 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Wed Sep 6 10:53:17 2017 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/cxf/jaxrs/Customer.java | 10 +++++++--- .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a6bd0f9c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index f55fc1d..4d742ba 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -371,8 +371,9 @@ public class Customer extends AbstractCustomer implements CustomerInfo { public void testQueryIntArray(@QueryParam("query") int[] query) { // complete } - - @Produces("text/xml") + + @Produces("text/xml") + //CHECKSTYLE:OFF public void testQueryAsList( @DefaultValue("default") @QueryParam("query") List<String> queryString, @QueryParam("query2") List<String> queryString2, @@ -380,9 +381,12 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query3") Integer[] queryString3Array, @QueryParam("query4") List<String> queryString4, @QueryParam("query5") List<String> queryString5, - @QueryParam("query3") List<MyType<Integer>> queryString6) { + @QueryParam("query3") List<MyType<Integer>> queryString6, + @QueryParam("query3") List<Long> queryString7, + @QueryParam("query3") List<Double> queryString8) { // complete } + //CHECKSTYLE:ON public static class MyType<T> { private T t; public MyType(T t) { http://git-wip-us.apache.org/repos/asf/cxf/blob/a6bd0f9c/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index 04d5455..008fff9 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -895,8 +895,8 @@ public class JAXRSUtilsTest extends Assert { @SuppressWarnings("unchecked") @Test public void testQueryParamAsListWithDefaultValue() throws Exception { - Class<?>[] argType = {List.class, List.class, List.class, Integer[].class, - List.class, List.class, List.class}; + Class<?>[] argType = {List.class, List.class, List.class, Integer[].class, + List.class, List.class, List.class, List.class, List.class}; Method m = Customer.class.getMethod("testQueryAsList", argType); Message messageImpl = createMessage(); ProviderFactory.getInstance(messageImpl) @@ -907,7 +907,7 @@ public class JAXRSUtilsTest extends Assert { new ClassResourceInfo(Customer.class)), null, messageImpl); - assertEquals(7, params.size()); + assertEquals(9, params.size()); List<String> queryList = (List<String>)params.get(0); assertNotNull(queryList); assertEquals(1, queryList.size()); @@ -945,6 +945,18 @@ public class JAXRSUtilsTest extends Assert { assertEquals(2, queryList6.size()); assertEquals(Integer.valueOf(1), queryList6.get(0).get()); assertEquals(Integer.valueOf(2), queryList6.get(1).get()); + + List<Integer> queryList7 = (List<Integer>)params.get(7); + assertNotNull(queryList7); + assertEquals(2, queryList7.size()); + assertEquals(Long.valueOf(1), queryList7.get(0)); + assertEquals(Long.valueOf(2), queryList7.get(1)); + + List<Integer> queryList8 = (List<Integer>)params.get(8); + assertNotNull(queryList8); + assertEquals(2, queryList8.size()); + assertEquals(Double.valueOf(1), queryList8.get(0)); + assertEquals(Double.valueOf(2), queryList8.get(1)); } @Test
