Fixing tests for java 21 + also test 11, 17 and 21 on win and linux

jenkinsci · Jan 9, 2024 · f0e2864 · f0e2864
1 parent 79c23b1
commit f0e2864
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,5 +5,9 @@ buildPlugin(
   useContainerAgent: true, 
   configurations: [
     [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 21],
+    [platform: 'linux', jdk: 17],
     [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 11],
+    [platform: 'windows', jdk: 11],
 ])
diff --git a/...test/java/org/jenkinsci/plugins/prometheus/collectors/jenkins/JenkinsVersionInfoTest.java b/...test/java/org/jenkinsci/plugins/prometheus/collectors/jenkins/JenkinsVersionInfoTest.java
@@ -42,9 +42,6 @@ public void testCollectResult() throws Exception {
 
     static void setFinalStaticTo123(Field field) throws Exception {
         field.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
         field.set(null, "123");
     }
 

diff --git a/src/test/java/org/jenkinsci/plugins/prometheus/collectors/jenkins/NodesOnlineGaugeTest.java b/src/test/java/org/jenkinsci/plugins/prometheus/collectors/jenkins/NodesOnlineGaugeTest.java
@@ -70,9 +70,6 @@ private Node mockNode(String nodeName, boolean isOnline) {
 
     static void setFinalStaticTo123(Field field) throws Exception {
         field.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
         field.set(null, "123");
     }
 }