diff options
Diffstat (limited to 'src/junit/com/jogamp')
5 files changed, 445 insertions, 199 deletions
diff --git a/src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java b/src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java new file mode 100644 index 0000000..904fca5 --- /dev/null +++ b/src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java @@ -0,0 +1,170 @@ +/** + * Copyright 2014 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + +package com.jogamp.common.net; + +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; + +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.jogamp.common.os.AndroidVersion; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.IOUtil; +import com.jogamp.common.util.JarUtil; +import com.jogamp.common.util.ReflectionUtil; +import com.jogamp.junit.util.JunitTracer; +import com.jogamp.junit.util.MiscUtils; + +/** + * Bug 908: Automated test, launching GlueGen jar file from an <i>odd pathname</i>. + * <p> + * The currently used jar folder is copied into [1] + * <pre> + * [1] build/test/build/TestNetIOURIReservedCharsBug908/test01TempJarCacheOddPath/A\$-B\^-C~-D#-E\]-F\[-öä + * [2] build/test/build/TestNetIOURIReservedCharsBug908/test01TempJarCacheOddPath/A\$-B\^-C~-D#-E\]-F\[-öä/gluegen-rt.jar + * </pre> + * A ClassLoader w/ the URL [2] is used to issue Platform.initSingleton(), + * i.e. issues a whole initialization sequence w/ native jar loading in the new ClassPath. + * </p> + * <p> + * The manual test below on the created odd folder [1] has also succeeded: + * <pre> + * java \ + * -Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache \ + * -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache \ + * -cp ../build-x86_64/test/build/TestNetIOURIReservedCharsBug908/test01TempJarCacheOddPath/A\$-B\^-C~-D#-E\]-F\[-öä/gluegen-rt.jar \ + * com.jogamp.common.GlueGenVersion + * </pre> + * </p> + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class TestNetIOURIReservedCharsBug908 extends JunitTracer { + static class TestClassLoader extends URLClassLoader { + public TestClassLoader(final URL[] urls) { + super(urls); + } + public TestClassLoader(final URL[] urls, final ClassLoader parent) { + super(urls, parent); + } + } + + + @Test + public void test00TempJarCacheSimplePath() throws IOException, IllegalArgumentException, URISyntaxException { + testTempJarCacheOddJarPathImpl("simpletons/", "simpletons/"); + } + + @Test + public void test01TempJarCacheOddPath() throws IOException, IllegalArgumentException, URISyntaxException { + // Bug 908, issues w/ windows file path char: $ ^ ~ # [ ] + testTempJarCacheOddJarPathImpl("A$-B^-C~-D#-E]-F[-öä/", + // "A$-B%5E-C~-D#-E]-F[-%C3%B6%C3%A4/"); <- Firefox URI encoding! '#' -> [1] + // "A$-B%5E-C~-D%23-E]-F[-%C3%B6%C3%A4/"); <- '[' ']' -> [2] + "A$-B%5E-C~-D%23-E%5D-F%5B-%C3%B6%C3%A4/"); + /** + * [1] '#' + java.lang.IllegalArgumentException: URI has a fragment component + at java.io.File.<init>(Unknown Source) + at com.jogamp.common.net.TestNetIOURIReservedCharsBug908.testTempJarCacheOddJarPathImpl(TestNetIOURIReservedCharsBug908.java:101) + [2] '[' ']' + java.net.URISyntaxException: Illegal character in path at index 137: file:/usr/local/projects/JOGL/gluegen/build-x86_64/test/build/TestNetIOURIReservedCharsBug908/test01TempJarCacheOddPath/A$-B%5E-C~-D%23-E]-F[-%C3%B6%C3%A4/ + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at com.jogamp.common.net.TestNetIOURIReservedCharsBug908.testTempJarCacheOddJarPathImpl(TestNetIOURIReservedCharsBug908.java:106) + + */ + + } + private void testTempJarCacheOddJarPathImpl(final String subPathUTF, final String subPathEncoded) throws IOException, IllegalArgumentException, URISyntaxException { + if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } + + final String reservedCharPathUnencoded = "test/build/"+getClass().getSimpleName()+"/"+getTestMethodName()+"/"+subPathUTF; + final String reservedCharPathEncoded = "test/build/"+getClass().getSimpleName()+"/"+getTestMethodName()+"/"+subPathEncoded; + + System.err.println("0 Unencoded: "+reservedCharPathUnencoded); + System.err.println("0 Encoded: "+reservedCharPathEncoded); + + // jar:file:/dir1/dir2/gluegen-rt.jar!/ + final URI jarFileURI = JarUtil.getJarFileURI(Platform.class.getName(), getClass().getClassLoader()); + System.err.println("1 jarFileURI: "+jarFileURI.toString()); + // gluegen-rt.jar + final String jarBasename = JarUtil.getJarBasename(jarFileURI); + System.err.println("2 jarBasename: "+jarBasename); + + // file:/dir1/build/gluegen-rt.jar + final URI fileURI = JarUtil.getJarSubURI(jarFileURI); + System.err.println("3 fileURI: "+fileURI.toString()); + // file:/dir1/build/ + final URI fileFolderURI = new URI(IOUtil.getParentOf(fileURI.toString())); + System.err.println("4 fileFolderURI: "+fileFolderURI.toString()); + // file:/dir1/build/test/build/A$-B^-C~-D#-E]-F[/ + final URI fileNewFolderURI = new URI(fileFolderURI.toString()+reservedCharPathEncoded); + System.err.println("5 fileNewFolderURI: "+fileNewFolderURI.toString()); + + final File srcFolder = new File(fileFolderURI); + final File dstFolder = new File(fileNewFolderURI); + System.err.println("6 srcFolder: "+srcFolder.toString()); + System.err.println("7 dstFolder: "+dstFolder.toString()); + try { + final MiscUtils.CopyStats copyStats = MiscUtils.copy(srcFolder, dstFolder, 1, true); + copyStats.dump("Copy ", true); + Assert.assertEquals(1, copyStats.totalFolders); + Assert.assertTrue(copyStats.totalBytes > 0); + Assert.assertEquals(0, copyStats.currentDepth); + + final URI jarFileNewFolderURI = new URI(fileNewFolderURI.toString()+jarBasename); + System.err.println("8 jarFileNewFolderURI: "+jarFileNewFolderURI.toString()); + + final URL[] urls = new URL[] { jarFileNewFolderURI.toURL() }; + System.err.println("url: "+urls[0]); + + final ClassLoader cl = new TestClassLoader(urls, null); + ReflectionUtil.callStaticMethod(Platform.class.getName(), "initSingleton", null, null, cl); + } finally { + // cleanup ? Skip this for now .. + // dstFolder.delete(); + } + } + + public static void main(final String args[]) throws IOException { + final String tstname = TestNetIOURIReservedCharsBug908.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } + +} diff --git a/src/junit/com/jogamp/common/net/URIDumpUtil.java b/src/junit/com/jogamp/common/net/URIDumpUtil.java index 8d94b6d..1a74742 100644 --- a/src/junit/com/jogamp/common/net/URIDumpUtil.java +++ b/src/junit/com/jogamp/common/net/URIDumpUtil.java @@ -7,14 +7,14 @@ import java.net.URL; public class URIDumpUtil { public static void showURX(final String urx) throws MalformedURLException, URISyntaxException { - System.err.println("XXXXXX "+urx); + System.err.println("WWWWWW "+urx); showURL(new URL(urx)); showURI(new URI(urx)); - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + System.err.println("WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW"); } public static void showURL(final URL url) { - System.err.println("YYYYYY URL "+url); + System.err.println("XXXXXX URL "+url.toString()); System.err.println("protocol: "+url.getProtocol()); System.err.println("auth: "+url.getAuthority()); System.err.println("host: "+url.getHost()); @@ -22,28 +22,24 @@ public class URIDumpUtil { System.err.println("file: "+url.getFile() + " ( path " + url.getPath() + ", query " + url.getQuery() + " ) " ); System.err.println("ref: "+url.getRef()); } + public static void showURI(final URI uri) { - System.err.println("ZZZZZZ URI "+uri); - // 1 [scheme:]scheme-specific-part[#fragment] - System.err.println("1 scheme: "+uri.getScheme()); - System.err.println("1 scheme-part: "+uri.getRawSchemeSpecificPart()); - System.err.println("1 fragment: "+uri.getRawFragment()); + showURI("YYYYYY URI "+uri+", isOpaque "+uri.isOpaque()+", isAbs "+uri.isAbsolute(), uri); + } + public static void showURI(final String message, final URI uri) { + System.err.println(message); - // 2 [scheme:][//authority][path][?query][#fragment] - System.err.println("2 scheme: "+uri.getScheme()); - System.err.println("2 auth: "+uri.getRawAuthority()); - System.err.println("2 path: "+uri.getRawPath()); - System.err.println("2 query: "+uri.getRawQuery()); - System.err.println("2 fragment: "+uri.getRawFragment()); + System.err.println("0.0.0 string: "+uri.toString()); + System.err.println("0.0.0 ascii : "+uri.toASCIIString()); - // 3 [scheme:][//authority][path][?query][#fragment] - // authority: [user-info@]host[:port] - System.err.println("3 scheme: "+uri.getScheme()); - System.err.println("3 user-info: "+uri.getRawUserInfo()); - System.err.println("3 host: "+uri.getHost()); - System.err.println("3 port: "+uri.getPort()); - System.err.println("3 path: "+uri.getRawPath()); - System.err.println("3 query: "+uri.getRawQuery()); - System.err.println("3 fragment: "+uri.getRawFragment()); + System.err.println("1.0.0 scheme: "+uri.getScheme()); + System.err.println("2.0.0 scheme-part: "+uri.getRawSchemeSpecificPart()+" (raw), "+uri.getSchemeSpecificPart()+" (dec)"); + System.err.println("2.1.0 auth: "+uri.getRawAuthority()+" (raw), "+uri.getAuthority()+" (dec)"); + System.err.println("2.1.1 user-info: "+uri.getRawUserInfo()+" (raw), "+uri.getUserInfo()+" (dec)"); + System.err.println("2.1.1 host: "+uri.getHost()); + System.err.println("2.1.1 port: "+uri.getPort()); + System.err.println("2.2.0 path: "+uri.getRawPath()+" (raw), "+uri.getPath()+" (dec)"); + System.err.println("2.3.0 query: "+uri.getRawQuery()+" (raw), "+uri.getQuery()+" (dec)"); + System.err.println("3.0.0 fragment: "+uri.getRawFragment()+" (raw), "+uri.getFragment()+" (dec)"); } } diff --git a/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java b/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java index ca62ae9..66dbacf 100644 --- a/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java +++ b/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java @@ -1,9 +1,5 @@ package com.jogamp.common.util; -import static com.jogamp.common.net.URIDumpUtil.showURX; -import static com.jogamp.common.net.URIDumpUtil.showURI; -import static com.jogamp.common.net.URIDumpUtil.showURL; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -16,6 +12,7 @@ import jogamp.common.os.PlatformPropsImpl; import org.junit.Assert; import org.junit.Test; +import com.jogamp.common.net.URIDumpUtil; import com.jogamp.common.os.Platform; import com.jogamp.common.util.IOUtil; import com.jogamp.junit.util.JunitTracer; @@ -26,171 +23,155 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestIOUtilURIHandling extends JunitTracer { - static final String[][] uriHttpSArray = new String[][] { - new String[] {"http://localhost/gluegen/build-x86_64/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64/gluegen-rt.jar"}, - - new String[] {"http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar" - // "http://localhost/gluegen/build-x86_64 lala/gluegen-rt.jar" - }, - - new String[] {"http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar" - // "http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar" - }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/" }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/" - // "jar:http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" - }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" - // "jar:http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" - }, - /** Not possible, '#' is fragment in URI - new String[] {"jar:http://localhost/gluegen/%23/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/%23/gluegen-rt.jar!/" - // "jar:http://localhost/gluegen/#/gluegen-rt.jar!/" - }, */ + // Bug 908, issues w/ windows file path char: $ ^ ~ # [ ] + + public static final String[][] uriHttpSArray = new String[][] { + new String[] {"http://localhost/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + + new String[] {"jar:http://localhost/gluegen/R%23/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] uriFileSArrayUnix = new String[][] { - new String[] {"file:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/gluegen/build-x86_64/gluegen-rt.jar"}, + public static final String[][] uriFileSArrayUnix = new String[][] { + new String[] {"file:/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"file:/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"file:/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, - new String[] {"file:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 lala/gluegen-rt.jar"}, + new String[] {"file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, - new String[] {"file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, + new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/"}, - new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/" }, + new String[] {"jar:file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, - new String[] {"jar:file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" }, + new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file://filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/gluegen/R%23/gluegen-rt.jar!/"}, - /** Not possible, '#' is fragment in URI - new String[] {"jar:file:/gluegen/%23/gluegen-rt.jar!/", - "jar:file:/gluegen/#/gluegen-rt.jar!/" }, */ + new String[] {"jar:file:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] uriFileSArrayWindows = new String[][] { - new String[] {"file:/C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar"}, + public static final String[][] uriFileSArrayWindows = new String[][] { + new String[] {"file:/C:/gluegen/build-x86_64/gluegen-rt.jar"}, + new String[] {"file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, - new String[] {"file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 lala/gluegen-rt.jar"}, + new String[] {"file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, - new String[] {"file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, + new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + new String[] {"jar:file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:///C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:///C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file://filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/C:/gluegen/R%23/gluegen-rt.jar!/"}, - /** Not possible, '#' is fragment in URI - new String[] {"jar:file:/C:/gluegen/%23/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/#/gluegen-rt.jar!/" }, */ + new String[] {"jar:file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] fileSArrayUnix = new String[][] { + public static final String[][] fileSArrayUnix = new String[][] { new String[] {"/gluegen/build-x86_64/gluegen-rt.jar", "file:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/gluegen/build-x86_64/gluegen-rt.jar", "/gluegen/build-x86_64/gluegen-rt.jar"}, + new String[] {"/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "file:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + new String[] {"/gluegen/build-x86_64 lala/gluegen-rt.jar", "file:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 lala/gluegen-rt.jar", "/gluegen/build-x86_64 lala/gluegen-rt.jar"}, new String[] {"/gluegen/build-x86_64 öä lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + "file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, - /* No support for '#' fragment in URI path ! - new String[] {"/gluegen/#/gluegen-rt.jar", - "file:/gluegen/%23/gluegen-rt.jar", - "file:/gluegen/#/gluegen-rt.jar", - "/gluegen/#/gluegen-rt.jar" }, */ + new String[] {"/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar", + // "file:/gluegen/A%24/B%5E/C%7E/D%23/E%5B/F%5D/gluegen-rt.jar", // goal w/ new Uri class + "file:/gluegen/A$/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar", // current Java URI/URL decoding + "/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar" }, // goal w/ new Uri class + + new String[] {"/gluegen/$/^/~/#/[/]/gluegen-rt.jar", + // "file:/gluegen/%24/%5E/%7E/%23/%5B/%5D/gluegen-rt.jar", + "file:/gluegen/$/%5E/~/%23/%5B/%5D/gluegen-rt.jar", // current Java URI/URL decoding + "/gluegen/$/^/~/#/[/]/gluegen-rt.jar" }, }; - static final String[][] fileSArrayWindows = new String[][] { + public static final String[][] fileSArrayWindows = new String[][] { new String[] {"C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", "C:\\gluegen\\build-x86_64\\gluegen-rt.jar"}, + new String[] {"C:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + // "file:/C%3A/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "C:\\gluegen\\"+'\u0394'+"\\gluegen-rt.jar"}, + new String[] {"C:/gluegen/build-x86_64 lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 lala\\gluegen-rt.jar"}, new String[] {"C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, new String[] {"C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, new String[] {"\\\\filehost\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar", - "file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + "file:////filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "\\\\filehost\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, - /* No support for '#' fragment in URI path ! - new String[] {"C:/gluegen/#/gluegen-rt.jar", - "file:/C:/gluegen/%23/gluegen-rt.jar", - "file:/C:/gluegen/#/gluegen-rt.jar", - "C:\\gluegen\\#\\gluegen-rt.jar" }, */ + new String[] {"C:/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar", + // "file:/C%3A/gluegen/A%24/B%5E/C%7E/D%23/E%5B/F%5D/gluegen-rt.jar", + "file:/C:/gluegen/A$/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar", + "C:\\gluegen\\A$\\B^\\C~\\D#\\E[\\F]\\gluegen-rt.jar" }, + + new String[] {"C:/gluegen/$/^/~/#/[/]/gluegen-rt.jar", + // "file:/C%3A/gluegen/%24/%5E/%7E/%23/%5B/%5D/gluegen-rt.jar", + "file:/C:/gluegen/$/%5E/~/%23/%5B/%5D/gluegen-rt.jar", // current Java URI/URL decoding + "C:\\gluegen\\$\\^\\~\\#\\[\\]\\gluegen-rt.jar" }, }; @Test public void test00BasicCoding() throws IOException, URISyntaxException { final String string = "Hallo Welt öä"; System.err.println("sp1 "+string); - { - final String sp2 = IOUtil.encodeToURI(string); - final String sp3 = IOUtil.encodeToURI(sp2); - System.err.println("sp2 "+sp2); - System.err.println("sp3 "+sp3); - } final File file = new File(string); System.err.println("file "+file); System.err.println("file.path.dec "+file.getPath()); @@ -217,15 +198,17 @@ public class TestIOUtilURIHandling extends JunitTracer { { // Expected !equals due to double-escaping of space %20 -> %25%20 // Double escaping is due to IOUtil.encodeToURI(s2). + @SuppressWarnings("deprecation") final String s3 = IOUtil.encodeToURI(s2); System.err.println("uri2.encoded: "+s3); final URI uri1 = new URI(IOUtil.FILE_SCHEME, null, s3, null); final boolean equalString= uri0.toString().equals(uri1.toString()); final boolean equalPath = uri0.getPath().equals(uri1.getPath()); final boolean equalASCII= uri0.toASCIIString().equals(uri1.toASCIIString()); - System.err.println("uri2.string: "+uri1.toString()+" - "+(equalString?"EQUAL":"NOT_EQUAL")); - System.err.println("uri2.path : "+uri1.getPath()+" - "+(equalPath?"EQUAL":"NOT_EQUAL")); - System.err.println("uri2.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"EQUAL":"NOT_EQUAL")); + System.err.println("uri2.string: "+uri1.toString()+" - "+(equalString?"ERROR EQUAL":"OK NOT_EQUAL")); + System.err.println("uri2.path : "+uri1.getPath()+" - "+(equalPath?"ERROR EQUAL":"OK NOT_EQUAL")); + System.err.println("uri2.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"ERROR EQUAL":"OK NOT_EQUAL")); + ok = !equalString && !equalPath && !equalASCII && ok; } final URI uri1 = new URI(IOUtil.FILE_SCHEME, null, s2, null); final boolean equalString= uri0.toString().equals(uri1.toString()); @@ -266,23 +249,6 @@ public class TestIOUtilURIHandling extends JunitTracer { System.err.println("uri4.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR")); ok = equalString && equalPath && equalASCII && ok; } - { - final String s2 = "http://lala.org/"+string; - final String s2enc = IOUtil.encodeToURI(s2); - System.err.println("uri5.orig: "+s2); - System.err.println("uri5.enc : "+s2enc); - final URI uri1 = new URI(s2enc); - final String rString = "http://lala.org/Hallo%20Welt%20öä"; - final String rPath = "/"+string; - final String rASCII = "http://lala.org/Hallo%20Welt%20%C3%B6%C3%A4"; - final boolean equalString= rString.equals(uri1.toString()); - final boolean equalPath = rPath.equals(uri1.getPath()); - final boolean equalASCII= rASCII.equals(uri1.toASCIIString()); - System.err.println("uri5.string: "+uri1.toString()+" - "+(equalString?"OK":"ERROR")); - System.err.println("uri5.path : "+uri1.getPath()+" - "+(equalPath?"OK":"ERROR")); - System.err.println("uri5.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR")); - ok = equalString && equalPath && equalASCII && ok; - } Assert.assertTrue("One or more errors occured see stderr above", ok); } @@ -320,32 +286,39 @@ public class TestIOUtilURIHandling extends JunitTracer { for(int i=0; i<uriSArray.length; i++) { final String[] uriSPair = uriSArray[i]; final String uriSource = uriSPair[0]; - final String uriExpected= uriSPair[1]; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); - ok = testURI2URL(uriSource, uriExpected) && ok; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); + System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length); + ok = testURI2URL(uriSource) && ok; + System.err.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE "+testname+": "+(i+1)+"/"+uriSArray.length); } Assert.assertTrue("One or more errors occured see stderr above", ok); } - static boolean testURI2URL(final String uriSource, final String uriExpected) throws IOException, URISyntaxException { - showURX(uriSource); + static boolean testURI2URL(final String uriSource) throws IOException, URISyntaxException { final URI uri0 = new URI(uriSource); - System.err.println("uri.string: "+uri0.toString()); - System.err.println("uri.ascii : "+uri0.toASCIIString()); + URIDumpUtil.showURI(uri0); + + final String expected1 = uriSource.toString(); + final String expected2 = expected1.replaceFirst("///", "/"); + System.err.println("expected__s0: "+uriSource); + System.err.println("expected__d1: "+expected1); + System.err.println("expected__d2: "+expected2); - final URL actualUrl = IOUtil.toURL(uri0); - final String actualUrlS = actualUrl.toExternalForm(); - final boolean equalsA = uriExpected.equals(actualUrlS); - System.err.println("actual : "+actualUrlS); - System.err.println("expected___: "+uriExpected+" - "+(equalsA?"OK":"ERROR")); - final boolean ok = equalsA; + final URL actualURL = uri0.toURL(); + final String actualURLStr = actualURL.toString(); + final boolean equalsURLSrc = uriSource.equals(actualURLStr); + final boolean equalsURLDec1 = expected1.equals(actualURLStr); + final boolean equalsURLDec2 = expected2.equals(actualURLStr); + final boolean equalsURL = equalsURLSrc || equalsURLDec1 || equalsURLDec2; + System.err.println("actual : "+actualURLStr+" - "+(equalsURL?"OK":"ERROR")+ + " - equalSrc "+equalsURLSrc+", equalDec1 "+equalsURLDec1+", equalDec2 "+equalsURLDec2); + + final boolean ok = equalsURL; // now test open .. Throwable t = null; URLConnection con = null; try { - con = actualUrl.openConnection(); + con = actualURL.openConnection(); } catch (final Throwable _t) { t = _t; } @@ -365,40 +338,35 @@ public class TestIOUtilURIHandling extends JunitTracer { final String[] uriSPair = uriSArray[i]; final String uriSource = uriSPair[0]; final String uriEncExpected= uriSPair[1]; - final String uriDecExpected= uriSPair[2]; - final String fileExpected= uriSPair[3]; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); - ok = testFile2URI(uriSource, uriEncExpected, uriDecExpected, fileExpected) && ok; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); + final String fileExpected= uriSPair[2]; + System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length); + ok = testFile2URI(uriSource, uriEncExpected, fileExpected) && ok; + System.err.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE "+testname+": "+(i+1)+"/"+uriSArray.length); } Assert.assertTrue("One or more errors occured see stderr above", ok); } - static boolean testFile2URI(final String fileSource, final String uriEncExpected, final String uriDecExpected, final String fileExpected) throws IOException, URISyntaxException { + static boolean testFile2URI(final String fileSource, final String uriEncExpected, final String fileExpected) throws IOException, URISyntaxException { + System.err.println("fileSource: "+fileSource); final File file = new File(fileSource); - { - final URI uri0 = file.toURI(); - System.err.println("uri0.string: "+uri0.toString()); - System.err.println("uri0.ascii : "+uri0.toASCIIString()); - } - final URI uri1 = IOUtil.toURISimple(file); - System.err.println("uri1.string: "+uri1.toString()); - System.err.println("uri1.ascii : "+uri1.toASCIIString()); - showURI(uri1); - showURL(uri1.toURL()); - - final URL actualUrl = IOUtil.toURL(uri1); - final String actualUrlS = actualUrl.toExternalForm(); + System.err.println("file: "+file.getAbsolutePath()); + + final URI uri0 = IOUtil.toURISimple(file); + final URI uri1 = file.toURI(); + URIDumpUtil.showURI(uri0); + URIDumpUtil.showURI(uri1); + + final URL actualUrl = uri1.toURL(); final String actualFileS = IOUtil.decodeURIIfFilePath(uri1); final boolean equalsFilePath = fileExpected.equals(actualFileS); - System.err.println("actual_______uri : "+actualUrlS); - System.err.println("actual___file-path: "+actualFileS); - System.err.println("expected_path: "+fileExpected+" - "+(equalsFilePath?"OK":"ERROR")); - final boolean equalsDecUri = uriDecExpected.equals(actualUrlS); - System.err.println("actual_______uri: "+actualUrlS); - System.err.println("expected__encUri: "+uriEncExpected); - System.err.println("expected__decUri: "+uriDecExpected+" - "+(equalsDecUri?"OK":"ERROR")); - final boolean ok = equalsDecUri && equalsFilePath; + System.err.println("expected_path: "+fileExpected); + System.err.println("actual___file-path: "+actualFileS+" - "+(equalsFilePath?"OK":"ERROR")); + final boolean equalsEncUri = uriEncExpected.equals(uri1.toString()); + System.err.println("expected__encUri: "+uriEncExpected); + System.err.println("actual_______Uri: "+uri1.toString()+" - "+(equalsEncUri?"OK":"ERROR")); + final boolean ok = equalsEncUri && equalsFilePath; + + System.err.println("actual_______URL: "+actualUrl.toExternalForm()); // now test open .. Throwable t = null; diff --git a/src/junit/com/jogamp/common/util/TestJarUtil.java b/src/junit/com/jogamp/common/util/TestJarUtil.java index 07e33fc..db5c268 100644 --- a/src/junit/com/jogamp/common/util/TestJarUtil.java +++ b/src/junit/com/jogamp/common/util/TestJarUtil.java @@ -99,7 +99,7 @@ public class TestJarUtil extends JunitTracer { void validateJarFileURL(final URI jarFileURI) throws IllegalArgumentException, IOException, URISyntaxException { Assert.assertNotNull(jarFileURI); - final URL jarFileURL = IOUtil.toURL(jarFileURI); + final URL jarFileURL = jarFileURI.toURL(); final URLConnection aURLc = jarFileURL.openConnection(); Assert.assertTrue("jarFileURI/URL has zero content: "+jarFileURL, aURLc.getContentLength()>0); System.err.println("URLConnection: "+aURLc); @@ -116,7 +116,7 @@ public class TestJarUtil extends JunitTracer { final URI jarSubURI = JarUtil.getJarSubURI(clazzBinName, cl); Assert.assertNotNull(jarSubURI); - final URL jarSubURL= IOUtil.toURL(jarSubURI); + final URL jarSubURL= jarSubURI.toURL(); final URLConnection urlConn = jarSubURL.openConnection(); Assert.assertTrue("jarSubURL has zero content: "+jarSubURL, urlConn.getContentLength()>0); System.err.println("URLConnection of jarSubURL: "+urlConn); diff --git a/src/junit/com/jogamp/junit/util/MiscUtils.java b/src/junit/com/jogamp/junit/util/MiscUtils.java new file mode 100644 index 0000000..3576fed --- /dev/null +++ b/src/junit/com/jogamp/junit/util/MiscUtils.java @@ -0,0 +1,112 @@ +/** + * Copyright 2014 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ +package com.jogamp.junit.util; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import com.jogamp.common.util.IOUtil; + +public class MiscUtils { + public static class CopyStats { + public int totalBytes = 0; + public int totalFiles = 0; + public int totalFolders = 0; + public int currentDepth = 0; + public int maxDepth = 0; + public boolean trackFiles; + public final List<File> srcFiles = new ArrayList<File>(); + public final List<File> dstFiles = new ArrayList<File>(); + + public void dump(final String prefix, final boolean folderOnly) { + System.err.println(prefix+"Total bytes: "+totalBytes); + System.err.println(prefix+"Total files: "+totalFiles); + System.err.println(prefix+"Total folder: "+totalFolders); + System.err.println(prefix+"Depth: "+currentDepth/maxDepth); + System.err.println(prefix+"Tracking: "+trackFiles); + if( trackFiles ) { + for(int i=0; i<srcFiles.size(); i++) { + final File src = srcFiles.get(i); + final File dst = dstFiles.get(i); + if( !folderOnly || src.isDirectory() ) { + System.err.printf("%s\t src %4d: %s%n", prefix, i, src.toString()); + System.err.printf("%s\t dst %4d: %s%n%n", prefix, i, dst.toString()); + } + } + } + } + } + public static CopyStats copy(final File src, final File dest, final int maxDepth, final boolean trackFiles) throws IOException { + final CopyStats cs = new CopyStats(); + cs.maxDepth = maxDepth; + cs.trackFiles = trackFiles; + copy(src, dest, cs); + return cs; + } + private static void copy(final File src, final File dest, final CopyStats stats) throws IOException { + if(src.isDirectory()){ + if( stats.maxDepth >= 0 && stats.currentDepth >= stats.maxDepth ) { + return; + } + stats.totalFolders++; + if( stats.trackFiles ) { + stats.srcFiles.add(src); + stats.dstFiles.add(dest); + } + stats.currentDepth++; + if(!dest.exists()){ + dest.mkdirs(); + } + final String fileNames[] = src.list(); + for (int i=0; i<fileNames.length; i++) { + final String fileName = fileNames[i]; + final File srcFile = new File(src, fileName); + final File destFile = new File(dest, fileName); + copy(srcFile, destFile, stats); + } + stats.currentDepth--; + } else { + stats.totalFiles++; + if( stats.trackFiles ) { + stats.srcFiles.add(src); + stats.dstFiles.add(dest); + } + final InputStream in = new BufferedInputStream(new FileInputStream(src)); + try { + stats.totalBytes += IOUtil.copyStream2File(in, dest, 0); + } finally { + in.close(); + } + } + } +} |