Skip to content

Commit adf06de

Browse files
Fix tests failing with badge-plugin 2.5 onwards (#90)
1 parent 0b30546 commit adf06de

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

src/test/java/org/jvnet/hudson/plugins/groovypostbuild/GroovyPostbuildRecorderTest.java

+25-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import hudson.model.Item;
4444
import hudson.model.Result;
4545
import hudson.model.User;
46+
import hudson.util.VersionNumber;
4647
import java.util.Arrays;
4748
import java.util.Collections;
4849
import java.util.HashMap;
@@ -478,7 +479,15 @@ public void testBadgeMigration() throws Exception {
478479

479480
BadgeSummaryAction badgeSummaryAction = b.getAction(BadgeSummaryAction.class);
480481
assertNotNull(badgeSummaryAction);
481-
assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
482+
483+
VersionNumber badgePluginVersion =
484+
j.getPluginManager().getPlugin("badge").getVersionNumber();
485+
486+
if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
487+
assertEquals("symbol-information-circle", badgeSummaryAction.getIcon());
488+
} else {
489+
assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
490+
}
482491
assertEquals("<b>summaryText</b>", badgeSummaryAction.getText());
483492
}
484493

@@ -487,15 +496,28 @@ public void testBadgeMigration() throws Exception {
487496
FreeStyleBuild b = j.assertBuildStatusSuccess(p.scheduleBuild2(0));
488497
assertNotNull(b);
489498

499+
VersionNumber badgePluginVersion =
500+
j.getPluginManager().getPlugin("badge").getVersionNumber();
501+
490502
BadgeAction badgeAction = b.getAction(BadgeAction.class);
491503
assertNotNull(badgeAction);
492-
assertEquals("/plugin/badge/images/success.gif", badgeAction.getIcon());
504+
505+
if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
506+
assertEquals("symbol-status-blue", badgeAction.getIcon());
507+
} else {
508+
assertEquals("/plugin/badge/images/success.gif", badgeAction.getIcon());
509+
}
493510
assertEquals("shortText", badgeAction.getText());
494511
assertEquals("https://jenkins.io/", badgeAction.getLink());
495512

496513
BadgeSummaryAction badgeSummaryAction = b.getAction(BadgeSummaryAction.class);
497514
assertNotNull(badgeSummaryAction);
498-
assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
515+
516+
if (badgePluginVersion.isNewerThanOrEqualTo(new VersionNumber("2.5"))) {
517+
assertEquals("symbol-information-circle", badgeSummaryAction.getIcon());
518+
} else {
519+
assertEquals("/plugin/badge/images/info.gif", badgeSummaryAction.getIcon());
520+
}
499521
assertEquals("<b>summaryText</b>", badgeSummaryAction.getText());
500522
}
501523
}

0 commit comments

Comments
 (0)