You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/11/19 21:36:32 UTC
(commons-logging) 10/14: Format nits
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git
commit a06ae06925178b073ec14f2cda773d4f50aa6709
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 19 16:24:55 2023 -0500
Format nits
---
.../commons/logging/BasicOperationsTestCase.java | 52 +++++++---------------
.../org/apache/commons/logging/LoadTestCase.java | 5 ++-
.../org/apache/commons/logging/LogTestCase.java | 7 +--
.../commons/logging/PathableClassLoader.java | 2 +-
.../apache/commons/logging/SimpleLogTestCase.java | 6 +--
.../logging/impl/WeakHashtableTestCase.java | 2 +-
.../commons/logging/noop/NoOpLogTestCase.java | 3 +-
.../logging/security/SecurityAllowedTestCase.java | 4 +-
.../security/SecurityForbiddenTestCase.java | 4 +-
9 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java b/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
index 838073d..46a2017 100644
--- a/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
+++ b/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
@@ -25,94 +25,76 @@ import junit.framework.TestCase;
* This is the minimum requirement for any well behaved logger
* and so this test should be run for each kind.
*/
-public class BasicOperationsTestCase extends TestCase
-{
- public void executeIsEnabledTest(final Log log)
- {
- try
- {
+public class BasicOperationsTestCase extends TestCase {
+
+ public void executeIsEnabledTest(final Log log) {
+ try {
log.isTraceEnabled();
log.isDebugEnabled();
log.isInfoEnabled();
log.isWarnEnabled();
log.isErrorEnabled();
log.isFatalEnabled();
- }
- catch (final Throwable t)
- {
+ } catch (final Throwable t) {
t.printStackTrace();
fail("Exception thrown: " + t);
}
}
- public void executeMessageWithExceptionTest(final Log log)
- {
- try
- {
+ public void executeMessageWithExceptionTest(final Log log) {
+ try {
log.trace("Hello, Mum", new ArithmeticException());
log.debug("Hello, Mum", new ArithmeticException());
log.info("Hello, Mum", new ArithmeticException());
log.warn("Hello, Mum", new ArithmeticException());
log.error("Hello, Mum", new ArithmeticException());
log.fatal("Hello, Mum", new ArithmeticException());
- }
- catch (final Throwable t)
- {
+ } catch (final Throwable t) {
t.printStackTrace();
fail("Exception thrown: " + t);
}
}
- public void executeMessageWithoutExceptionTest(final Log log)
- {
- try
- {
+ public void executeMessageWithoutExceptionTest(final Log log) {
+ try {
log.trace("Hello, Mum");
log.debug("Hello, Mum");
log.info("Hello, Mum");
log.warn("Hello, Mum");
log.error("Hello, Mum");
log.fatal("Hello, Mum");
- }
- catch (final Throwable t)
- {
+ } catch (final Throwable t) {
t.printStackTrace();
fail("Exception thrown: " + t);
}
}
- public void testIsEnabledClassLog()
- {
+ public void testIsEnabledClassLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeIsEnabledTest(log);
}
- public void testIsEnabledNamedLog()
- {
+ public void testIsEnabledNamedLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeIsEnabledTest(log);
}
- public void testMessageWithExceptionClassLog()
- {
+ public void testMessageWithExceptionClassLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeMessageWithExceptionTest(log);
}
- public void testMessageWithExceptionNamedLog()
- {
+ public void testMessageWithExceptionNamedLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeMessageWithExceptionTest(log);
}
- public void testMessageWithoutExceptionClassLog()
- {
+ public void testMessageWithoutExceptionClassLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
executeMessageWithoutExceptionTest(log);
}
- public void testMessageWithoutExceptionNamedLog()
- {
+ public void testMessageWithoutExceptionNamedLog() {
final Log log = LogFactory.getLog(BasicOperationsTestCase.class.getName());
executeMessageWithoutExceptionTest(log);
}
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java b/src/test/java/org/apache/commons/logging/LoadTestCase.java
index 363ce17..3d2a40c 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java
@@ -23,7 +23,8 @@ import junit.framework.TestCase;
/**
* 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
* 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
* 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)
//1. Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
diff --git a/src/test/java/org/apache/commons/logging/LogTestCase.java b/src/test/java/org/apache/commons/logging/LogTestCase.java
index a8b6eac..84b1ced 100644
--- a/src/test/java/org/apache/commons/logging/LogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LogTestCase.java
@@ -16,13 +16,10 @@
*/
package org.apache.commons.logging;
-
-public class LogTestCase extends AbstractLogTest
-{
+public class LogTestCase extends AbstractLogTest {
@Override
- public Log getLogObject()
- {
+ public Log getLogObject() {
/**
* Pickup whatever is found/configured!
*/
diff --git a/src/test/java/org/apache/commons/logging/PathableClassLoader.java b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
index a92fb2a..7dbdb78 100644
--- a/src/test/java/org/apache/commons/logging/PathableClassLoader.java
+++ b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
@@ -371,7 +371,7 @@ public class PathableClassLoader extends URLClassLoader {
private ArrayList toList(final Enumeration en) {
final ArrayList results = new ArrayList();
if (en != null) {
- while (en.hasMoreElements()){
+ while (en.hasMoreElements()) {
final Object element = en.nextElement();
results.add(element);
}
diff --git a/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java b/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
index 100e7e4..7ab68c1 100644
--- a/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
@@ -18,11 +18,9 @@ package org.apache.commons.logging;
import org.apache.commons.logging.impl.SimpleLog;
-public class SimpleLogTestCase extends AbstractLogTest
-{
+public class SimpleLogTestCase extends AbstractLogTest {
@Override
- public Log getLogObject()
- {
+ public Log getLogObject() {
return new SimpleLog(this.getClass().getName());
}
}
diff --git a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
index a3ca9ef..2bf5f52 100644
--- a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
@@ -288,7 +288,7 @@ public class WeakHashtableTestCase extends TestCase {
int bytz = 2;
while(true) {
System.gc();
- if (iterations++ > MAX_GC_ITERATIONS){
+ if (iterations++ > MAX_GC_ITERATIONS) {
fail("Max iterations reached before resource released.");
}
diff --git a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java b/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
index 717137f..033b60f 100644
--- a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
@@ -32,8 +32,7 @@ import org.apache.commons.logging.impl.NoOpLog;
* <p>
* 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) {
assertNotNull("Log exists", log);
diff --git a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
index 83cbdde..1152df7 100644
--- a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
@@ -41,8 +41,8 @@ import junit.framework.TestCase;
* PathableClassLoader approach to ensure each test is run in its own
* 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
// the standard one.
public static class CustomHashtable extends Hashtable {
diff --git a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
index e8da079..07a5be8 100644
--- a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
@@ -46,8 +46,8 @@ import junit.framework.TestCase;
* PathableClassLoader approach to ensure each test is run in its own
* 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
// the standard one.
public static class CustomHashtable extends Hashtable {