Repository: cxf Updated Branches: refs/heads/2.7.x-fixes ee6f81428 -> bfd939ce0
Updating WadlGeneratorTest on 2.7.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bfd939ce Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bfd939ce Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bfd939ce Branch: refs/heads/2.7.x-fixes Commit: bfd939ce0adbc64f337e97eb8f697f72dd21c9c6 Parents: ee6f814 Author: Sergey Beryozkin <[email protected]> Authored: Wed Oct 8 12:36:38 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Oct 8 12:36:38 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/model/wadl/BookStore.java | 2 +- .../apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bfd939ce/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java index 9ce8ae5..3aeb23f 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java @@ -179,7 +179,7 @@ public class BookStore implements BookDescription { public int getA() { return a; } - @PathParam("a") + @HeaderParam("a") public void setA(int a) { this.a = a; } http://git-wip-us.apache.org/repos/asf/cxf/blob/bfd939ce/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java index 74ebed3..c842840 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java @@ -471,9 +471,8 @@ public class WadlGeneratorTest extends Assert { // verify root resource starting with "/" // must have a single template parameter - verifyParameters(resource, 2, - new Param("id", "template", "xs:long"), - new Param("a", "template", "xs:int")); + verifyParameters(resource, 1, + new Param("id", "template", "xs:long")); // must have 4 methods, 2 GETs, POST and PUT List<Element> methodEls = getElements(resource, "method", 4); @@ -586,8 +585,9 @@ public class WadlGeneratorTest extends Assert { // check request List<Element> requestEls = getElements(methodEl, "request", 1); - // 6 parameters are expected - verifyParameters(requestEls.get(0), 6, + // 7 parameters are expected + verifyParameters(requestEls.get(0), 7, + new Param("a", "header", "xs:int"), new Param("b", "query", "xs:int"), new Param("aProp", "query", "xs:int"), new Param("c.a", "query", "xs:int"),
