Merge branch 'require-jenkins-2.479.1-or-newer' of github.com:MarkEWa…

…ite/groovy-postbuild-plugin into require-jenkins-2.479.1-or-newer
jenkinsci · Dec 3, 2024 · 121a3b9 · 121a3b9
2 parents 54f339d + a993b91
commit 121a3b9
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderTest.java b/src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderTest.java
@@ -43,6 +43,7 @@
 import hudson.model.Item;
 import hudson.model.Result;
 import hudson.model.User;
+import hudson.util.VersionNumber;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -478,7 +479,15 @@ public void testBadgeMigration() throws Exception {
 
             BadgeSummaryAction badgeSummaryAction = b.getAction(BadgeSummaryAction.class);
             assertNotNull(badgeSummaryAction);
-            assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
+
+            VersionNumber badgePluginVersion =
+                    j.getPluginManager().getPlugin("badge").getVersionNumber();
+
+            if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
+                assertEquals("symbol-information-circle", badgeSummaryAction.getIcon());
+            } else {
+                assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
+            }
             assertEquals("<b>summaryText</b>", badgeSummaryAction.getText());
         }
 
@@ -487,15 +496,28 @@ public void testBadgeMigration() throws Exception {
             FreeStyleBuild b = j.assertBuildStatusSuccess(p.scheduleBuild2(0));
             assertNotNull(b);
 
+            VersionNumber badgePluginVersion =
+                    j.getPluginManager().getPlugin("badge").getVersionNumber();
+
             BadgeAction badgeAction = b.getAction(BadgeAction.class);
             assertNotNull(badgeAction);
-            assertEquals("/plugin/badge/images/success.gif", badgeAction.getIcon());
+
+            if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
+                assertEquals("symbol-status-blue", badgeAction.getIcon());
+            } else {
+                assertEquals("/plugin/badge/images/success.gif", badgeAction.getIcon());
+            }
             assertEquals("shortText", badgeAction.getText());
             assertEquals("https://jenkins.io/", badgeAction.getLink());
 
             BadgeSummaryAction badgeSummaryAction = b.getAction(BadgeSummaryAction.class);
             assertNotNull(badgeSummaryAction);
-            assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
+
+            if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
+                assertEquals("symbol-information-circle", badgeSummaryAction.getIcon());
+            } else {
+                assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
+            }
             assertEquals("<b>summaryText</b>", badgeSummaryAction.getText());
         }
     }