From c53a277395f98acec432340deedefa7be50d9612 Mon Sep 17 00:00:00 2001 From: Paul Holser Date: Mon, 20 Jul 2020 09:42:31 -0500 Subject: [PATCH 1/2] Bump to 4.14-SNAPSHOT --- src/main/java/junit/runner/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java index 975ef7ce07cd..6d78781e0c00 100644 --- a/src/main/java/junit/runner/Version.java +++ b/src/main/java/junit/runner/Version.java @@ -9,7 +9,7 @@ private Version() { } public static String id() { - return "4.13-SNAPSHOT"; + return "4.14-SNAPSHOT"; } public static void main(String[] args) { From 5be301c6e7f5d2305f078da7a5e2272050733981 Mon Sep 17 00:00:00 2001 From: Paul Holser Date: Mon, 20 Jul 2020 09:45:28 -0500 Subject: [PATCH 2/2] Make FrameworkField ctor public. Fixes #1668 Prior to this change, custom runners could make `FrameworkMethod` instances, but not `FrameworkField` instances. This small change allows for both now, because `FrameworkField`'s constructor has been promoted to `public` from package-private. --- .../java/org/junit/runners/model/FrameworkField.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/junit/runners/model/FrameworkField.java b/src/main/java/org/junit/runners/model/FrameworkField.java index e99d05b46312..007fa3530d62 100644 --- a/src/main/java/org/junit/runners/model/FrameworkField.java +++ b/src/main/java/org/junit/runners/model/FrameworkField.java @@ -15,7 +15,12 @@ public class FrameworkField extends FrameworkMember { private final Field field; - FrameworkField(Field field) { + /** + * Returns a new {@code FrameworkField} for {@code field}. + * + *

Access relaxed to {@code public} since version 4.14. + */ + public FrameworkField(Field field) { if (field == null) { throw new NullPointerException( "FrameworkField cannot be created without an underlying field."); @@ -26,7 +31,7 @@ public class FrameworkField extends FrameworkMember { // This field could be a public field in a package-scope base class try { field.setAccessible(true); - } catch (SecurityException e) { + } catch (SecurityException e) { // We may get an IllegalAccessException when we try to access the field } }