1
0

Format nits

This commit is contained in:
Gary Gregory
2023-11-19 16:24:55 -05:00
parent a39a6d1234
commit a06ae06925
9 changed files with 31 additions and 54 deletions

View File

@@ -25,94 +25,76 @@ import junit.framework.TestCase;
* This is the minimum requirement for any well behaved logger * This is the minimum requirement for any well behaved logger
* and so this test should be run for each kind. * and so this test should be run for each kind.
*/ */
public class BasicOperationsTestCase extends TestCase public class BasicOperationsTestCase extends TestCase {
{
public void executeIsEnabledTest(final Log log) public void executeIsEnabledTest(final Log log) {
{ try {
try
{
log.isTraceEnabled(); log.isTraceEnabled();
log.isDebugEnabled(); log.isDebugEnabled();
log.isInfoEnabled(); log.isInfoEnabled();
log.isWarnEnabled(); log.isWarnEnabled();
log.isErrorEnabled(); log.isErrorEnabled();
log.isFatalEnabled(); log.isFatalEnabled();
} } catch (final Throwable t) {
catch (final Throwable t)
{
t.printStackTrace(); t.printStackTrace();
fail("Exception thrown: " + t); fail("Exception thrown: " + t);
} }
} }
public void executeMessageWithExceptionTest(final Log log) public void executeMessageWithExceptionTest(final Log log) {
{ try {
try
{
log.trace("Hello, Mum", new ArithmeticException()); log.trace("Hello, Mum", new ArithmeticException());
log.debug("Hello, Mum", new ArithmeticException()); log.debug("Hello, Mum", new ArithmeticException());
log.info("Hello, Mum", new ArithmeticException()); log.info("Hello, Mum", new ArithmeticException());
log.warn("Hello, Mum", new ArithmeticException()); log.warn("Hello, Mum", new ArithmeticException());
log.error("Hello, Mum", new ArithmeticException()); log.error("Hello, Mum", new ArithmeticException());
log.fatal("Hello, Mum", new ArithmeticException()); log.fatal("Hello, Mum", new ArithmeticException());
} } catch (final Throwable t) {
catch (final Throwable t)
{
t.printStackTrace(); t.printStackTrace();
fail("Exception thrown: " + t); fail("Exception thrown: " + t);
} }
} }
public void executeMessageWithoutExceptionTest(final Log log) public void executeMessageWithoutExceptionTest(final Log log) {
{ try {
try
{
log.trace("Hello, Mum"); log.trace("Hello, Mum");
log.debug("Hello, Mum"); log.debug("Hello, Mum");
log.info("Hello, Mum"); log.info("Hello, Mum");
log.warn("Hello, Mum"); log.warn("Hello, Mum");
log.error("Hello, Mum"); log.error("Hello, Mum");
log.fatal("Hello, Mum"); log.fatal("Hello, Mum");
} } catch (final Throwable t) {
catch (final Throwable t)
{
t.printStackTrace(); t.printStackTrace();
fail("Exception thrown: " + t); fail("Exception thrown: " + t);
} }
} }
public void testIsEnabledClassLog() public void testIsEnabledClassLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class); final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeIsEnabledTest(log); executeIsEnabledTest(log);
} }
public void testIsEnabledNamedLog() public void testIsEnabledNamedLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName()); final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeIsEnabledTest(log); executeIsEnabledTest(log);
} }
public void testMessageWithExceptionClassLog() public void testMessageWithExceptionClassLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class); final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeMessageWithExceptionTest(log); executeMessageWithExceptionTest(log);
} }
public void testMessageWithExceptionNamedLog() public void testMessageWithExceptionNamedLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName()); final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeMessageWithExceptionTest(log); executeMessageWithExceptionTest(log);
} }
public void testMessageWithoutExceptionClassLog() public void testMessageWithoutExceptionClassLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class); final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeMessageWithoutExceptionTest(log); executeMessageWithoutExceptionTest(log);
} }
public void testMessageWithoutExceptionNamedLog() public void testMessageWithoutExceptionNamedLog() {
{
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName()); final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeMessageWithoutExceptionTest(log); executeMessageWithoutExceptionTest(log);
} }

View File

