Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 29030 invoked from network); 6 Aug 2008 09:39:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Aug 2008 09:39:55 -0000 Received: (qmail 79789 invoked by uid 500); 6 Aug 2008 09:39:54 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 79769 invoked by uid 500); 6 Aug 2008 09:39:54 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 79758 invoked by uid 99); 6 Aug 2008 09:39:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2008 02:39:54 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 06 Aug 2008 09:39:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CAA32388852; Wed, 6 Aug 2008 02:39:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r683200 - in /ant/ivy/core/trunk/test/java/org/apache/ivy: ant/IvyAntSettingsTest.java ant/IvyConfigureTest.java core/NormalRelativeUrlResolverTest.java Date: Wed, 06 Aug 2008 09:39:33 -0000 To: notifications@ant.apache.org From: gscokart@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080806093934.1CAA32388852@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gscokart Date: Wed Aug 6 02:39:32 2008 New Revision: 683200 URL: http://svn.apache.org/viewvc?rev=683200&view=rev Log: fix unit test on IBM JVM (probably broken by IVY-868) Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java?rev=683200&r1=683199&r2=683200&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsTest.java Wed Aug 6 02:39:32 2008 @@ -100,7 +100,7 @@ assertEquals(new File("build/cache"), settings.getDefaultCache()); assertEquals(new File("test/repositories/ivysettings.xml").getAbsolutePath(), settings .getVariables().getVariable("ivy.settings.file")); - assertEquals(new File("test/repositories/ivysettings.xml").toURL().toExternalForm(), + assertEquals(new File("test/repositories/ivysettings.xml").toURI().toURL().toExternalForm(), settings.getVariables().getVariable("ivy.settings.url")); assertEquals(new File("test/repositories").getAbsolutePath(), settings.getVariables().getVariable( "ivy.settings.dir")); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java?rev=683200&r1=683199&r2=683200&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java Wed Aug 6 02:39:32 2008 @@ -103,7 +103,7 @@ assertEquals(new File("build/cache"), settings.getDefaultCache()); assertEquals(new File("test/repositories/ivysettings.xml").getAbsolutePath(), settings .getVariables().getVariable("ivy.settings.file")); - assertEquals(new File("test/repositories/ivysettings.xml").toURL().toExternalForm(), + assertEquals(new File("test/repositories/ivysettings.xml").toURI().toURL().toExternalForm(), settings.getVariables().getVariable("ivy.settings.url")); assertEquals(new File("test/repositories").getAbsolutePath(), settings.getVariables().getVariable( "ivy.settings.dir")); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java?rev=683200&r1=683199&r2=683200&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/NormalRelativeUrlResolverTest.java Wed Aug 6 02:39:32 2008 @@ -45,9 +45,9 @@ public void testFileAndUrlWithAbsoluteFile() throws MalformedURLException { URL base = new URL("file://xxx/file.txt"); File absFile = new File(".").getAbsoluteFile(); - assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() , null)); - assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() , "")); - assertEquals(absFile.toURL(), t.getURL(base , absFile.toString() , "somthing.txt")); + assertEquals(absFile.toURI().toURL(), t.getURL(base , absFile.toString() , null)); + assertEquals(absFile.toURI().toURL(), t.getURL(base , absFile.toString() , "")); + assertEquals(absFile.toURI().toURL(), t.getURL(base , absFile.toString() , "somthing.txt")); } public void testFileAndUrlWithRelativeFile() throws MalformedURLException {