This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch recycler-api-3.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 30055745a6224c73f50991ceece9b320e12d63bf Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Mar 29 13:10:17 2023 +0200 Fix tests --- .../core/appender/SyslogAppenderCustomLayoutTest.java | 4 ++-- .../logging/log4j/core/appender/SyslogAppenderTest.java | 2 ++ .../log4j/core/appender/TlsSyslogAppenderTest.java | 3 ++- .../RollingAppenderDirectWriteWithHtmlLayoutTest.java | 16 +++++++++------- .../apache/logging/log4j/core/layout/GelfLayoutTest.java | 2 ++ .../logging/log4j/core/layout/Rfc5424LayoutTest.java | 6 +++++- .../logging/log4j/core/layout/SyslogLayoutTest.java | 2 ++ 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java index 68b2f005a0..4a57bf787f 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ - package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.core.appender.SyslogAppender.Builder; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.layout.SyslogLayout; import org.apache.logging.log4j.core.net.Facility; @@ -31,7 +31,7 @@ public class SyslogAppenderCustomLayoutTest extends SyslogAppenderTest { @Override protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { final Builder builder = super.newSyslogAppenderBuilder(protocol, format, newLine); - builder.setLayout(SyslogLayout.newBuilder().setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); + builder.setLayout(SyslogLayout.newBuilder().setConfiguration(new DefaultConfiguration()).setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); return builder; } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java index ad0a0dd3e6..a34d8d3622 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.net.SocketException; import org.apache.logging.log4j.core.appender.SyslogAppender.Builder; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.net.Protocol; import org.apache.logging.log4j.core.test.net.mock.MockSyslogServerFactory; import org.apache.logging.log4j.util.EnglishEnums; @@ -116,6 +117,7 @@ public class SyslogAppenderTest extends SyslogAppenderTestBase { protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { // @formatter:off return SyslogAppender.newSyslogAppenderBuilder() + .setConfiguration(new DefaultConfiguration()) .setPort(PORTNUM) .setProtocol(EnglishEnums.valueOf(Protocol.class, protocol)) .setReconnectDelayMillis(-1) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java index 756d21d9b2..06b33c73e4 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java @@ -22,6 +22,7 @@ import java.util.List; import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.net.Facility; import org.apache.logging.log4j.core.net.Protocol; import org.apache.logging.log4j.core.net.ssl.KeyStoreConfiguration; @@ -110,7 +111,7 @@ public class TlsSyslogAppenderTest extends SyslogAppenderTest { .setName("TestApp") .setImmediateFlush(true) .setIgnoreExceptions(false).setFilter(null) - .setConfiguration(null) + .setConfiguration(new DefaultConfiguration()) .setAdvertise(false) .setFacility(Facility.LOCAL0) .setId("Audit") diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java index 786753f139..286729f1d1 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithHtmlLayoutTest.java @@ -16,8 +16,16 @@ */ package org.apache.logging.log4j.core.appender.rolling; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.logging.log4j.core.appender.RollingFileAppender; import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.layout.HtmlLayout; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; @@ -28,13 +36,6 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.apache.logging.log4j.core.test.hamcrest.Descriptors.that; import static org.apache.logging.log4j.core.test.hamcrest.FileMatchers.hasName; import static org.hamcrest.MatcherAssert.assertThat; @@ -65,6 +66,7 @@ public class RollingAppenderDirectWriteWithHtmlLayoutTest { private void checkAppenderWithHtmlLayout(boolean append, final Configuration config) throws InterruptedException, IOException { String prefix = "testHtml_" + (append ? "append_" : "noAppend_"); RollingFileAppender appender = RollingFileAppender.newBuilder() + .setConfiguration(new DefaultConfiguration()) .setName("RollingHtml") .setFilePattern(DIR + "/" + prefix + "_-%d{MM-dd-yy-HH-mm}-%i.html") .setPolicy(new SizeBasedTriggeringPolicy(500)) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java index 0b63af7f98..11949f3cd8 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java @@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.layout.GelfLayout.CompressionType; import org.apache.logging.log4j.core.lookup.JavaLookup; import org.apache.logging.log4j.core.test.BasicConfigurationFactory; @@ -299,6 +300,7 @@ public class GelfLayoutTest { private void testRequiresLocation(String messagePattern, Boolean requiresLocation) { GelfLayout layout = GelfLayout.newBuilder() + .setConfiguration(new DefaultConfiguration()) .setMessagePattern(messagePattern) .build(); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java index d053b92e51..4b5d69dbe6 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java @@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.net.Facility; import org.apache.logging.log4j.core.test.BasicConfigurationFactory; import org.apache.logging.log4j.core.test.appender.ListAppender; @@ -538,6 +539,7 @@ public class Rfc5424LayoutTest { } final AbstractStringLayout layout = new Rfc5424Layout.Rfc5424LayoutBuilder() + .setConfig(new DefaultConfiguration()) .setFacility(Facility.LOCAL0) .setId("Event") .setEin("1234.56.7") @@ -569,7 +571,7 @@ public class Rfc5424LayoutTest { @Test public void testLayoutBuilderDefaultValues() { - final Rfc5424Layout layout = new Rfc5424Layout.Rfc5424LayoutBuilder().build(); + final Rfc5424Layout layout = new Rfc5424Layout.Rfc5424LayoutBuilder().setConfig(new DefaultConfiguration()).build(); checkDefaultValues(layout); final PluginNamespace corePlugins = ctx.getInjector().getInstance(Core.PLUGIN_NAMESPACE_KEY); @@ -599,6 +601,7 @@ public class Rfc5424LayoutTest { @ValueSource(strings = { "123456789", "0", "2147483647", "123.45.6.78.9", "0.0.0.0.0.0.0.0.0.0.0.0.0.0" }) void testLayoutBuilderValidEids(String eid) { final AbstractStringLayout layout = new Rfc5424Layout.Rfc5424LayoutBuilder() + .setConfig(new DefaultConfiguration()) .setEin(eid) .build(); @@ -609,6 +612,7 @@ public class Rfc5424LayoutTest { @ValueSource(strings = { "abc", "someEid", "-1" }) void testLayoutBuilderInvalidEids(String eid) { final AbstractStringLayout layout = new Rfc5424Layout.Rfc5424LayoutBuilder() + .setConfig(new DefaultConfiguration()) .setEin(eid) .build(); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java index a75753ebea..8955b48a75 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java @@ -26,6 +26,7 @@ import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.net.Facility; import org.apache.logging.log4j.core.test.BasicConfigurationFactory; import org.apache.logging.log4j.core.test.appender.ListAppender; @@ -75,6 +76,7 @@ public class SyslogLayoutTest { // set up appender // @formatter:off final SyslogLayout layout = SyslogLayout.newBuilder() + .setConfiguration(new DefaultConfiguration()) .setFacility(Facility.LOCAL0) .setIncludeNewLine(true) .build();
