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

Minor test tidyups (including fixing incorrect comment due to copy-and-paste).

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@427418 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2006-08-01 03:10:13 +00:00
parent 9ee6adc5d9
commit be64ad867c
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
View File

@@ -62,13 +62,9 @@ public class FirstPriorityConfigTestCase extends TestCase {
String thisClassPath = thisClass.getName().replace('.', '/') + ".class";
URL baseUrl = dummy.findResource(thisClassPath);
// Now set up the desired classloader hierarchy. We'll put a config
// file of priority=10 in the container path, and ones of both
// "no priority" and priority=20 in the webapp path.
//
// A second properties file with priority=20 is also added,
// so we can check that the first one in the classpath is
// used.
// Now set up the desired classloader hierarchy. We'll put JCL
// in the container path, the testcase in a webapp path, and
// both config files into the webapp path too.
PathableClassLoader containerLoader = new PathableClassLoader(null);
containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
containerLoader.addLogicalLib("commons-logging");
@@ -110,6 +106,19 @@ public class FirstPriorityConfigTestCase extends TestCase {
*/
public void testPriority() throws Exception {
LogFactory instance = LogFactory.getFactory();
ClassLoader thisClassLoader = this.getClass().getClassLoader();
ClassLoader lfClassLoader = instance.getClass().getClassLoader();
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
// context classloader should be thisClassLoader
assertEquals(thisClassLoader, contextClassLoader);
// lfClassLoader should be parent of this classloader
assertEquals(lfClassLoader, thisClassLoader.getParent());
assertEquals(PathableClassLoader.class.getName(),
lfClassLoader.getClass().getName());
String id = (String) instance.getAttribute("configId");
assertEquals("Correct config file loaded", "priority20", id );
}