diff --git a/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java b/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java index e575e07..ca1746a 100644 --- a/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java +++ b/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java @@ -158,6 +158,7 @@ public class ChildFirstTestCase extends TestCase { try { Class noSuchClass = contextLoader.loadClass("no.such.class"); fail("Class no.such.class is unexpectedly available"); + assertNotNull(noSuchClass); // silence warning about unused var } catch(ClassNotFoundException ex) { // ok } diff --git a/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java b/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java index 32740b8..47f6b74 100644 --- a/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java +++ b/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java @@ -155,6 +155,7 @@ public class ParentFirstTestCase extends TestCase { try { Class noSuchClass = contextLoader.loadClass("no.such.class"); fail("Class no.such.class is unexpectedly available"); + assertNotNull(noSuchClass); // silence warning about unused var } catch(ClassNotFoundException ex) { // ok } diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java b/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java index 54a4ef2..a2e8831 100644 --- a/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java @@ -118,6 +118,7 @@ public class TcclDisabledTestCase extends TestCase { try { Class clazz = thisClassLoader.loadClass(MY_LOG_IMPL); fail("Unexpectedly able to load MyLog via test class classloader"); + assertNotNull(clazz); // silence warnings about unused var } catch(ClassNotFoundException ex) { // ok, expected } @@ -125,6 +126,7 @@ public class TcclDisabledTestCase extends TestCase { // MyLog should be loadable via tccl loader try { Class clazz = tcclLoader.loadClass(MY_LOG_IMPL); + assertNotNull(clazz); } catch(ClassNotFoundException ex) { fail("Unexpectedly unable to load MyLog via tccl classloader"); } @@ -144,9 +146,10 @@ public class TcclDisabledTestCase extends TestCase { instance.getClass().getName()); try { - Log log = instance.getLog("test"); + Log log = instance.getInstance("test"); fail("Unexpectedly succeeded in loading a custom Log class" + " that is only accessable via the tccl."); + assertNotNull(log); // silence compiler warning about unused var } catch(LogConfigurationException ex) { // ok, expected int index = ex.getMessage().indexOf(MY_LOG_IMPL); diff --git a/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java b/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java index ca53223..b2c4559 100644 --- a/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java @@ -118,6 +118,7 @@ public class TcclEnabledTestCase extends TestCase { try { Class clazz = thisClassLoader.loadClass(MY_LOG_IMPL); fail("Unexpectedly able to load MyLog via test class classloader"); + assertNotNull(clazz); // silence warnings about unused var } catch(ClassNotFoundException ex) { // ok, expected } @@ -125,6 +126,7 @@ public class TcclEnabledTestCase extends TestCase { // MyLog should be loadable via tccl loader try { Class clazz = tcclLoader.loadClass(MY_LOG_IMPL); + assertNotNull(clazz); } catch(ClassNotFoundException ex) { fail("Unexpectedly unable to load MyLog via tccl classloader"); } @@ -143,7 +145,7 @@ public class TcclEnabledTestCase extends TestCase { "org.apache.commons.logging.impl.LogFactoryImpl", instance.getClass().getName()); - Log log = instance.getLog("test"); + Log log = instance.getInstance("test"); assertEquals( "Correct Log loaded", MY_LOG_IMPL, diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java b/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java index fa61ef1..b59a691 100644 --- a/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java @@ -120,6 +120,7 @@ public class TcclDisabledTestCase extends TestCase { try { Class clazz = thisClassLoader.loadClass(MY_LOG_FACTORY_IMPL); fail("Unexpectedly able to load MyLogFactoryImpl via test class classloader"); + assertNotNull(clazz); // silence warning about unused var } catch(ClassNotFoundException ex) { // ok, expected } @@ -127,6 +128,7 @@ public class TcclDisabledTestCase extends TestCase { // MyLogFactoryImpl should be loadable via tccl loader try { Class clazz = tcclLoader.loadClass(MY_LOG_FACTORY_IMPL); + assertNotNull(clazz); } catch(ClassNotFoundException ex) { fail("Unexpectedly unable to load MyLogFactoryImpl via tccl classloader"); } @@ -142,6 +144,7 @@ public class TcclDisabledTestCase extends TestCase { try { LogFactory instance = LogFactory.getFactory(); fail("Unexpectedly succeeded in loading custom factory, though TCCL disabled."); + assertNotNull(instance); // silence warning about unused var } catch(org.apache.commons.logging.LogConfigurationException ex) { // ok, custom MyLogFactoryImpl as specified in props_disable_tccl // could not be found. diff --git a/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java b/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java index ea39dc7..d76c6e9 100644 --- a/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java +++ b/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java @@ -115,6 +115,7 @@ public class TcclEnabledTestCase extends TestCase { Class clazz = thisClassLoader.loadClass( "org.apache.commons.logging.tccl.custom.MyLogFactoryImpl"); fail("Unexpectedly able to load MyLogFactoryImpl via test class classloader"); + assertNotNull(clazz); // silence warning about unused var } catch(ClassNotFoundException ex) { // ok, expected } @@ -123,6 +124,7 @@ public class TcclEnabledTestCase extends TestCase { try { Class clazz = tcclLoader.loadClass( "org.apache.commons.logging.tccl.custom.MyLogFactoryImpl"); + assertNotNull(clazz); } catch(ClassNotFoundException ex) { fail("Unexpectedly unable to load MyLogFactoryImpl via tccl classloader"); }