cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] git commit: Updating a WADLGenerator test
Date Tue, 23 Sep 2014 11:20:57 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b7833b308 -> d1cb096f5


Updating a WADLGenerator test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e4659a58
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e4659a58
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e4659a58

Branch: refs/heads/3.0.x-fixes
Commit: e4659a5873859af350bc1f60181befa2f2937a07
Parents: b7833b3
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Sep 23 11:23:32 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Sep 23 12:20:39 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/e4659a58/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
index 86aab24..54baeaf 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
@@ -181,7 +181,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/e4659a58/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 2708cce..5136a2a 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -472,9 +472,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);
@@ -587,8 +586,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"),


Mime
View raw message