Author: skitching
Date: Tue May 24 18:04:04 2005
New Revision: 178334
URL: http://svn.apache.org/viewcvs?rev=178334&view=rev
Log:
General testcase improvements.
Added:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java
(with props)
Modified:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/BasicTestCase.java
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ChildFirstClassLoader.java
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ParentFirstClassLoader.java
Modified:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/BasicTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/BasicTestCase.java?rev=178334&r1=178333&r2=178334&view=diff
==============================================================================
---
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/BasicTestCase.java
(original)
+++
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/BasicTestCase.java
Tue May 24 18:04:04 2005
@@ -23,6 +23,7 @@
import junit.framework.TestSuite;
import java.net.URL;
+import java.net.URLClassLoader;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.io.OutputStream;
@@ -61,28 +62,20 @@
loader.addURL(testJarPath);
loader.addURL(testPath);
+ // at the moment, the way build.xml invokes this test is
+ // decidedly dodgy. It helps to have output here to show what
+ // the paths are..
String cwd = System.getProperty("user.dir");
System.out.println("Current working dir:" + cwd);
URL[] urls = loader.getURLs();
for(int i=0; i<urls.length; ++i) {
System.out.println("URL: " + urls[i]);
}
+
// create an in-memory stream that logging can output to.
OutputStream logBuffer = new ByteArrayOutputStream();
PrintStream logStream = new PrintStream(logBuffer);
-
- // Check that the factory class that LogFactory binds to is in fact the
- // test factory. Then set the destination stream for logging generated
- // by the test factory loggers.
- Class logFactoryClass = loader.loadClass(LogFactory.class.getName());
- Method getFactoryMethod = logFactoryClass.getMethod("getFactory",
(Class[]) null);
- Object factory = getFactoryMethod.invoke(null, (Object[]) null);
- assertTrue(
- factory.getClass().getName()
- .equals("org.apache.commons.logging.impl.TestFactory"));
- Method setStreamMethod = factory.getClass().getMethod(
- "setStream", new Class[] {PrintStream.class});
- setStreamMethod.invoke(factory, new Object[] {logStream});
+ setTestLoggerStream(loader, logStream);
// ok, now get some code in the loader to execute some log calls
// and see if they appear in our in-memory buffer.
@@ -112,6 +105,56 @@
*/
public void testMultipleCore() {
}
+
+ /**
+ */
+ public void testBasicClassloaderStuff() throws Exception {
+ {
+ // test everything in parent path, parent-first
+ ParentFirstClassLoader parent = new ParentFirstClassLoader(null);
+ addToPath(parent, TestConstants.CORE_JAR);
+ addToPath(parent, TestConstants.TEST_JAR);
+ addToPath(parent, "tests/");
+
+ ParentFirstClassLoader child = new ParentFirstClassLoader(parent);
+ doMultiloaderTest(parent, child);
+ }
+
+ {
+ // test everything in parent path, child-first
+ ParentFirstClassLoader parent = new ParentFirstClassLoader(null);
+ addToPath(parent, TestConstants.CORE_JAR);
+ addToPath(parent, TestConstants.TEST_JAR);
+ addToPath(parent, "tests/");
+
+ ChildFirstClassLoader child = new ChildFirstClassLoader(parent);
+ doMultiloaderTest(parent, child);
+ }
+
+ {
+ // test everything in child path
+ ParentFirstClassLoader parent = new ParentFirstClassLoader(null);
+ ChildFirstClassLoader child = new ChildFirstClassLoader(parent);
+ addToPath(child, TestConstants.CORE_JAR);
+ addToPath(child, TestConstants.TEST_JAR);
+ addToPath(child, "tests/");
+
+ doMultiloaderTest(parent, child);
+ }
+
+ {
+ // test core in parent, everything in child path
+ ParentFirstClassLoader parent = new ParentFirstClassLoader(null);
+ addToPath(parent, TestConstants.CORE_JAR);
+
+ ChildFirstClassLoader child = new ChildFirstClassLoader(parent);
+ addToPath(child, TestConstants.TEST_JAR);
+ addToPath(child, "tests/");
+
+ doMultiloaderTest(parent, child);
+ }
+ }
+
/**
* Given the possible factors:
@@ -128,5 +171,80 @@
* worked or not (and which logging got bound to!).
*/
public void testClassloaderCombinations() {
+ }
+
+ // ========================================================================
+ // Useful methods
+ // ========================================================================
+
+ /**
+ * Get the LogFactory class associated with the specified loader,
+ * check that it is in fact bound to a TestFactory, then set the
+ * TestFactory's output stream to the specified stream.
+ */
+ private static void setTestLoggerStream(ClassLoader loader, PrintStream
stream)
+ throws Exception {
+ // Check that the factory class that LogFactory binds to is in fact the
+ // test factory. Then set the destination stream for logging generated
+ // by the test factory loggers.
+ Class logFactoryClass = loader.loadClass(LogFactory.class.getName());
+ Method getFactoryMethod = logFactoryClass.getMethod("getFactory",
(Class[]) null);
+ Object factory = getFactoryMethod.invoke(null, (Object[]) null);
+ assertTrue(
+ factory.getClass().getName()
+ .equals("org.apache.commons.logging.impl.TestFactory"));
+ Method setStreamMethod = factory.getClass().getMethod(
+ "setStream", new Class[] {PrintStream.class});
+ setStreamMethod.invoke(factory, new Object[] {stream});
+ }
+
+ /**
+ * Add the specified item (jarfile or dir) to the classpath of the
+ * specified classloader. This involves a little bit of fiddling to
+ * generate an appropriate URL.
+ */
+ private static void addToPath(ModifiableClassLoader loader, String item)
+ throws java.net.MalformedURLException {
+ URL base = new URL("file:");
+ URL url = new URL(base, "target/" + item);
+ loader.addURL(url);
+ }
+
+ /**
+ * Given two classloaders already configured with classpaths,
+ * load class LogTester into the child classloader, set the context
+ * classloader to the child, and create an instance
+ * to force a log message to be emitted, then check that the message
+ * was correctly generated.
+ * <p>
+ * It is assumed that performing a lookup of LogFactory via the child
+ * class will result in a LogFactory class which has been bound to
+ * TestFactory (so that it is possible to intercept the logged message).
+ */
+ private static void doMultiloaderTest(ClassLoader parent, ClassLoader child)
+ throws Exception {
+ ClassLoader oldContext = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(child);
+
+ // create an in-memory stream that logging can output to.
+ //
+ // TODO: check whether parent and child have different Factory
+ // objects, and if so set the log stream for the two separately.
+ OutputStream logBuffer = new ByteArrayOutputStream();
+ PrintStream logStream = new PrintStream(logBuffer);
+ setTestLoggerStream(child, logStream);
+
+ // ok, now get some code in the loader to execute some log calls
+ // and see if they appear in our in-memory buffer.
+ Class logTesterClass = child.loadClass(LogTester.class.getName());
+ Object logTester = logTesterClass.newInstance();
+
+ String logOutput = logBuffer.toString();
+ assertTrue("No log output", logOutput.length() > 0);
+ assertEquals("Unexpected log output", "INFO: LogTester test
message\n", logOutput);
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldContext);
+ }
}
}
Modified:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ChildFirstClassLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ChildFirstClassLoader.java?rev=178334&r1=178333&r2=178334&view=diff
==============================================================================
---
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ChildFirstClassLoader.java
(original)
+++
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ChildFirstClassLoader.java
Tue May 24 18:04:04 2005
@@ -26,10 +26,10 @@
* but a more complete and robust implementation should be
* preferred for more general purposes.
*/
-public class ChildFirstClassLoader extends URLClassLoader {
+public class ChildFirstClassLoader extends ModifiableClassLoader {
- public ChildFirstClassLoader(URL[] urls, ClassLoader parent) {
- super(urls, parent);
+ public ChildFirstClassLoader(ClassLoader parent) {
+ super(parent);
}
protected synchronized Class loadClass(String name, boolean resolve)
Added:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java?rev=178334&view=auto
==============================================================================
---
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java
(added)
+++
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java
Tue May 24 18:04:04 2005
@@ -0,0 +1,33 @@
+/* $Id$
+*
+* Copyright 2005 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;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * Trivial class to make addURL method of URLClassLoader public.
+ */
+public class ModifiableClassLoader extends URLClassLoader {
+ public ModifiableClassLoader(ClassLoader parent) {
+ super(new URL[0], parent);
+ }
+ public void addURL(URL url) {
+ super.addURL(url);
+ }
+}
Propchange:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ModifiableClassLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ParentFirstClassLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ParentFirstClassLoader.java?rev=178334&r1=178333&r2=178334&view=diff
==============================================================================
---
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ParentFirstClassLoader.java
(original)
+++
jakarta/commons/proper/logging/branches/simon-1.1/src/test/org/apache/commons/logging/ParentFirstClassLoader.java
Tue May 24 18:04:04 2005
@@ -18,16 +18,13 @@
package org.apache.commons.logging;
import java.net.URL;
-import java.net.URLClassLoader;
/**
- * Trivial class to make addURL method of URLClassLoader public.
+ * Trivial class simply to make it clear when the classloader being created
+ * truly is parent-first.
*/
-public class ParentFirstClassLoader extends URLClassLoader {
+public class ParentFirstClassLoader extends ModifiableClassLoader {
public ParentFirstClassLoader(ClassLoader parent) {
- super(new URL[] {}, parent);
- }
- public void addURL(URL url) {
- super.addURL(url);
+ super(parent);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
