Use JVM version comparator on node monitor display view (#195)

* Use JVM version comparator on node monitor display view * Format with spotless --------- Co-authored-by: Mark Waite <[email protected]>
jenkinsci · Nov 8, 2023 · 16457ab · 16457ab
1 parent cd993c9
commit 16457ab
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugin/versioncolumn/JVMVersionMonitor.java b/src/main/java/hudson/plugin/versioncolumn/JVMVersionMonitor.java
@@ -62,7 +62,12 @@ public boolean isDisconnect() {
 
     @SuppressWarnings("unused") // jelly
     public String toHtml(String version) {
-        if (!version.equals("N/A") && !version.equals(CONTROLLER_VERSION.toString())) {
+        if (version == null || version.equals("N/A")) {
+            return "N/A";
+        }
+        final JVMVersionComparator jvmVersionComparator =
+                new JVMVersionComparator(CONTROLLER_VERSION, Runtime.Version.parse(version), comparisonMode);
+        if (jvmVersionComparator.isNotCompatible()) {
             return Util.wrapToErrorSpan(version);
         }
         return version;

diff --git a/src/test/java/hudson/plugin/versioncolumn/JVMVersionMonitorTest.java b/src/test/java/hudson/plugin/versioncolumn/JVMVersionMonitorTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -43,4 +44,52 @@ public void checkComparisonMode(JVMVersionComparator.ComparisonMode comparisonMo
         JVMVersionMonitor object = new JVMVersionMonitor(comparisonMode, disconnect);
         assertEquals(comparisonMode, object.getComparisonMode());
     }
+
+    @Test
+    public void checkToHtmlRendering() throws Exception {
+
+        JVMVersionMonitor object = new JVMVersionMonitor(JVMVersionComparator.ComparisonMode.EXACT_MATCH, false);
+
+        // N/A
+        assertEquals("N/A", object.toHtml(null));
+        assertEquals("N/A", object.toHtml("N/A"));
+
+        // EXACT_MATCH
+        assertEquals(
+                Runtime.version().toString(), object.toHtml(Runtime.version().toString()));
+        assertEquals(asError("1.1.1.1+1"), object.toHtml("1.1.1.1+1"));
+
+        // RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE
+        object = new JVMVersionMonitor(
+                JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE, false);
+        assertEquals(
+                Runtime.version().toString(), object.toHtml(Runtime.version().toString()));
+        assertEquals(majorGreater(), object.toHtml(majorGreater()));
+        assertEquals(majorVersionMatch(), object.toHtml(majorVersionMatch()));
+        assertEquals(asError(majorLower()), object.toHtml(majorLower()));
+
+        // MAJOR_MINOR_MATCH
+        object = new JVMVersionMonitor(JVMVersionComparator.ComparisonMode.MAJOR_MINOR_MATCH, false);
+        assertEquals(
+                Runtime.version().toString(), object.toHtml(Runtime.version().toString()));
+        assertEquals(majorGreater(), object.toHtml(majorGreater()));
+        assertEquals(majorVersionMatch(), object.toHtml(majorVersionMatch()));
+        assertEquals(asError(majorLower()), object.toHtml(majorLower()));
+    }
+
+    private String majorVersionMatch() {
+        return Runtime.version().feature() + ".99.99.99+99";
+    }
+
+    private String majorLower() {
+        return "1.99.99.99+99";
+    }
+
+    private String majorGreater() {
+        return "999.99.99.99+99";
+    }
+
+    private String asError(String version) {
+        return "<span class=error style='display:inline-block'>" + version + "</span>";
+    }
 }