[logging-log4j2] branch main updated: Make @SetTestProperty annotation inheritable

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new 6656c6534e Make @SetTestProperty annotation inheritable
6656c6534e is described below

commit 6656c6534e54efaf0cc50d2feedc2621dbc38374
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Wed Sep 20 16:03:36 2023 +0200

    Make @SetTestProperty annotation inheritable
---
 .../logging/log4j/test/junit/TestPropertyResolver.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
 
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
index 24581d5e99..0e0a0d60eb 100644
--- 
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
+++ 
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
@@ -16,6 +16,8 @@
  */
 package org.apache.logging.log4j.test.junit;
 
+import java.util.List;
+
 import org.apache.logging.log4j.test.TestProperties;
 import org.apache.logging.log4j.util.ReflectionUtil;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -23,6 +25,7 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.support.HierarchyTraversalMode;
 import org.junit.platform.commons.support.ModifierSupport;
 import org.junit.platform.commons.support.ReflectionSupport;
@@ -37,9 +40,10 @@ public class TestPropertyResolver extends 
TypeBasedParameterResolver<TestPropert
     @Override
     public void beforeEach(final ExtensionContext context) throws Exception {
         final TestProperties props = 
TestPropertySource.createProperties(context);
-        final SetTestProperty[] setProperties = context.getRequiredTestMethod()
-                .getAnnotationsByType(SetTestProperty.class);
-        if (setProperties.length > 0) {
+        final List<SetTestProperty> setProperties = 
AnnotationSupport.findRepeatableAnnotations(
+                context.getRequiredTestMethod(),
+                SetTestProperty.class);
+        if (setProperties.size() > 0) {
             for (final SetTestProperty setProperty : setProperties) {
                 props.setProperty(setProperty.key(), setProperty.value());
             }
@@ -57,9 +61,10 @@ public class TestPropertyResolver extends 
TypeBasedParameterResolver<TestPropert
     @Override
     public void beforeAll(final ExtensionContext context) throws Exception {
         final TestProperties props = 
TestPropertySource.createProperties(context);
-        final SetTestProperty[] setProperties = context.getRequiredTestClass()
-                .getAnnotationsByType(SetTestProperty.class);
-        if (setProperties.length > 0) {
+        final List<SetTestProperty> setProperties = 
AnnotationSupport.findRepeatableAnnotations(
+                context.getRequiredTestClass(),
+                SetTestProperty.class);
+        if (setProperties.size() > 0) {
             for (final SetTestProperty setProperty : setProperties) {
                 props.setProperty(setProperty.key(), setProperty.value());
             }