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 2B9D59C60 for ; Thu, 3 May 2012 16:17:54 +0000 (UTC) Received: (qmail 4506 invoked by uid 500); 3 May 2012 16:17:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 4449 invoked by uid 500); 3 May 2012 16:17:54 -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 4442 invoked by uid 99); 3 May 2012 16:17:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 16:17:54 +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; Thu, 03 May 2012 16:17:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C97D82388978; Thu, 3 May 2012 16:17:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333527 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Date: Thu, 03 May 2012 16:17:30 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503161730.C97D82388978@eris.apache.org> Author: sergeyb Date: Thu May 3 16:17:30 2012 New Revision: 1333527 URL: http://svn.apache.org/viewvc?rev=1333527&view=rev Log: Merged revisions 1333526 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1333526 | sergeyb | 2012-05-03 17:14:38 +0100 (Thu, 03 May 2012) | 1 line [CXF-4281] Adding UriBuilder.fromPath test with the http URI only ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1333526 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java?rev=1333527&r1=1333526&r2=1333527&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Thu May 3 16:17:30 2012 @@ -623,6 +623,14 @@ public class UriBuilderImplTest extends assertEquals(expected, uri.toString()); } + @Test + public void testFromPathUriOnly() { + String expected = "http://localhost:8080"; + + URI uri = UriBuilder.fromPath("http://localhost:8080").build(); + assertEquals(expected, uri.toString()); + } + @Test(expected = IllegalArgumentException.class) public void testQueryParamNameNull() throws Exception { new UriBuilderImpl().queryParam(null, "baz");