From 9a1ec952ae0e4a6e83cd8c0c61337118d16ea7bf Mon Sep 17 00:00:00 2001 From: Simon Kitching Date: Tue, 17 Jan 2006 08:01:08 +0000 Subject: [PATCH] Unit tests for the new LogFactory feature which loads the commons-logging.properties file with the highest priority. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@369713 13f79535-47bb-0310-9956-ffa450edef68 --- .../config/PriorityConfigTestCase.java | 118 ++++++++++++++++++ .../nopriority/commons-logging.properties | 1 + .../priority10/commons-logging.properties | 2 + .../priority20/commons-logging.properties | 2 + .../priority20a/commons-logging.properties | 2 + 5 files changed, 125 insertions(+) create mode 100644 src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java create mode 100644 src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties create mode 100644 src/test/org/apache/commons/logging/config/priority10/commons-logging.properties create mode 100644 src/test/org/apache/commons/logging/config/priority20/commons-logging.properties create mode 100644 src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties diff --git a/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java b/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java new file mode 100644 index 0000000..853d4a7 --- /dev/null +++ b/src/test/org/apache/commons/logging/config/PriorityConfigTestCase.java @@ -0,0 +1,118 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.commons.logging.config; + + +import java.net.URL; +import java.util.Enumeration; + +import junit.framework.Test; +import junit.framework.TestCase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.PathableClassLoader; +import org.apache.commons.logging.PathableTestSuite; + + +/** + * Tests that verify that the process of configuring logging on startup + * works correctly by selecting the file with the highest priority. + */ + +public class PriorityConfigTestCase extends TestCase { + + // ------------------------------------------- JUnit Infrastructure Methods + + + /** + * Return the tests included in this test suite. + */ + public static Test suite() throws Exception { + Class thisClass = PriorityConfigTestCase.class; + + // Determine the URL to this .class file, so that we can then + // append the priority dirs to it. For tidiness, load this + // class through a dummy loader though this is not absolutely + // necessary... + PathableClassLoader dummy = new PathableClassLoader(null); + dummy.useSystemLoader("junit."); + dummy.addLogicalLib("testclasses"); + dummy.addLogicalLib("commons-logging"); + + 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. + PathableClassLoader containerLoader = new PathableClassLoader(null); + containerLoader.useSystemLoader("junit."); + containerLoader.addLogicalLib("commons-logging"); + + URL pri10URL = new URL(baseUrl, "priority10/"); + containerLoader.addURL(pri10URL); + + PathableClassLoader webappLoader = new PathableClassLoader(containerLoader); + webappLoader.setParentFirst(true); + webappLoader.addLogicalLib("testclasses"); + + URL noPriorityURL = new URL(baseUrl, "nopriority/"); + webappLoader.addURL(noPriorityURL); + + URL pri20URL = new URL(baseUrl, "priority20/"); + webappLoader.addURL(pri20URL); + + URL pri20aURL = new URL(baseUrl, "priority20a/"); + webappLoader.addURL(pri20aURL); + + // load the test class via webapp loader, and use the webapp loader + // as the tccl loader too. + Class testClass = webappLoader.loadClass(thisClass.getName()); + return new PathableTestSuite(testClass, webappLoader); + } + + /** + * Set up instance variables required by this test case. + */ + public void setUp() throws Exception { + LogFactory.releaseAll(); + } + + /** + * Tear down instance variables required by this test case. + */ + public void tearDown() { + LogFactory.releaseAll(); + } + + // ----------------------------------------------------------- Test Methods + + /** + * Verify that the config file being used is the one containing + * the desired configId value. + */ + public void testPriority() throws Exception { + LogFactory instance = LogFactory.getFactory(); + String id = (String) instance.getAttribute("configId"); + assertEquals("Correct config file loaded", "priority20", id ); + } +} diff --git a/src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties b/src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties new file mode 100644 index 0000000..236941d --- /dev/null +++ b/src/test/org/apache/commons/logging/config/nopriority/commons-logging.properties @@ -0,0 +1 @@ +configId=nopriority diff --git a/src/test/org/apache/commons/logging/config/priority10/commons-logging.properties b/src/test/org/apache/commons/logging/config/priority10/commons-logging.properties new file mode 100644 index 0000000..f994634 --- /dev/null +++ b/src/test/org/apache/commons/logging/config/priority10/commons-logging.properties @@ -0,0 +1,2 @@ +priority=10.5 +configId=priority10 diff --git a/src/test/org/apache/commons/logging/config/priority20/commons-logging.properties b/src/test/org/apache/commons/logging/config/priority20/commons-logging.properties new file mode 100644 index 0000000..22d8071 --- /dev/null +++ b/src/test/org/apache/commons/logging/config/priority20/commons-logging.properties @@ -0,0 +1,2 @@ +priority=20.6 +configId=priority20 diff --git a/src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties b/src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties new file mode 100644 index 0000000..4c48149 --- /dev/null +++ b/src/test/org/apache/commons/logging/config/priority20a/commons-logging.properties @@ -0,0 +1,2 @@ +priority=20.6 +configId=priority20a