Repository: cxf Updated Branches: refs/heads/master 15d6a26ab -> 333a2c022
Try to get test to pass Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/333a2c02 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/333a2c02 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/333a2c02 Branch: refs/heads/master Commit: 333a2c022f8c5dd81e99b993cd7878f2b9bf10ba Parents: 15d6a26 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Jul 31 16:29:38 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Jul 31 16:29:38 2017 -0400 ---------------------------------------------------------------------- .../AbstractSwagger2ServiceDescriptionTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/333a2c02/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java index 70bac6d..02be718 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java @@ -127,26 +127,29 @@ public abstract class AbstractSwagger2ServiceDescriptionTest extends AbstractBus assertNotNull(urs); assertEquals(1, urs.size()); UserResource r = urs.get(0); - assertEquals("/bookstore", r.getPath()); + String basePath = ""; + if (!"/".equals(r.getPath())) { + basePath = r.getPath(); + } Map<String, UserOperation> map = r.getOperationsAsMap(); assertEquals(3, map.size()); UserOperation getBooksOp = map.get("getBooks"); assertEquals(HttpMethod.GET, getBooksOp.getVerb()); - assertEquals("/", getBooksOp.getPath()); + assertEquals("/bookstore", basePath + getBooksOp.getPath()); assertEquals(MediaType.APPLICATION_JSON, getBooksOp.getProduces()); List<Parameter> getBooksOpParams = getBooksOp.getParameters(); assertEquals(1, getBooksOpParams.size()); assertEquals(ParameterType.QUERY, getBooksOpParams.get(0).getType()); UserOperation getBookOp = map.get("getBook"); assertEquals(HttpMethod.GET, getBookOp.getVerb()); - assertEquals("/{id}", getBookOp.getPath()); + assertEquals("/bookstore/{id}", basePath + getBookOp.getPath()); assertEquals(MediaType.APPLICATION_JSON, getBookOp.getProduces()); List<Parameter> getBookOpParams = getBookOp.getParameters(); assertEquals(1, getBookOpParams.size()); assertEquals(ParameterType.PATH, getBookOpParams.get(0).getType()); UserOperation deleteOp = map.get("delete"); assertEquals(HttpMethod.DELETE, deleteOp.getVerb()); - assertEquals("/{id}", deleteOp.getPath()); + assertEquals("/bookstore/{id}", basePath + deleteOp.getPath()); List<Parameter> delOpParams = deleteOp.getParameters(); assertEquals(1, delOpParams.size()); assertEquals(ParameterType.PATH, delOpParams.get(0).getType());
