diff options
author | Sven Gothel <[email protected]> | 2012-03-17 21:15:49 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-03-17 21:15:49 +0100 |
commit | 235f8b1cbff8ed13071d5c19c0be492c0b25cb78 (patch) | |
tree | 659845e16bd69372bc7ddc3a42b3aa7130d18df5 /src/junit/com/jogamp/common/net/URLCompositionTest.java | |
parent | 0cfc7847c58b51c9a26b50d905b592d1fc4c8578 (diff) |
Add 'asset' URLConnection; IOUtil uses URLConnection / incr. effeciency; Android ClassLoaderUtil cleanup;
- Add 'asset' URLConnection
- Please read API doc 'PiggybackURLConnection' and 'AssetURLConnection'
- Solves generic resource handling where platform locations may differ,
ie ClassLoader lookup on Android in the 'assets/' subfolder.
- New Android 'AssetDexClassLoader' uses 'assets/' folder for findResource(..)
- aapt.signed (our APK ant task)
- uses 'assets/' folder
- adds the 'assetsdir' attribute allowing to copy other assets into the APK
- IOUtil uses URLConnection / incr. effeciency
- using URLConnection on all getResource(..) since URL
is connected anyways for validation and URLConnection can be used by caller right away
- String getRelativeOf(URL, String) -> URL getRelativeOf(URL, String)
- preserves scheme, authority, etc
- simple parentOf handling, more efficient
- reusing new 'asset' protocol impl.
- Android ClassLoaderUtil cleanup;
- Use createClassLoader(..) impl for build-in static jogamp and user APKs,
which removes code redundancy
Tests: New code path, especially 'assets' are covered by new unit tests, no regressions on Linux.
Diffstat (limited to 'src/junit/com/jogamp/common/net/URLCompositionTest.java')
-rw-r--r-- | src/junit/com/jogamp/common/net/URLCompositionTest.java | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/src/junit/com/jogamp/common/net/URLCompositionTest.java b/src/junit/com/jogamp/common/net/URLCompositionTest.java new file mode 100644 index 0000000..fb6d298 --- /dev/null +++ b/src/junit/com/jogamp/common/net/URLCompositionTest.java @@ -0,0 +1,62 @@ +package com.jogamp.common.net; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.jogamp.common.util.IOUtil; +import com.jogamp.junit.util.JunitTracer; + +public class URLCompositionTest extends JunitTracer { + + @BeforeClass + public static void assetRegistration() throws Exception { + try { + System.err.println("******* Asset URL Stream Handler Registration: PRE"); + Assert.assertTrue("GenericURLStreamHandlerFactory.register() failed", AssetURLContext.registerHandler(URLCompositionTest.class.getClassLoader())); + Assert.assertNotNull(AssetURLContext.getRegisteredHandler()); + System.err.println("******* Asset URL Stream Handler Registration: POST"); + } catch (Exception e) { + setTestSupported(false); + throw e; + } + } + + @Test + public void showURLComponents() throws IOException { + testURLCompositioning(new URL("file:///rootDir/file1.txt")); + testURLCompositioning(new URL("file://host/rootDir/file1.txt")); + testURLCompositioning(new URL("jar:file:/web1/file1.jar!/rootDir/file1.txt")); + testURLCompositioning(new URL("asset:gluegen-test/info.txt")); + testURLCompositioning(new URL("asset:/gluegen-test/info.txt")); + testURLCompositioning(new URL("asset:jar:file:/web1/file1.jar!/rootDir/file1.txt")); + testURLCompositioning(new URL("http://domain.com:1234/web1/index.html?lala=23&lili=24#anchor")); + } + + static void testURLCompositioning(URL u) throws MalformedURLException { + final String scheme = u.getProtocol(); + final String auth = u.getAuthority(); + String path = u.getPath(); + String query = u.getQuery(); + String fragment = u.getRef(); + + System.err.println("scheme <"+scheme+">, auth <"+auth+">, path <"+path+">, query <"+query+">, fragment <"+fragment+">"); + URL u2 = IOUtil.compose(scheme, auth, path, null, query, fragment); + + System.err.println("URL-equals: "+u.equals(u2)); + System.err.println("URL-same : "+u.sameFile(u2)); + System.err.println("URL-orig : <"+u+">"); + System.err.println("URL-comp : <"+u2+">"); + Assert.assertEquals(u, u2); + Assert.assertTrue(u.sameFile(u2)); + } + + public static void main(String args[]) throws IOException { + String tstname = URLCompositionTest.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } +} |