You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/09/06 09:42:55 UTC
cxf git commit: [CXF-7493] Adding a test
Repository: cxf
Updated Branches:
refs/heads/master 8c0d43fc9 -> 53479782d
[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/53479782
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53479782
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53479782
Branch: refs/heads/master
Commit: 53479782d9acc56f3b88700941f0b33215661769
Parents: 8c0d43f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 6 10:42:38 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Sep 6 10:42:38 2017 +0100
----------------------------------------------------------------------
.../test/java/org/apache/cxf/jaxrs/Customer.java | 6 +++++-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 16 ++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/53479782/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 54ed359..af7a545 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
@@ -373,6 +373,7 @@ public class Customer extends AbstractCustomer implements CustomerInfo {
}
@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/53479782/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 f8ec86e..2db1313 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,7 +895,7 @@ public class JAXRSUtilsTest extends Assert {
@Test
public void testQueryParamAsListWithDefaultValue() throws Exception {
Class<?>[] argType = {List.class, List.class, List.class, Integer[].class,
- List.class, List.class, List.class};
+ List.class, List.class, List.class, List.class, List.class};
Method m = Customer.class.getMethod("testQueryAsList", argType);
Message messageImpl = createMessage();
ProviderFactory.getInstance(messageImpl)
@@ -906,7 +906,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());
@@ -944,6 +944,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