Changeset 19056 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/annotations/AnnotationUtils.java

Timestamp:

2024-04-24T20:02:57+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Fix last failing test in Java 21

• Generate Java 21 image files (probably from r19043: Drop COMPAT locale provider).
• Replace most deprecated function calls and classes in tests with non-deprecated functions.

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/annotations/AnnotationUtils.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/AnnotationUtils.java

@@ -48 +48 @@
     public static void resetStaticClass(Class<?> clazz) throws ReflectiveOperationException {
         for (Field field : clazz.getDeclaredFields()) {
-            if (!field.isAccessible()) {
-                field.setAccessible(true);
-            }
             // Don't reset fields that are not static
             if ((field.getModifiers() & Modifier.STATIC) == 0) {
                 continue;
+            }
+            if (!field.canAccess(null)) {
+                field.setAccessible(true);
             }
             final boolean isFinal = (field.getModifiers() & Modifier.FINAL) != 0;