Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 D846898ED for ; Wed, 14 Dec 2011 16:00:43 +0000 (UTC) Received: (qmail 51170 invoked by uid 500); 14 Dec 2011 16:00:43 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 51142 invoked by uid 500); 14 Dec 2011 16:00:43 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 51135 invoked by uid 99); 14 Dec 2011 16:00:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 16:00:43 +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; Wed, 14 Dec 2011 16:00:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46EE22388A36; Wed, 14 Dec 2011 16:00:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214312 - in /jackrabbit/sandbox/microkernel/src: main/java/org/apache/jackrabbit/mk/util/PathUtils.java test/java/org/apache/jackrabbit/mk/util/PathTest.java Date: Wed, 14 Dec 2011 16:00:19 -0000 To: commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214160019.46EE22388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Wed Dec 14 16:00:18 2011 New Revision: 1214312 URL: http://svn.apache.org/viewvc?rev=1214312&view=rev Log: Add test cases and simplify the code. Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java?rev=1214312&r1=1214311&r2=1214312&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java Wed Dec 14 16:00:18 2011 @@ -244,11 +244,8 @@ public class PathUtils { } else if (isAbsolutePath(subPath)) { throw new IllegalArgumentException("Cannot append absolute path " + subPath); } - int parentLen = parentPath.length(); - StringBuilder buff = new StringBuilder( - parentLen + 1 + subPath.length()); - buff.append(parentPath); - if (parentLen > 0 && !denotesRootPath(parentPath)) { + StringBuilder buff = new StringBuilder(parentPath); + if (!denotesRootPath(parentPath)) { buff.append('/'); } buff.append(subPath); Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java?rev=1214312&r1=1214311&r2=1214312&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java (original) +++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java Wed Dec 14 16:00:18 2011 @@ -76,6 +76,28 @@ public class PathTest extends TestCase { assertEquals(child + "/" + child, PathUtils.concat("", child, child)); assertEquals(child, PathUtils.concat("", child, "")); assertEquals(child, PathUtils.concat("", "", child)); + assertEquals(child, PathUtils.concat("", child)); + + assertEquals("/" + child, PathUtils.concat("", "/" + child)); + assertEquals(parent + "/" + child, PathUtils.concat(parent, child)); + try { + PathUtils.concat("/" + parent, "/" + child); + fail(); + } catch (IllegalArgumentException e) { + // expected + } + try { + PathUtils.concat("", "//"); + fail(); + } catch (IllegalArgumentException e) { + // expected + } + try { + PathUtils.concat("/", "/"); + fail(); + } catch (IllegalArgumentException e) { + // expected + } // denotesRoot assertTrue(PathUtils.denotesRoot("/"));