diff options
author | Sven Gothel <[email protected]> | 2014-09-07 07:58:39 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-09-07 07:58:39 +0200 |
commit | 0b07f9107c5b033913f5c4cbeb906ae6dafc2d77 (patch) | |
tree | a2248c83cf9bb50721d195798fcb96a688224f31 | |
parent | 2faec846fbc13d206028b16a7713c7a1a701fa08 (diff) |
Bug 908: Fix URI/URL double encoding, ensuring encoded/decoded variants are used properly (Added unit test)
Bug 908 was caused by confusing URI encoded parts (e.g. scheme-specific-part) and it's decoded variant.
This especially happened due to:
- the fact, that the encoded and unencoded variant uses the same String type,
- the URI/URL decoding differs, is not complete (e.g. %20 .. SPACE remains in decoded part),
- and does not comply w/ RFC 2396 and RFC 3986 (encoding), e.g. not all RESERVED chars are encoded.
In branch 'v2.3.0_branch', we will introduce our own Uri and Uri.Encoded class
to solve above issue by replacing all URI usage w/ Uri.
- Backporting results of own Uri class introduction in branch 'v2.3.0_branch'
- Ensure the encoded URI parts are used where required, i.e. IOUtil.compose(..) etc
- TestNetIOURIReservedCharsBug908: Automated test, launching GlueGen jar file from an <i>odd pathname</i>.
-rwxr-xr-x | make/scripts/java-win64.bat | 3 | ||||
-rwxr-xr-x | make/scripts/runtest-x64.bat | 4 | ||||
-rwxr-xr-x | make/scripts/runtest.sh | 7 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/IOUtil.java | 211 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/JarUtil.java | 44 | ||||
-rw-r--r-- | src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java | 170 | ||||
-rw-r--r-- | src/junit/com/jogamp/common/net/URIDumpUtil.java | 42 | ||||
-rw-r--r-- | src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java | 316 | ||||
-rw-r--r-- | src/junit/com/jogamp/common/util/TestJarUtil.java | 4 | ||||
-rw-r--r-- | src/junit/com/jogamp/junit/util/MiscUtils.java | 112 |
10 files changed, 532 insertions, 381 deletions
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 3f14c82..27dff84 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -14,7 +14,8 @@ set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;l echo CP_ALL %CP_ALL%
-set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.IOUtil"
+set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.JNILibLoader" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.JarUtil" "-Djogamp.debug.TempJarCache"
+REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.IOUtil"
REM set D_ARGS="-Djogamp.debug.IOUtil"
REM set D_ARGS="-Djogamp.debug=all"
diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat index f03dc41..6a5d79c 100755 --- a/make/scripts/runtest-x64.bat +++ b/make/scripts/runtest-x64.bat @@ -2,7 +2,7 @@ REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter -scripts\java-win64.bat com.jogamp.common.util.TestTempJarCache +REM scripts\java-win64.bat com.jogamp.common.util.TestTempJarCache REM scripts\java-win64.bat com.jogamp.common.os.TestElfReader01 REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtil01 @@ -10,4 +10,6 @@ REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURICompose REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURIHandling REM scripts\java-win64.bat com.jogamp.common.net.TestUrisWithAssetHandler REM scripts\java-win64.bat com.jogamp.common.net.TestURIQueryProps +scripts\java-win64.bat com.jogamp.common.net.TestNetIOURIReservedCharsBug908 +REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURIHandling diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 52df0a3..4bec5e7 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -46,14 +46,14 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.TempFileCache" #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djava.io.tmpdir=/run/tmp" -#D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache" +D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.JNILibLoader" #D_ARGS="-Djogamp.debug.Lock" #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.Lock.TraceLock" -D_ARGS="-Djogamp.debug.IOUtil" +#D_ARGS="-Djogamp.debug.IOUtil" #D_ARGS="-Djogamp.debug.Bitstream" #D_ARGS="-Djogamp.debug=all" @@ -82,7 +82,7 @@ function onetest() { #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG @@ -114,6 +114,7 @@ onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.TestURIQueryProps 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG +onetest com.jogamp.common.net.TestNetIOURIReservedCharsBug908 2>&1 | tee -a $LOG #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java index c6548e4..5819fbc 100644 --- a/src/java/com/jogamp/common/util/IOUtil.java +++ b/src/java/com/jogamp/common/util/IOUtil.java @@ -204,7 +204,6 @@ public class IOUtil { * Copy the specified input stream to a byte array, which is being returned. */ public static byte[] copyStream2ByteArray(InputStream stream) throws IOException { - // FIXME: Shall enforce a BufferedInputStream ? if( !(stream instanceof BufferedInputStream) ) { stream = new BufferedInputStream(stream); } @@ -495,149 +494,17 @@ public class IOUtil { } /** - * Converts an {@link URI} to an {@link URL} while using a non encoded path. - * <p> - * A <i>file scheme</i> path, i.e. path following <code>file:</code>, is converted as follows:<br/> - * <code><br/> - File file = new File( {@link #decodeFromURI(String) decodeFromURI}( specificURI.getPath() ) );<br/> - String uriFilePath = {@link #encodeFilePathToURI(String) encodeFilePathToURI}( file.getPath() );<br/> - * </code><br/> - * above conversion results in a decoded <i>file path</i> appropriate to be used by subsequent file i/o operations (JarFile, zip, ..). - * </p> - * <p> - * Otherwise the default {@link URL} translation {@link URI#toURL()} is being used. - * </p> - * <p> - * The following cases are considered: - * <ul> - * <li><i>file schema</i> is converted via <code>new File(uri).getPath()</code>.</li> - * <li><i>jar scheme</i> - * <ul> - * <li>sub-protocol <i>file scheme</i> is being converted as above, other schema are preserved</li> - * <li>JAR entry is preserved.</li> - * </ul></li> - * </ul> - * </p> - * <p> - * Note that a given {@link URI#getAuthority() authority} for <i>file scheme</i>s is preserved to support window's shares. - * </p> - * <p> - * Tested w/ unit test <code>com.jogamp.common.util.TestIOUtilURIHandling</code> - * </p> + * Simply returns {@link URI#toURL()}. * @param uri * @return * @throws IOException * @throws IllegalArgumentException * @throws URISyntaxException + * + * @deprecated Useless */ public static URL toURL(final URI uri) throws IOException, IllegalArgumentException, URISyntaxException { - URL url = null; - final String uriSchema = uri.getScheme(); - final boolean isJar = IOUtil.JAR_SCHEME.equals(uriSchema); - final URI specificURI = isJar ? JarUtil.getJarSubURI(uri) : uri; - final boolean hasJarSubURI = specificURI != uri; - final String authorityS; - { - final String authority = specificURI.getAuthority(); - authorityS = ( null == authority ) ? "" : "//"+authority; - } - - if( DEBUG ) { - System.err.println("IOUtil.toURL.0: isJAR "+isJar+", hasSubURI "+hasJarSubURI+PlatformPropsImpl.NEWLINE+ - "\t, uri "+uri+PlatformPropsImpl.NEWLINE+ - "\t str -> "+specificURI.toString()+PlatformPropsImpl.NEWLINE+ - "\t ascii -> "+specificURI.toASCIIString()+PlatformPropsImpl.NEWLINE+ - "\t ssp -> "+specificURI.getSchemeSpecificPart()+PlatformPropsImpl.NEWLINE+ - "\t frag -> "+specificURI.getFragment()+PlatformPropsImpl.NEWLINE+ - "\t auth -> "+authorityS+PlatformPropsImpl.NEWLINE+ /* "//user-info@host:port" */ - "\t path -> "+specificURI.getPath()+PlatformPropsImpl.NEWLINE+ - "\t path.decoded -> "+decodeFromURI( specificURI.getPath() ) ); - } - int mode = 0; - if( IOUtil.FILE_SCHEME.equals( specificURI.getScheme() ) ) { - File f; - try { - f = new File( decodeFromURI( specificURI.getPath() ) ); // validates uri, uses decoded uri.getPath() and normalizes it - } catch(final Exception iae) { - if( DEBUG ) { - System.err.println("Caught "+iae.getClass().getSimpleName()+": new File("+decodeFromURI( specificURI.getPath() )+") failed: "+iae.getMessage()); - iae.printStackTrace(); - } - f = null; - } - if( null != f ) { - String urlS = null; - try { - final String fPath = f.getPath(); - final String fPathUriS = encodeFilePathToURI(fPath); - /** - * Below 'url = f.toURI().toURL()' Doesn't work, since it uses encoded path, - * but we need the decoded path due to subsequent file access. - * URI: jar:file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/ - * File: file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar - * URI: fUri file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar - * URL: fUrl file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar - * - * Goal: file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/ - */ - if(DEBUG) { - try { - final URI fUri = f.toURI(); - final URL fUrl = fUri.toURL(); - System.err.println("IOUtil.toURL.1b: fUri "+fUri+PlatformPropsImpl.NEWLINE+ - "\t, fUrl "+fUrl); - } catch (final Exception ee) { - System.err.println("Caught "+ee.getClass().getSimpleName()+": f.toURI().toURL() failed: "+ee.getMessage()); - ee.printStackTrace(); - } - } - if( !hasJarSubURI ) { - urlS = IOUtil.FILE_SCHEME+IOUtil.SCHEME_SEPARATOR+authorityS+fPathUriS; - if( DEBUG ) { - System.err.println("IOUtil.toURL.1: authorityS "+authorityS+", fPath "+fPath+PlatformPropsImpl.NEWLINE+ - "\t -> "+fPathUriS+PlatformPropsImpl.NEWLINE+ - "\t -> "+urlS); - } - url = new URL(urlS); - mode = 1; - } else { - final String jarEntry = JarUtil.getJarEntry(uri); - final String post = isJar ? IOUtil.JAR_SCHEME_SEPARATOR + jarEntry : ""; - urlS = uriSchema+IOUtil.SCHEME_SEPARATOR+IOUtil.FILE_SCHEME+IOUtil.SCHEME_SEPARATOR+authorityS+fPathUriS+post; - if( DEBUG ) { - System.err.println("IOUtil.toURL.2: authorityS "+authorityS+", fPath "+fPath+PlatformPropsImpl.NEWLINE+ - "\t -> "+fPathUriS+PlatformPropsImpl.NEWLINE+ - "\t, jarEntry "+jarEntry+PlatformPropsImpl.NEWLINE+ - "\t, post "+post+PlatformPropsImpl.NEWLINE+ - "\t -> "+urlS); - } - url = new URL(urlS); - mode = 2; - } - } catch (final Exception mue) { - if( DEBUG ) { - System.err.println("Caught "+mue.getClass().getSimpleName()+": new URL("+urlS+") failed: "+mue.getMessage()); - mue.printStackTrace(); - } - } - } - } - if( null == url ) { - try { - url = uri.toURL(); - mode = 3; - } catch (final Exception e) { - if( DEBUG ) { - System.err.println("Caught "+e.getClass().getSimpleName()+": "+uri+".toURL() failed: "+e.getMessage()); - e.printStackTrace(); - } - } - } - if( DEBUG ) { - System.err.println("IOUtil.toURL.X: mode "+mode+", "+uri+PlatformPropsImpl.NEWLINE+ - "\t -> "+url); - } - return url; + return uri.toURL(); } /*** @@ -849,15 +716,16 @@ public class IOUtil { * </p> * * @param baseURI denotes a URI to a directory ending w/ '/', or a file. In the latter case the file's directory is being used. - * @param relativePath denotes a relative file to the baseLocation's parent directory + * @param relativePath denotes a relative file to the baseLocation's parent directory (URI encoded) * @throws URISyntaxException if path is empty or has no parent directory available while resolving <code>../</code> */ public static URI getRelativeOf(final URI baseURI, final String relativePath) throws URISyntaxException { - return compose(baseURI.getScheme(), baseURI.getSchemeSpecificPart(), relativePath, baseURI.getFragment()); + return compose(baseURI.getScheme(), baseURI.getRawSchemeSpecificPart(), relativePath, baseURI.getRawFragment()); } /** * Wraps {@link #getRelativeOf(URI, String)} for convenience. + * @param relativePath denotes a relative file to the baseLocation's parent directory (URI encoded) * @throws IOException */ public static URL getRelativeOf(final URL baseURL, final String relativePath) throws IOException { @@ -902,7 +770,19 @@ public class IOUtil { schemeSpecificPart = schemeSpecificPart + relativePath; } schemeSpecificPart = cleanPathString( schemeSpecificPart ); - return new URI(scheme, null == query ? schemeSpecificPart : schemeSpecificPart + "?" + query, fragment); + final StringBuilder uri = new StringBuilder(); + uri.append(scheme); + uri.append(':'); + uri.append(schemeSpecificPart); + if ( null != query ) { + uri.append('?'); + uri.append(query); + } + if ( null != fragment ) { + uri.append('#'); + uri.append(fragment); + } + return new URI(uri.toString()); } private static final Pattern patternSpaceRaw = Pattern.compile(" "); @@ -913,9 +793,10 @@ public class IOUtil { * <ul> * <li>SPACE -> %20</li> * </ul> + * @deprecated Useless */ - public static String encodeToURI(final String s) { - return patternSpaceRaw.matcher(s).replaceAll("%20"); + public static String encodeToURI(final String vanilla) { + return patternSpaceRaw.matcher(vanilla).replaceAll("%20"); // Uri TODO: Uri.encode(vanilla, Uri.PATH_MIN_LEGAL); } /** @@ -923,9 +804,10 @@ public class IOUtil { * <ul> * <li>%20 -> SPACE</li> * </ul> + * @deprecated Use {@link #decodeURIIfFilePath(URI)} */ - public static String decodeFromURI(final String s) { - return patternSpaceEnc.matcher(s).replaceAll(" "); + public static String decodeFromURI(final String encodedUri) { + return patternSpaceEnc.matcher(encodedUri).replaceAll(" "); // Uri TODO: Uri.decode(encoded); } private static final Pattern patternSingleBS = Pattern.compile("\\\\{1}"); @@ -934,7 +816,7 @@ public class IOUtil { /** * Encodes file path characters not complying w/ RFC 2396 and the {@link URI#URI(String)} ctor. * <p> - * Implementation processes the <code>filePath</code> if {@link File#separatorChar} <code> != '/'</code> + * Implementation processes the <code>filePath</code> if {@link File#separatorChar} <code> == '\\'</code> * as follows: * <ul> * <li>backslash -> slash</li> @@ -951,9 +833,10 @@ public class IOUtil { * See Bug 857 - http://jogamp.org/bugzilla/show_bug.cgi?id=857 * </p> * @see #encodeToURI(String) + * @deprecated Useless */ public static String encodeFilePathToURI(final String filePath) { - if( !File.separator.equals("/") ) { + if( File.separator.equals("\\") ) { final String r = patternSingleBS.matcher(filePath).replaceAll("/"); if( !r.startsWith("/") ) { return "/" + r; @@ -965,23 +848,25 @@ public class IOUtil { } /** - * Decodes uri-file path characters complying w/ RFC 2396 to native file-path. + * Completes decoding uri-file path characters complying w/ RFC 2396 to native file-path. * <p> * Implementation decodes the space-encoding <code>path={@link #decodeFromURI(String) decodeFromURI}(uriPath)</code>. * </p> * <p> - * Then it processes the <code>path</code> if {@link File#separatorChar} <code> != '/'</code> + * Then it processes the <code>path</code> if {@link File#separatorChar} <code> == '\\'</code> * as follows: * <ul> * <li>slash -> backslash</li> - * <li>drop a starting single backslash</li> + * <li>drop a starting single backslash, preserving windows UNC</li> * </ul> * </p> + * @param encodedUriPath URI encoded path * @see #decodeFromURI(String) + * @deprecated Use {@link #decodeURIIfFilePath(URI)} */ - public static String decodeURIToFilePath(final String uriPath) { - final String path = IOUtil.decodeFromURI(uriPath); - if( !File.separator.equals("/") ) { + public static String decodeURIToFilePath(final String encodedUriPath) { + final String path = patternSpaceEnc.matcher(encodedUriPath).replaceAll(" "); // Uri TODO: Uri.decode(encoded); + if( File.separator.equals("\\") ) { final String r = patternSingleFS.matcher(path).replaceAll("\\\\"); if( r.startsWith("\\") && !r.startsWith("\\\\") ) { // '\\\\' denotes UNC hostname, which shall not be cut-off return r.substring(1); @@ -994,7 +879,14 @@ public class IOUtil { /** * If <code>uri</code> is a <i>file scheme</i>, - * implementation returns the decoded <i>[ "//"+{@link URI#getAuthority()} ] + {@link URI#getPath()}</i> via {@link #decodeURIToFilePath(String)}. + * implementation completes space-decoding <i>[ "//"+{@link URI#getAuthority()} ] + {@link URI#getPath()}</i>.<br> + * Then it processes the <code>path</code> if {@link File#separatorChar} <code> == '\\'</code> + * as follows: + * <ul> + * <li>slash -> backslash</li> + * <li>drop a starting single backslash, preserving windows UNC</li> + * </ul> + * </p> * <p> * Otherwise it returns the {@link URI#toASCIIString()} encoded URI. * </p> @@ -1012,7 +904,16 @@ public class IOUtil { } else { authorityS = "//"+authority; } - return decodeURIToFilePath(authorityS+uri.getPath()); + final String path = patternSpaceEnc.matcher(authorityS+uri.getPath()).replaceAll(" "); // Uri TODO: Uri.decode(encoded); + if( File.separator.equals("\\") ) { + final String r = patternSingleFS.matcher(path).replaceAll("\\\\"); + if( r.startsWith("\\") && !r.startsWith("\\\\") ) { // '\\\\' denotes UNC hostname, which shall not be cut-off + return r.substring(1); + } else { + return r; + } + } + return path; } } return uri.toASCIIString(); @@ -1307,7 +1208,7 @@ public class IOUtil { * </p> * @param tmpRoot * @param executable - * @param dbgMsg TODO + * @param dbgMsg * @param tmpDirPrefix * @return a temporary directory, writable by this user * @throws SecurityException diff --git a/src/java/com/jogamp/common/util/JarUtil.java b/src/java/com/jogamp/common/util/JarUtil.java index eeee82a..3fe03bf 100644 --- a/src/java/com/jogamp/common/util/JarUtil.java +++ b/src/java/com/jogamp/common/util/JarUtil.java @@ -276,22 +276,21 @@ public class JarUtil { // file:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class // to // file:/some/path/gluegen-rt.jar - final String uriS0 = classJarURI.getSchemeSpecificPart(); - final int idx = uriS0.lastIndexOf(IOUtil.JAR_SCHEME_SEPARATOR); - final String uriS1; + final String uriSSP = classJarURI.getRawSchemeSpecificPart(); + final int idx = uriSSP.lastIndexOf(IOUtil.JAR_SCHEME_SEPARATOR); + final String uriSSPJar; if (0 <= idx) { - uriS1 = uriS0.substring(0, idx); // exclude '!/' + uriSSPJar = uriSSP.substring(0, idx); // exclude '!/' } else { throw new IllegalArgumentException("JAR URI does not contain jar uri terminator '!', uri <"+classJarURI+">"); } - if(0 >= uriS1.lastIndexOf(".jar")) { + if(0 >= uriSSPJar.lastIndexOf(".jar")) { throw new IllegalArgumentException("No Jar name in <"+classJarURI+">"); } - final String uriS2 = IOUtil.encodeToURI(uriS1); // 'new URI(String)' will not encode space! if(DEBUG) { - System.err.println("getJarSubURI res: "+classJarURI+" -> "+uriS0+" -> "+uriS1+" -> "+uriS2); + System.err.println("getJarSubURI res: "+classJarURI+" -> "+uriSSP+" -> "+uriSSPJar); } - return new URI(uriS2); + return new URI(uriSSPJar); } /** @@ -302,6 +301,7 @@ public class JarUtil { * i.e. <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> * @return <code>/com/jogamp/common/GlueGenVersion.class</code> * @see {@link IOUtil#getClassURL(String, ClassLoader)} + * @deprecated Useless */ public static String getJarEntry(final URI classJarURI) { if(null == classJarURI) { @@ -310,18 +310,19 @@ public class JarUtil { if( !classJarURI.getScheme().equals(IOUtil.JAR_SCHEME) ) { throw new IllegalArgumentException("URI is not a using scheme "+IOUtil.JAR_SCHEME+": <"+classJarURI+">"); } - // final String uriS = classJarURI.toString(); // getSchemeSpecificPart(); ignore fragment ! - final String uriS = classJarURI.getSchemeSpecificPart(); + final String uriSSP = classJarURI.getSchemeSpecificPart(); + // Uri TODO ? final String uriSSP = classJarURI.getRawSchemeSpecificPart(); // from // file:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class // to // /com/jogamp/common/GlueGenVersion.class - final int idx = uriS.lastIndexOf(IOUtil.JAR_SCHEME_SEPARATOR); + final int idx = uriSSP.lastIndexOf(IOUtil.JAR_SCHEME_SEPARATOR); if (0 <= idx) { - final String res = uriS.substring(idx+1); // right of '!' + final String res = uriSSP.substring(idx+1); // right of '!' + // Uri TODO ? final String res = Uri.decode(uriSSP.substring(idx+1)); // right of '!' if(DEBUG) { - System.err.println("getJarEntry res: "+classJarURI+" -> "+uriS+" -> "+idx+" -> "+res); + System.err.println("getJarEntry res: "+classJarURI+" -> "+uriSSP+" -> "+idx+" -> "+res); } return res; } else { @@ -369,7 +370,7 @@ public class JarUtil { if(null == clazzBinName || null == cl) { throw new IllegalArgumentException("null arguments: clazzBinName "+clazzBinName+", cl "+cl); } - final URI uri = new URI(IOUtil.JAR_SCHEME, getJarSubURI(clazzBinName, cl).toString()+"!/", null); + final URI uri = new URI(IOUtil.JAR_SCHEME+IOUtil.SCHEME_SEPARATOR+getJarSubURI(clazzBinName, cl).toString()+"!/"); if(DEBUG) { System.err.println("getJarFileURI res: "+uri); } @@ -378,7 +379,7 @@ public class JarUtil { /** * @param baseUri file:/some/path/ - * @param jarFileName gluegen-rt.jar + * @param jarFileName gluegen-rt.jar (URI encoded) * @return jar:file:/some/path/gluegen-rt.jar!/ * @throws URISyntaxException * @throws IllegalArgumentException null arguments @@ -387,7 +388,7 @@ public class JarUtil { if(null == baseUri || null == jarFileName) { throw new IllegalArgumentException("null arguments: baseURI "+baseUri+", jarFileName "+jarFileName); } - return new URI(IOUtil.JAR_SCHEME, baseUri.toString()+jarFileName+"!/", null); + return new URI(IOUtil.JAR_SCHEME+IOUtil.SCHEME_SEPARATOR+baseUri.toString()+jarFileName+"!/"); } /** @@ -400,11 +401,11 @@ public class JarUtil { if(null == jarSubUri) { throw new IllegalArgumentException("jarSubURI is null"); } - return new URI(IOUtil.JAR_SCHEME, jarSubUri.toString()+"!/", null); + return new URI(IOUtil.JAR_SCHEME+IOUtil.SCHEME_SEPARATOR+jarSubUri.toString()+"!/"); } /** - * @param jarSubUriS file:/some/path/gluegen-rt.jar + * @param jarSubUriS file:/some/path/gluegen-rt.jar (URI encoded) * @return jar:file:/some/path/gluegen-rt.jar!/ * @throws IllegalArgumentException null arguments * @throws URISyntaxException @@ -413,7 +414,7 @@ public class JarUtil { if(null == jarSubUriS) { throw new IllegalArgumentException("jarSubURIS is null"); } - return new URI(IOUtil.JAR_SCHEME, jarSubUriS+"!/", null); + return new URI(IOUtil.JAR_SCHEME+IOUtil.SCHEME_SEPARATOR+jarSubUriS+"!/"); } /** @@ -457,11 +458,10 @@ public class JarUtil { if(DEBUG) { System.err.println("getJarFile.0: "+jarFileURI.toString()); } - final URL jarFileURL = IOUtil.toURL(jarFileURI); + final URL jarFileURL = jarFileURI.toURL(); if(DEBUG) { System.err.println("getJarFile.1: "+jarFileURL.toString()); } - // final URL jarFileURL = jarFileURI.toURL(); // doesn't work due to encoded path even w/ file schema! final URLConnection urlc = jarFileURL.openConnection(); if(urlc instanceof JarURLConnection) { final JarURLConnection jarConnection = (JarURLConnection)jarFileURL.openConnection(); @@ -503,7 +503,7 @@ public class JarUtil { * @param classFromJavaJar Used to get the root URI for the class's Jar URI. * @param cutOffInclSubDir The <i>cut off</i> included sub-directory prepending the relative resource path. * If the root URI includes cutOffInclSubDir, it is no more added to the result. - * @param relResPath The relative resource path. + * @param relResPath The relative resource path. (URI encoded) * @return The resulting resource URI, which is not tested. * @throws IllegalArgumentException * @throws IOException 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(); + } + } + } +} |