Author: skitching
Date: Sun May 14 03:02:26 2006
New Revision: 406303
URL: http://svn.apache.org/viewcvs?rev=406303&view=rev
Log:
Fix a few trivial compiler warnings.
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ChildFirstTestCase.java
Sun May 14 03:02:26 2006
@@ -158,6 +158,7 @@
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
}
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/pathable/ParentFirstTestCase.java
Sun May 14 03:02:26 2006
@@ -155,6 +155,7 @@
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
}
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
Sun May 14 03:02:26 2006
@@ -118,6 +118,7 @@
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 @@
// 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 @@
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);
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
Sun May 14 03:02:26 2006
@@ -118,6 +118,7 @@
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 @@
// 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 @@
"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,
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
Sun May 14 03:02:26 2006
@@ -120,6 +120,7 @@
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 @@
// 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 @@
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.
Modified:
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java?rev=406303&r1=406302&r2=406303&view=diff
==============================================================================
---
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
(original)
+++
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
Sun May 14 03:02:26 2006
@@ -115,6 +115,7 @@
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 @@
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");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
