Fixes tests

The newInstance methods of these converters don't have Configuration any
more.

Author: ppkarwasz

log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java

@@ -16,6 +16,8 @@
  */
 package org.apache.logging.log4j.core.pattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.config.Configuration;
@@ -29,13 +31,11 @@
 import org.apache.logging.log4j.message.StructuredDataMessage;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 public class MessagePatternConverterTest {
 
     @Test
     public void testPattern() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null);
         Message msg = new SimpleMessage("Hello!");
         LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -63,7 +63,7 @@ public void testPattern() {
 
     @Test
     public void testPatternAndParameterizedMessageDateLookup() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null);
         final Message msg = new ParameterizedMessage("${date:now:buhu}");
         final LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -79,7 +79,7 @@ public void testDefaultDisabledLookup() {
         final Configuration config = new DefaultConfigurationBuilder()
                 .addProperty("foo", "bar")
                 .build(true);
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(config, null);
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null);
         final Message msg = new ParameterizedMessage("${foo}");
         final LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -95,8 +95,7 @@ public void testDisabledLookup() {
         final Configuration config = new DefaultConfigurationBuilder()
                 .addProperty("foo", "bar")
                 .build(true);
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(
-                config, new String[] {"nolookups"});
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(new String[] {"nolookups"});
         final Message msg = new ParameterizedMessage("${foo}");
         final LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -113,7 +112,7 @@ public void testLookup() {
                 .addProperty("foo", "bar")
                 .build(true);
         final MessagePatternConverter converter =
-                MessagePatternConverter.newInstance(config, new String[] {"lookups"});
+                MessagePatternConverter.newInstance(new String[] {"lookups"});
         final Message msg = new ParameterizedMessage("${foo}");
         final LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -127,7 +126,7 @@ public void testLookup() {
     @Test
     public void testPatternWithConfiguration() {
         final Configuration config = new DefaultConfiguration();
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(config, null);
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null);
         Message msg = new SimpleMessage("Hello!");
         LogEvent event = Log4jLogEvent.newBuilder() //
                 .setLoggerName("MyLogger") //
@@ -155,7 +154,7 @@ public void testPatternWithConfiguration() {
 
     @Test
     public void testMapMessageFormatJson() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"json"});
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(new String[]{"json"});
         final Message msg = new StringMapMessage()
                 .with("key", "val");
         final LogEvent event = Log4jLogEvent.newBuilder() //
@@ -169,7 +168,7 @@ public void testMapMessageFormatJson() {
 
     @Test
     public void testMapMessageFormatXml() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"xml"});
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(new String[]{"xml"});
         final Message msg = new StringMapMessage()
                 .with("key", "val");
         final LogEvent event = Log4jLogEvent.newBuilder() //
@@ -183,7 +182,7 @@ public void testMapMessageFormatXml() {
 
     @Test
     public void testMapMessageFormatDefault() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null);
         final Message msg = new StringMapMessage()
                 .with("key", "val");
         final LogEvent event = Log4jLogEvent.newBuilder() //
@@ -197,7 +196,7 @@ public void testMapMessageFormatDefault() {
 
     @Test
     public void testStructuredDataFormatFull() {
-        final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"FULL"});
+        final MessagePatternConverter converter = MessagePatternConverter.newInstance(new String[]{"FULL"});
         final Message msg = new StructuredDataMessage("id", "message", "type")
                 .with("key", "val");
         final LogEvent event = Log4jLogEvent.newBuilder() //

log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RepeatPatternConverterTest.java

@@ -16,15 +16,15 @@
  */
 package org.apache.logging.log4j.core.pattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 /**
  * Tests that process ID succeeds.
  */
@@ -33,7 +33,7 @@ public class RepeatPatternConverterTest {
     public void repeat() {
         final String[] args = {"*", "10"};
         final String expected = "**********";
-        PatternConverter converter = RepeatPatternConverter.newInstance(null, args);
+        PatternConverter converter = RepeatPatternConverter.newInstance(args);
         assertNotNull(converter, "No RepeatPatternConverter returned");
         StringBuilder sb = new StringBuilder();
         converter.format(null, sb);