@@ -23,7 +23,8 @@ import junit.framework.TestCase;
/** /**
* test to emulate container and application isolated from container * test to emulate container and application isolated from container
*/ */
public class LoadTestCase extends TestCase{ public class LoadTestCase extends TestCase {
/** /**
* A custom classloader which "duplicates" logging classes available * A custom classloader which "duplicates" logging classes available
* in the parent classloader into itself. * in the parent classloader into itself.
@@ -156,7 +157,7 @@ public class LoadTestCase extends TestCase{
* Note that this test assumes that commons-logging.jar and log4j.jar * Note that this test assumes that commons-logging.jar and log4j.jar
* are available via the system classpath. * are available via the system classpath.
*/ */
public void testInContainer() throws Exception{ public void testInContainer() throws Exception {
//problem can be in this step (broken app container or missconfiguration) //problem can be in this step (broken app container or missconfiguration)
//1. Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader()); //1. Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());

View File

@@ -16,13 +16,10 @@
*/ */
package org.apache.commons.logging; package org.apache.commons.logging;
public class LogTestCase extends AbstractLogTest {
public class LogTestCase extends AbstractLogTest
{
@Override @Override
public Log getLogObject() public Log getLogObject() {
{
/** /**
* Pickup whatever is found/configured! * Pickup whatever is found/configured!
*/ */

View File

@@ -371,7 +371,7 @@ public class PathableClassLoader extends URLClassLoader {
private ArrayList toList(final Enumeration en) { private ArrayList toList(final Enumeration en) {
final ArrayList results = new ArrayList(); final ArrayList results = new ArrayList();
if (en != null) { if (en != null) {
while (en.hasMoreElements()){ while (en.hasMoreElements()) {
final Object element = en.nextElement(); final Object element = en.nextElement();
results.add(element); results.add(element);
} }

View File

@@ -18,11 +18,9 @@ package org.apache.commons.logging;
import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.logging.impl.SimpleLog;
public class SimpleLogTestCase extends AbstractLogTest public class SimpleLogTestCase extends AbstractLogTest {
{
@Override @Override
public Log getLogObject() public Log getLogObject() {
{
return new SimpleLog(this.getClass().getName()); return new SimpleLog(this.getClass().getName());
} }
} }

View File

@@ -288,7 +288,7 @@ public class WeakHashtableTestCase extends TestCase {
int bytz = 2; int bytz = 2;
while(true) { while(true) {
System.gc(); System.gc();
if (iterations++ > MAX_GC_ITERATIONS){ if (iterations++ > MAX_GC_ITERATIONS) {
fail("Max iterations reached before resource released."); fail("Max iterations reached before resource released.");
} }

View File

@@ -32,8 +32,7 @@ import org.apache.commons.logging.impl.NoOpLog;
* <p> * <p>
* This simply applies the tests defined in AbstractLogTest to this class. * This simply applies the tests defined in AbstractLogTest to this class.
*/ */
public class NoOpLogTestCase extends AbstractLogTest public class NoOpLogTestCase extends AbstractLogTest {
{
private void checkLog(final Log log) { private void checkLog(final Log log) {
assertNotNull("Log exists", log); assertNotNull("Log exists", log);

View File

@@ -41,8 +41,8 @@ import junit.framework.TestCase;
* PathableClassLoader approach to ensure each test is run in its own * PathableClassLoader approach to ensure each test is run in its own
* classloader, and use a separate test class for each test. * classloader, and use a separate test class for each test.
*/ */
public class SecurityAllowedTestCase extends TestCase public class SecurityAllowedTestCase extends TestCase {
{
// Dummy special hashtable, so we can tell JCL to use this instead of // Dummy special hashtable, so we can tell JCL to use this instead of
// the standard one. // the standard one.
public static class CustomHashtable extends Hashtable { public static class CustomHashtable extends Hashtable {

View File

@@ -46,8 +46,8 @@ import junit.framework.TestCase;
* PathableClassLoader approach to ensure each test is run in its own * PathableClassLoader approach to ensure each test is run in its own
* classloader, and use a separate test class for each test. * classloader, and use a separate test class for each test.
*/ */
public class SecurityForbiddenTestCase extends TestCase public class SecurityForbiddenTestCase extends TestCase {
{
// Dummy special hashtable, so we can tell JCL to use this instead of // Dummy special hashtable, so we can tell JCL to use this instead of
// the standard one. // the standard one.
public static class CustomHashtable extends Hashtable { public static class CustomHashtable extends Hashtable {