From 177ee444d1b86e6412f636d5f4e8f0695d418246 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 5 Aug 2023 03:15:09 +0200 Subject: Cleanup unit test class names: Try to start w/ 'Test', remove intermediate 'Test' for supporting, non-test classes --- .../net/AssetURLConnectionRegisteredTest.java | 91 ---------------------- .../net/AssetURLConnectionUnregisteredTest.java | 64 --------------- .../net/TestAssetURLConnectionRegistered.java | 91 ++++++++++++++++++++++ .../net/TestAssetURLConnectionUnregistered.java | 64 +++++++++++++++ 4 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java delete mode 100644 src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java create mode 100644 src/junit/com/jogamp/common/net/TestAssetURLConnectionRegistered.java create mode 100644 src/junit/com/jogamp/common/net/TestAssetURLConnectionUnregistered.java (limited to 'src/junit/com/jogamp/common/net') diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java b/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java deleted file mode 100644 index cb6200d..0000000 --- a/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.jogamp.common.net; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.jogamp.common.util.IOUtil; - -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class AssetURLConnectionRegisteredTest extends AssetURLConnectionBase { - - @BeforeClass - public static void assetRegistration() throws Exception { - try { - System.err.println("******* Asset URL Stream Handler Registration: PRE"); - Assert.assertTrue("GenericURLStreamHandlerFactory.register() failed", AssetURLContext.registerHandler(AssetURLConnectionRegisteredTest.class.getClassLoader())); - Assert.assertNotNull(AssetURLContext.getRegisteredHandler()); - System.err.println("******* Asset URL Stream Handler Registration: POST"); - } catch (final Exception e) { - setTestSupported(false); - throw e; - } - } - - @Test - public void assetRegisteredURLConnection_RT() throws IOException { - testAssetConnection(createAssetURLConnection(test_asset_rt_url), test_asset_rt_entry); - } - - @Test - public void assetRegisteredURLConnection_Test() throws IOException { - testAssetConnection(createAssetURLConnection(test_asset_test1_url), test_asset_test1_entry); - } - - @Test - public void assetRegisteredIOUtilGetResourceRel1_RT() throws IOException, URISyntaxException { - final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2a_url, this.getClass().getClassLoader()); - Assert.assertNotNull(urlConn0); - Assert.assertEquals(test_asset_test2a_url, urlConn0.getURL().toExternalForm()); - testAssetConnection(urlConn0, test_asset_test2_entry); - - final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); - Assert.assertNotNull(uri1); - Assert.assertEquals(test_asset_test3a_url, uri1.toString()); - testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); - - final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); - Assert.assertNotNull(uri2); - Assert.assertEquals(test_asset_test4a_url, uri2.toString()); - testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); - } - - @Test - public void assetRegisteredIOUtilGetResourceRel2_RT() throws IOException, URISyntaxException { - final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2b_url, this.getClass().getClassLoader()); - Assert.assertNotNull(urlConn0); - Assert.assertEquals(test_asset_test2b_url, urlConn0.getURL().toExternalForm()); - testAssetConnection(urlConn0, test_asset_test2_entry); - - final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); - Assert.assertNotNull(uri1); - Assert.assertEquals(test_asset_test3b_url, uri1.toString()); - testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); - - final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); - Assert.assertNotNull(uri2); - Assert.assertEquals(test_asset_test4b_url, uri2.toString()); - testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); - } - - URLConnection createAssetURLConnection(final String path) throws IOException { - final URL url = AssetURLContext.createURL(path); - final URLConnection c = url.openConnection(); - System.err.println("createAssetURL: "+path+" -> url: "+url+" -> conn: "+c+" / connURL "+(null!=c?c.getURL():null)); - return c; - - } - - public static void main(final String args[]) throws IOException { - final String tstname = AssetURLConnectionRegisteredTest.class.getName(); - org.junit.runner.JUnitCore.main(tstname); - } -} diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java b/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java deleted file mode 100644 index 1bb88c5..0000000 --- a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jogamp.common.net; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; - -import org.junit.Assert; -import org.junit.Test; - -import com.jogamp.common.util.IOUtil; - -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class AssetURLConnectionUnregisteredTest extends AssetURLConnectionBase { - @Test - public void assetUnregisteredURLConnection_RT2() throws IOException { - testAssetConnection(createAssetURLConnection(test_asset_rt2_url, this.getClass().getClassLoader()), test_asset_rt_entry); - } - - @Test - public void assetUnregisteredURLConnection_RT() throws IOException { - testAssetConnection(createAssetURLConnection(test_asset_rt_url, this.getClass().getClassLoader()), test_asset_rt_entry); - } - - @Test - public void assetUnregisteredURLConnection_Test() throws IOException { - testAssetConnection(createAssetURLConnection(test_asset_test1_url, this.getClass().getClassLoader()), test_asset_test1_entry); - } - - @Test - public void assetUnregisteredIOUtilGetResourceAbs_RT() throws IOException { - final URLConnection c = IOUtil.getResource(test_asset_rt_entry, this.getClass().getClassLoader()); - testAssetConnection(c, test_asset_rt_entry); - } - - @Test - public void assetUnregisteredIOUtilGetResourceRel0_RT() throws IOException, URISyntaxException { - final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2_rel.get(), this.getClass().getClassLoader(), this.getClass()); - testAssetConnection(urlConn0, test_asset_test2_entry); - - final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); - Assert.assertNotNull(uri1); // JARFile URL .. - testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); - - final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); - Assert.assertNotNull(uri2); - testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); - } - - protected static URLConnection createAssetURLConnection(final String path, final ClassLoader cl) throws IOException { - final URL url = AssetURLContext.createURL(path, cl); - final URLConnection c = url.openConnection(); - System.err.println("createAssetURL: "+path+" -> url: "+url+" -> conn: "+c+" / connURL "+(null!=c?c.getURL():null)); - return c; - } - - public static void main(final String args[]) throws IOException { - final String tstname = AssetURLConnectionUnregisteredTest.class.getName(); - org.junit.runner.JUnitCore.main(tstname); - } -} diff --git a/src/junit/com/jogamp/common/net/TestAssetURLConnectionRegistered.java b/src/junit/com/jogamp/common/net/TestAssetURLConnectionRegistered.java new file mode 100644 index 0000000..cb6200d --- /dev/null +++ b/src/junit/com/jogamp/common/net/TestAssetURLConnectionRegistered.java @@ -0,0 +1,91 @@ +package com.jogamp.common.net; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.jogamp.common.util.IOUtil; + +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class AssetURLConnectionRegisteredTest extends AssetURLConnectionBase { + + @BeforeClass + public static void assetRegistration() throws Exception { + try { + System.err.println("******* Asset URL Stream Handler Registration: PRE"); + Assert.assertTrue("GenericURLStreamHandlerFactory.register() failed", AssetURLContext.registerHandler(AssetURLConnectionRegisteredTest.class.getClassLoader())); + Assert.assertNotNull(AssetURLContext.getRegisteredHandler()); + System.err.println("******* Asset URL Stream Handler Registration: POST"); + } catch (final Exception e) { + setTestSupported(false); + throw e; + } + } + + @Test + public void assetRegisteredURLConnection_RT() throws IOException { + testAssetConnection(createAssetURLConnection(test_asset_rt_url), test_asset_rt_entry); + } + + @Test + public void assetRegisteredURLConnection_Test() throws IOException { + testAssetConnection(createAssetURLConnection(test_asset_test1_url), test_asset_test1_entry); + } + + @Test + public void assetRegisteredIOUtilGetResourceRel1_RT() throws IOException, URISyntaxException { + final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2a_url, this.getClass().getClassLoader()); + Assert.assertNotNull(urlConn0); + Assert.assertEquals(test_asset_test2a_url, urlConn0.getURL().toExternalForm()); + testAssetConnection(urlConn0, test_asset_test2_entry); + + final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); + Assert.assertNotNull(uri1); + Assert.assertEquals(test_asset_test3a_url, uri1.toString()); + testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); + + final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); + Assert.assertNotNull(uri2); + Assert.assertEquals(test_asset_test4a_url, uri2.toString()); + testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); + } + + @Test + public void assetRegisteredIOUtilGetResourceRel2_RT() throws IOException, URISyntaxException { + final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2b_url, this.getClass().getClassLoader()); + Assert.assertNotNull(urlConn0); + Assert.assertEquals(test_asset_test2b_url, urlConn0.getURL().toExternalForm()); + testAssetConnection(urlConn0, test_asset_test2_entry); + + final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); + Assert.assertNotNull(uri1); + Assert.assertEquals(test_asset_test3b_url, uri1.toString()); + testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); + + final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); + Assert.assertNotNull(uri2); + Assert.assertEquals(test_asset_test4b_url, uri2.toString()); + testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); + } + + URLConnection createAssetURLConnection(final String path) throws IOException { + final URL url = AssetURLContext.createURL(path); + final URLConnection c = url.openConnection(); + System.err.println("createAssetURL: "+path+" -> url: "+url+" -> conn: "+c+" / connURL "+(null!=c?c.getURL():null)); + return c; + + } + + public static void main(final String args[]) throws IOException { + final String tstname = AssetURLConnectionRegisteredTest.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } +} diff --git a/src/junit/com/jogamp/common/net/TestAssetURLConnectionUnregistered.java b/src/junit/com/jogamp/common/net/TestAssetURLConnectionUnregistered.java new file mode 100644 index 0000000..1bb88c5 --- /dev/null +++ b/src/junit/com/jogamp/common/net/TestAssetURLConnectionUnregistered.java @@ -0,0 +1,64 @@ +package com.jogamp.common.net; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; + +import org.junit.Assert; +import org.junit.Test; + +import com.jogamp.common.util.IOUtil; + +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class AssetURLConnectionUnregisteredTest extends AssetURLConnectionBase { + @Test + public void assetUnregisteredURLConnection_RT2() throws IOException { + testAssetConnection(createAssetURLConnection(test_asset_rt2_url, this.getClass().getClassLoader()), test_asset_rt_entry); + } + + @Test + public void assetUnregisteredURLConnection_RT() throws IOException { + testAssetConnection(createAssetURLConnection(test_asset_rt_url, this.getClass().getClassLoader()), test_asset_rt_entry); + } + + @Test + public void assetUnregisteredURLConnection_Test() throws IOException { + testAssetConnection(createAssetURLConnection(test_asset_test1_url, this.getClass().getClassLoader()), test_asset_test1_entry); + } + + @Test + public void assetUnregisteredIOUtilGetResourceAbs_RT() throws IOException { + final URLConnection c = IOUtil.getResource(test_asset_rt_entry, this.getClass().getClassLoader()); + testAssetConnection(c, test_asset_rt_entry); + } + + @Test + public void assetUnregisteredIOUtilGetResourceRel0_RT() throws IOException, URISyntaxException { + final URLConnection urlConn0 = IOUtil.getResource(test_asset_test2_rel.get(), this.getClass().getClassLoader(), this.getClass()); + testAssetConnection(urlConn0, test_asset_test2_entry); + + final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel); + Assert.assertNotNull(uri1); // JARFile URL .. + testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry); + + final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel); + Assert.assertNotNull(uri2); + testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry); + } + + protected static URLConnection createAssetURLConnection(final String path, final ClassLoader cl) throws IOException { + final URL url = AssetURLContext.createURL(path, cl); + final URLConnection c = url.openConnection(); + System.err.println("createAssetURL: "+path+" -> url: "+url+" -> conn: "+c+" / connURL "+(null!=c?c.getURL():null)); + return c; + } + + public static void main(final String args[]) throws IOException { + final String tstname = AssetURLConnectionUnregisteredTest.class.getName(); + org.junit.runner.JUnitCore.main(tstname); + } +} -- cgit v1.2.3