Fix a few trivial compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@406303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user