Return-Path: X-Original-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 98834D539 for ; Fri, 17 May 2013 11:44:46 +0000 (UTC) Received: (qmail 95141 invoked by uid 500); 17 May 2013 11:44:46 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 95042 invoked by uid 500); 17 May 2013 11:44:44 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 95002 invoked by uid 99); 17 May 2013 11:44:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 11:44:42 +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; Fri, 17 May 2013 11:44:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 736BE2388962; Fri, 17 May 2013 11:44:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483750 - /geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java Date: Fri, 17 May 2013 11:44:21 -0000 To: xbean-scm@geronimo.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130517114421.736BE2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Fri May 17 11:44:21 2013 New Revision: 1483750 URL: http://svn.apache.org/r1483750 Log: XBEAN-247 fix tests under Windows* Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java?rev=1483750&r1=1483749&r2=1483750&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/UrlSetTest.java Fri May 17 11:44:21 2013 @@ -18,7 +18,9 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import java.io.File; import java.net.URL; +import java.util.Locale; import java.util.Properties; /** @@ -101,38 +103,45 @@ public class UrlSetTest extends TestCase public void testOsxJdk16Filtering() throws Exception { + String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); + + String urlPrefix = osName.contains("windows") ? "file:/C:" : "file:"; + final URL[] urls = { - new URL("file:/Applications/IntelliJ%20IDEA%2011.app/lib/idea_rt.jar"), - new URL("file:/Applications/IntelliJ%20IDEA%2011.app/plugins/junit/lib/junit-rt.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/charsets.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsse.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/ui.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/dt.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/apple_provider.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/dnsns.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/localedata.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunjce_provider.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunpkcs11.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/jce.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/jconsole.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/management-agent.jar"), - new URL("file:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/sa-jdi.jar"), - new URL("file:/System/Library/Java/Support/CoreDeploy.bundle/Contents/Resources/Java/deploy.jar"), - new URL("file:/System/Library/Java/Support/Deploy.bundle/Contents/Resources/Java/javaws.jar"), - new URL("file:/Users/dblevins/.m2/repository/asm/asm-commons/3.2/asm-commons-3.2.jar"), - new URL("file:/Users/dblevins/.m2/repository/asm/asm-tree/3.2/asm-tree-3.2.jar"), - new URL("file:/Users/dblevins/.m2/repository/asm/asm/3.2/asm-3.2.jar"), - new URL("file:/Users/dblevins/.m2/repository/junit/junit/4.8.2/junit-4.8.2.jar"), - new URL("file:/Users/dblevins/.m2/repository/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar"), - new URL("file:/Users/dblevins/.m2/repository/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar"), - new URL("file:/Users/dblevins/work/xbean/trunk/xbean-bundleutils/target/classes/"), - new URL("file:/Users/dblevins/work/xbean/trunk/xbean-finder/target/classes/"), - new URL("file:/Users/dblevins/work/xbean/trunk/xbean-finder/target/test-classes/"), + new URL(urlPrefix + "/Applications/IntelliJ%20IDEA%2011.app/lib/idea_rt.jar"), + new URL(urlPrefix + "/Applications/IntelliJ%20IDEA%2011.app/plugins/junit/lib/junit-rt.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/charsets.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsse.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/ui.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/dt.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/apple_provider.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/dnsns.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/localedata.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunjce_provider.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunpkcs11.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/jce.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/jconsole.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/management-agent.jar"), + new URL(urlPrefix + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/sa-jdi.jar"), + new URL(urlPrefix + "/System/Library/Java/Support/CoreDeploy.bundle/Contents/Resources/Java/deploy.jar"), + new URL(urlPrefix + "/System/Library/Java/Support/Deploy.bundle/Contents/Resources/Java/javaws.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/asm/asm-commons/3.2/asm-commons-3.2.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/asm/asm-tree/3.2/asm-tree-3.2.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/asm/asm/3.2/asm-3.2.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/junit/junit/4.8.2/junit-4.8.2.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar"), + new URL(urlPrefix + "/Users/dblevins/.m2/repository/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar"), + new URL(urlPrefix + "/Users/dblevins/work/xbean/trunk/xbean-bundleutils/target/classes/"), + new URL(urlPrefix + "/Users/dblevins/work/xbean/trunk/xbean-finder/target/classes/"), + new URL(urlPrefix + "/Users/dblevins/work/xbean/trunk/xbean-finder/target/test-classes/"), }; System.setProperty("java.endorsed.dirs", "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/endorsed"); - System.setProperty("java.ext.dirs", "/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext"); + System.setProperty("java.ext.dirs", + "/Library/Java/Extensions" + File.pathSeparator + + "/System/Library/Java/Extensions" + File.pathSeparator + + "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext"); System.setProperty("java.home", "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"); System.setProperty("os.name", "Mac OS X");