Consolidated JsonTemplateLayoutAdditionalField*Test classes.
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldJsonTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldJsonTest.java
deleted file mode 100644
index 4e2eea2..0000000
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldJsonTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.layout.template.json;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.core.test.junit.Named;
-import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.junit.jupiter.api.Test;
-
-@LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.json")
-class JsonTemplateLayoutAdditionalFieldJsonTest {
-
- @Test
- void test_additional_fields_are_resolved(
- final LoggerContext loggerContext,
- final @Named(value = "List") ListAppender appender) {
- JsonTemplateLayoutAdditionalFieldTestHelpers
- .assertAdditionalFields(loggerContext, appender);
- }
-
-}
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldPropertiesTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldPropertiesTest.java
deleted file mode 100644
index 5d3b079..0000000
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldPropertiesTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.layout.template.json;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.core.test.junit.Named;
-import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.junit.jupiter.api.Test;
-
-@LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.properties")
-class JsonTemplateLayoutAdditionalFieldPropertiesTest {
-
- @Test
- void test_additional_fields_are_resolved(
- final LoggerContext loggerContext,
- final @Named(value = "List") ListAppender appender) {
- JsonTemplateLayoutAdditionalFieldTestHelpers
- .assertAdditionalFields(loggerContext, appender);
- }
-
-}
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTest.java
new file mode 100644
index 0000000..9bcf6eb
--- /dev/null
+++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.layout.template.json;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.core.test.junit.Named;
+import org.apache.logging.log4j.layout.template.json.util.JsonReader;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@Execution(ExecutionMode.SAME_THREAD)
+class JsonTemplateLayoutAdditionalFieldTest {
+
+ @Test
+ @LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.json")
+ void test_JSON_config_additional_fields(
+ final LoggerContext loggerContext,
+ final @Named(value = "List") ListAppender appender) {
+ assertAdditionalFields(loggerContext, appender);
+ }
+
+ @Test
+ @LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.properties")
+ void test_Properties_config_additional_fields(
+ final LoggerContext loggerContext,
+ final @Named(value = "List") ListAppender appender) {
+ assertAdditionalFields(loggerContext, appender);
+ }
+
+ @Test
+ @LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.xml")
+ void test_XML_config_additional_fields(
+ final LoggerContext loggerContext,
+ final @Named(value = "List") ListAppender appender) {
+ assertAdditionalFields(loggerContext, appender);
+ }
+
+ @Test
+ @LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.yaml")
+ void test_YAML_config_additional_fields(
+ final LoggerContext loggerContext,
+ final @Named(value = "List") ListAppender appender) {
+ assertAdditionalFields(loggerContext, appender);
+ }
+
+ private static void assertAdditionalFields(
+ final LoggerContext loggerContext,
+ final ListAppender appender) {
+
+ // Log an event.
+ final Logger logger =
+ loggerContext.getLogger(JsonTemplateLayoutAdditionalFieldTest.class);
+ logger.info("trigger");
+
+ // Verify that the appender has logged the event.
+ final List<byte[]> serializedEvents = appender.getData();
+ Assertions.assertThat(serializedEvents).hasSize(1);
+
+ // Deserialize the serialized event.
+ final byte[] serializedEvent = serializedEvents.get(0);
+ final String serializedEventJson =
+ new String(
+ serializedEvent,
+ JsonTemplateLayoutDefaults.getCharset());
+ final Object serializedEventObject = JsonReader.read(serializedEventJson);
+ Assertions.assertThat(serializedEventObject).isInstanceOf(Map.class);
+ @SuppressWarnings("unchecked") final Map<String, Object> serializedEventMap =
+ (Map<String, Object>) serializedEventObject;
+
+ // Verify the serialized additional fields.
+ Assertions
+ .assertThat(serializedEventMap)
+ .containsEntry("stringField", "string")
+ .containsEntry("numberField", 1)
+ .containsEntry("objectField", Collections.singletonMap("numberField", 1))
+ .containsEntry("listField", Arrays.asList(1, "two"));
+
+ }
+
+}
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTestHelpers.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTestHelpers.java
deleted file mode 100644
index d0ca081..0000000
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldTestHelpers.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.layout.template.json;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.layout.template.json.util.JsonReader;
-import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.assertj.core.api.Assertions;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-final class JsonTemplateLayoutAdditionalFieldTestHelpers {
-
- private JsonTemplateLayoutAdditionalFieldTestHelpers() {}
-
- static void assertAdditionalFields(
- final LoggerContext loggerContext,
- final ListAppender appender) {
-
- // Log an event.
- final Logger logger =
- loggerContext.getLogger(
- JsonTemplateLayoutAdditionalFieldTestHelpers.class);
- logger.info("trigger");
-
- // Verify that the appender has logged the event.
- final List<byte[]> serializedEvents = appender.getData();
- Assertions.assertThat(serializedEvents).hasSize(1);
-
- // Deserialize the serialized event.
- final byte[] serializedEvent = serializedEvents.get(0);
- final String serializedEventJson =
- new String(
- serializedEvent,
- JsonTemplateLayoutDefaults.getCharset());
- final Object serializedEventObject = JsonReader.read(serializedEventJson);
- Assertions.assertThat(serializedEventObject).isInstanceOf(Map.class);
- @SuppressWarnings("unchecked") final Map<String, Object> serializedEventMap =
- (Map<String, Object>) serializedEventObject;
-
- // Verify the serialized additional fields.
- Assertions
- .assertThat(serializedEventMap)
- .containsEntry("stringField", "string")
- .containsEntry("numberField", 1)
- .containsEntry("objectField", Collections.singletonMap("numberField", 1))
- .containsEntry("listField", Arrays.asList(1, "two"));
-
- }
-
-}
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldXmlTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldXmlTest.java
deleted file mode 100644
index 818255a..0000000
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldXmlTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.layout.template.json;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.core.test.junit.Named;
-import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.junit.jupiter.api.Test;
-
-@LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.xml")
-class JsonTemplateLayoutAdditionalFieldXmlTest {
-
- @Test
- void test_additional_fields_are_resolved(
- final LoggerContext loggerContext,
- final @Named(value = "List") ListAppender appender) {
- JsonTemplateLayoutAdditionalFieldTestHelpers
- .assertAdditionalFields(loggerContext, appender);
- }
-
-}
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldYamlTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldYamlTest.java
deleted file mode 100644
index 19031ce..0000000
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutAdditionalFieldYamlTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.layout.template.json;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.core.test.junit.Named;
-import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.junit.jupiter.api.Test;
-
-@LoggerContextSource("additionalFieldEnrichedJsonTemplateLayoutLogging.yaml")
-class JsonTemplateLayoutAdditionalFieldYamlTest {
-
- @Test
- void test_additional_fields_are_resolved(
- final LoggerContext loggerContext,
- final @Named(value = "List") ListAppender appender) {
- JsonTemplateLayoutAdditionalFieldTestHelpers
- .assertAdditionalFields(loggerContext, appender);
- }
-
-}
