Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-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 4D47C9A3A for ; Sun, 7 Oct 2012 20:39:04 +0000 (UTC) Received: (qmail 7606 invoked by uid 500); 7 Oct 2012 20:39:04 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 7530 invoked by uid 500); 7 Oct 2012 20:39:04 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 7522 invoked by uid 99); 7 Oct 2012 20:39:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 20:39:04 +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; Sun, 07 Oct 2012 20:39:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0FB8F238896F; Sun, 7 Oct 2012 20:38:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1395380 - /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java Date: Sun, 07 Oct 2012 20:38:17 -0000 To: commits@maven.apache.org From: rfscholte@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121007203818.0FB8F238896F@eris.apache.org> Author: rfscholte Date: Sun Oct 7 20:38:16 2012 New Revision: 1395380 URL: http://svn.apache.org/viewvc?rev=1395380&view=rev Log: Make PathToolTest OS-specific, some path-resolving methods won't work everywhere Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java?rev=1395380&r1=1395379&r2=1395380&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java Sun Oct 7 20:38:16 2012 @@ -20,6 +20,7 @@ package org.apache.maven.shared.utils; */ import org.hamcrest.CoreMatchers; +import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.Assert; @@ -82,6 +83,8 @@ public class PathToolTest extends Assert // Keep in sync with testGetRelativeFilePath_Windows() public void testGetRelativeFilePath_NonWindows() { + Assume.assumeThat( File.separatorChar, is( '/' ) ); + assertThat( PathTool.getRelativeFilePath( null, null ) , is( "" ) ); @@ -117,6 +120,8 @@ public class PathToolTest extends Assert // Keep in sync with testGetRelativeFilePath_NonWindows() public void testGetRelativeFilePath_Windows() { + Assume.assumeThat( File.separatorChar, is( '\\' ) ); + assertThat( PathTool.getRelativeFilePath( null, null ) , is( "" ) );