Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 627FFC642 for ; Mon, 9 Jul 2012 17:29:35 +0000 (UTC) Received: (qmail 99654 invoked by uid 500); 9 Jul 2012 17:29:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 99604 invoked by uid 500); 9 Jul 2012 17:29:35 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 99595 invoked by uid 99); 9 Jul 2012 17:29:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 17:29:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 17:29:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E6342388980; Mon, 9 Jul 2012 17:29:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1359298 - in /cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs: BookStore.java FaultyRequestHandler.java JAXRSClientServerBookTest.java Date: Mon, 09 Jul 2012 17:29:14 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120709172914.8E6342388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Jul 9 17:29:14 2012 New Revision: 1359298 URL: http://svn.apache.org/viewvc?rev=1359298&view=rev Log: Updates to the test filter to validate that UriInfo.getPathParameters is working as expected Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1359298&r1=1359297&r2=1359298&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Mon Jul 9 17:29:14 2012 @@ -214,6 +214,12 @@ public class BookStore { } @GET + @Path("propogateExceptionVar/{i}") + public Book propogateExceptionWithVar() throws BookNotFoundFault { + return null; + } + + @GET @Path("name-in-query") @Produces("application/xml") @XMLInstruction("") Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java?rev=1359298&r1=1359297&r2=1359298&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java Mon Jul 9 17:29:14 2012 @@ -19,6 +19,7 @@ package org.apache.cxf.systest.jaxrs; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -32,9 +33,16 @@ public class FaultyRequestHandler implem private UriInfo uriInfo; public Response handleRequest(Message m, ClassResourceInfo resourceClass) { - if (uriInfo.getPath().endsWith("/propogateexception4")) { - m.getExchange().put("org.apache.cxf.systest.for-out-fault-interceptor", Boolean.TRUE); - throw new RuntimeException(); + if (uriInfo.getPath().endsWith("/propogateExceptionVar/1")) { + MultivaluedMap vars = uriInfo.getPathParameters(); + if (vars.size() == 1 + && vars.get("i") != null + && vars.get("i").size() == 1 + && "1".equals(vars.getFirst("i"))) { + + m.getExchange().put("org.apache.cxf.systest.for-out-fault-interceptor", Boolean.TRUE); + throw new RuntimeException(); + } } return null; } Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1359298&r1=1359297&r2=1359298&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Mon Jul 9 17:29:14 2012 @@ -378,7 +378,7 @@ public class JAXRSClientServerBookTest e @Test public void testPropogateException4() throws Exception { String data = ""; - getAndCompare("http://localhost:" + PORT + "/bookstore/propogateexception4", + getAndCompare("http://localhost:" + PORT + "/bookstore/propogateExceptionVar/1", data, "application/xml", 500); }