Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Move declarations

Browse Source
This commit is contained in:
Gary Gregory
2024-06-30 10:46:52 -04:00
parent 93c7195cbb
commit c4d0dca461
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
View File

@@ -18,6 +18,7 @@ package org.apache.commons.logging.pathable;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -236,8 +237,6 @@ public class ParentFirstTestCase extends TestCase {
* Test that getResourceAsStream works. * Test that getResourceAsStream works.
*/ */
public void testResourceAsStream() throws Exception { public void testResourceAsStream() throws Exception {
java.io.InputStream is;
// verify the class loader hierarchy // verify the class loader hierarchy
final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
final ClassLoader childLoader = contextLoader.getParent(); final ClassLoader childLoader = contextLoader.getParent();
@@ -246,7 +245,7 @@ public class ParentFirstTestCase extends TestCase {
assertNull("Unexpected class loader hierarchy", bootLoader); assertNull("Unexpected class loader hierarchy", bootLoader);
// getResourceAsStream where no instances exist // getResourceAsStream where no instances exist
is = childLoader.getResourceAsStream("nosuchfile"); InputStream is = childLoader.getResourceAsStream("nosuchfile");
assertNull("Invalid resource returned non-null stream", is); assertNull("Invalid resource returned non-null stream", is);
// getResourceAsStream where resource does exist // getResourceAsStream where resource does exist
@@ -264,9 +263,6 @@ public class ParentFirstTestCase extends TestCase {
* Test that the various flavors of ClassLoader.getResources work as expected. * Test that the various flavors of ClassLoader.getResources work as expected.
*/ */
public void testResources() throws Exception { public void testResources() throws Exception {
Enumeration<URL> resources;
URL[] urls;
// verify the class loader hierarchy // verify the class loader hierarchy
final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
final ClassLoader childLoader = contextLoader.getParent(); final ClassLoader childLoader = contextLoader.getParent();
@@ -275,8 +271,8 @@ public class ParentFirstTestCase extends TestCase {
assertNull("Unexpected class loader hierarchy", bootLoader); assertNull("Unexpected class loader hierarchy", bootLoader);
// getResources where no instances exist // getResources where no instances exist
resources = childLoader.getResources("nosuchfile"); Enumeration<URL> resources = childLoader.getResources("nosuchfile");
urls = toURLArray(resources); URL[] urls = toURLArray(resources);
assertEquals("Non-null URL returned for invalid resource name", 0, urls.length); assertEquals("Non-null URL returned for invalid resource name", 0, urls.length);
// getResources where the resource only exists in the parent // getResources where the resource only exists in the parent