Skip to content

Commit abb5ed1

Browse files
committed
Introduce dedicated makeAccessible() variants for Executable and Field
This commit introduces dedicated makeAccessible() variants for Executable and Field in ReflectionUtils. In addition, this commit removes the obsolete AccessibleObject variant.
1 parent 9ec15c7 commit abb5ed1

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertEquals;
1717
import static org.junit.jupiter.api.Assertions.assertNotNull;
1818
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
19+
import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
1920
import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
2021
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.cause;
2122
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
@@ -48,7 +49,6 @@
4849
import org.junit.platform.commons.PreconditionViolationException;
4950
import org.junit.platform.commons.util.AnnotationUtils;
5051
import org.junit.platform.commons.util.ExceptionUtils;
51-
import org.junit.platform.commons.util.ReflectionUtils;
5252
import org.junit.platform.testkit.engine.EngineExecutionResults;
5353

5454
/**
@@ -706,8 +706,7 @@ public void postProcessTestInstance(Object testInstance, ExtensionContext contex
706706
.findFirst()
707707
.ifPresent(field -> {
708708
try {
709-
ReflectionUtils.makeAccessible(field);
710-
field.set(testInstance, new CrystalBall("Outlook good"));
709+
makeAccessible(field).set(testInstance, new CrystalBall("Outlook good"));
711710
}
712711
catch (Throwable t) {
713712
throw ExceptionUtils.throwAsUncheckedException(t);

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.TOP_DOWN;
2323

2424
import java.io.File;
25-
import java.lang.reflect.AccessibleObject;
2625
import java.lang.reflect.Array;
2726
import java.lang.reflect.Constructor;
27+
import java.lang.reflect.Executable;
2828
import java.lang.reflect.Field;
2929
import java.lang.reflect.GenericArrayType;
3030
import java.lang.reflect.InvocationTargetException;
@@ -1724,12 +1724,22 @@ private static boolean isGeneric(Type type) {
17241724
return type instanceof TypeVariable || type instanceof GenericArrayType;
17251725
}
17261726

1727+
@API(status = INTERNAL, since = "1.11")
17271728
@SuppressWarnings("deprecation") // "AccessibleObject.isAccessible()" is deprecated in Java 9
1728-
public static <T extends AccessibleObject> T makeAccessible(T object) {
1729-
if (!object.isAccessible()) {
1730-
object.setAccessible(true);
1729+
public static <T extends Executable> T makeAccessible(T executable) {
1730+
if ((!isPublic(executable) || !isPublic(executable.getDeclaringClass())) && !executable.isAccessible()) {
1731+
executable.setAccessible(true);
17311732
}
1732-
return object;
1733+
return executable;
1734+
}
1735+
1736+
@API(status = INTERNAL, since = "1.11")
1737+
@SuppressWarnings("deprecation") // "AccessibleObject.isAccessible()" is deprecated in Java 9
1738+
public static Field makeAccessible(Field field) {
1739+
if ((!isPublic(field) || !isPublic(field.getDeclaringClass()) || isFinal(field)) && !field.isAccessible()) {
1740+
field.setAccessible(true);
1741+
}
1742+
return field;
17331743
}
17341744

17351745
/**

0 commit comments

Comments
 (0)