This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fc3cf56bb3aeba289d24577f907ff0d39594e69f Author: Gary Gregory <[email protected]> AuthorDate: Sat Feb 5 08:41:46 2022 -0500 Remove unused exceptions from test method signatures. Conflicts: log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java log4j-1.2-api/src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java log4j-1.2-api/src/test/java/org/apache/log4j/config/RewriteAppenderTest.java --- log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java | 3 +-- .../src/test/java/org/apache/log4j/CallerInformationTest.java | 4 ++-- log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java | 2 +- log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java | 2 +- log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java | 2 +- log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java | 4 ++-- .../java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java | 2 +- .../src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java | 2 +- .../org/apache/log4j/config/PropertiesConfigurationFactoryTest.java | 2 +- .../src/test/java/org/apache/log4j/config/RewriteAppenderTest.java | 2 +- .../java/org/apache/log4j/config/XmlConfigurationFactoryTest.java | 2 +- 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java index 04a4555..494208e 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java @@ -73,8 +73,7 @@ public class DOMConfigurator { } public static Object parseElement(final Element element, final Properties props, - @SuppressWarnings("rawtypes") final Class expectedClass) - throws Exception { + @SuppressWarnings("rawtypes") final Class expectedClass) { return null; } } diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java index 64794a3..fd35e4a 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java @@ -34,7 +34,7 @@ public class CallerInformationTest { public static final LoggerContextRule ctx = new LoggerContextRule(CONFIG); @Test - public void testClassLogger() throws Exception { + public void testClassLogger() { final ListAppender app = ctx.getListAppender("Class").clear(); final Logger logger = Logger.getLogger("ClassLogger"); logger.info("Ignored message contents."); @@ -48,7 +48,7 @@ public class CallerInformationTest { } @Test - public void testMethodLogger() throws Exception { + public void testMethodLogger() { final ListAppender app = ctx.getListAppender("Method").clear(); final Logger logger = Logger.getLogger("MethodLogger"); logger.info("More messages."); diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java index abaac59..700f572 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java @@ -66,7 +66,7 @@ public class CategoryTest { } @Test - public void testExist() throws Exception { + public void testExist() { assertNull(Category.exists("Does not exist for sure")); } diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java index 5e0cadb..0cc7a33 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java @@ -36,7 +36,7 @@ public class LogWithMDCTest { public static final LoggerContextRule CTX = new LoggerContextRule(CONFIG); @Test - public void testMDC() throws Exception { + public void testMDC() { MDC.put("Key1", "John"); MDC.put("Key2", "Smith"); try { diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java index 04f448c..2770124 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java @@ -36,7 +36,7 @@ public class LogWithRouteTest { @Test @LoggerContextSource(CONFIG) - public void testMDC(final Configuration configuration) throws Exception { + public void testMDC(final Configuration configuration) { MDC.put("Type", "Service"); MDC.put("Name", "John Smith"); try { diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java index 97bf1ff..f86a6e6 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java @@ -34,14 +34,14 @@ public class MDCTestCase { } @Test - public void testPut() throws Exception { + public void testPut() { MDC.put("key", "some value"); Assert.assertEquals("some value", MDC.get("key")); Assert.assertEquals(1, MDC.getContext().size()); } @Test - public void testRemoveLastKey() throws Exception { + public void testRemoveLastKey() { MDC.put("key", "some value"); MDC.remove("key"); } diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java index 8088708..21c9b7e 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java @@ -314,7 +314,7 @@ public abstract class AbstractLog4j1ConfigurationTest { return (OutputStream) getOutputStream.invoke(manager); } - private Layout<?> testLayout(final Configuration config, final String appenderName) throws Exception { + private Layout<?> testLayout(final Configuration config, final String appenderName) { final ConsoleAppender appender = config.getAppender(appenderName); assertNotNull("Missing appender '" + appenderName + "' in configuration " + config.getConfigurationSource(), appender); return appender.getLayout(); diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java index 1f74161..e0399e7 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/MapRewriteAppenderTest.java @@ -42,7 +42,7 @@ public class MapRewriteAppenderTest { @Test @LoggerContextSource(value = "log4j1-mapRewrite.xml", v1config = true) - public void testRewrite() throws Exception { + public void testRewrite() { Logger logger = LogManager.getLogger("test"); Map<String, String> map = new HashMap<>(); map.put("message", "This is a test"); diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationFactoryTest.java index de81b63..27fce5d 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationFactoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationFactoryTest.java @@ -38,7 +38,7 @@ public class PropertiesConfigurationFactoryTest { } @Test - public void testProperties() throws Exception { + public void testProperties() { Logger logger = LogManager.getLogger("test"); logger.debug("This is a test of the root logger"); File file = new File("target/temp.A1"); diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/RewriteAppenderTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/RewriteAppenderTest.java index f0ba257..cb92229 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/RewriteAppenderTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/RewriteAppenderTest.java @@ -42,7 +42,7 @@ public class RewriteAppenderTest { @Test @LoggerContextSource(value = "log4j1-rewrite.xml", v1config = true) - public void testRewrite(final LoggerContext context) throws Exception { + public void testRewrite(final LoggerContext context) { Logger logger = LogManager.getLogger("test"); ThreadContext.put("key1", "This is a test"); ThreadContext.put("hello", "world"); diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java index 65b8d47..8967e6d 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java @@ -41,7 +41,7 @@ public class XmlConfigurationFactoryTest { System.setProperty(ConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY, "target/test-classes/log4j1-file.xml"); } @Test - public void testXML() throws Exception { + public void testXML() { Logger logger = LogManager.getLogger("test"); logger.debug("This is a test of the root logger"); File file = new File("target/temp.A1");
