Skip to content

Commit 6dd4a21

Browse files
authored
Fix test for future versions of jenkins - PCT failures (#90)
1 parent 931ce7a commit 6dd4a21

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

plugin/src/test/java/org/jenkinsci/plugins/structs/describable/DescribableModelTest.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
import hudson.plugins.git.UserMergeOptions;
3737
import hudson.plugins.git.extensions.impl.CleanBeforeCheckout;
3838
import java.util.HashMap;
39+
40+
import hudson.util.VersionNumber;
41+
import jenkins.model.Jenkins;
3942
import org.codehaus.groovy.runtime.GStringImpl;
4043
import org.hamcrest.Matchers;
4144
import org.jenkinsci.plugins.structs.Fishing;
@@ -647,9 +650,15 @@ public static final class TakesParams {
647650
}
648651

649652
@Test public void parametersDefinitionProperty() throws Exception {
650-
roundTrip(ParametersDefinitionProperty.class, map("parameterDefinitions", Arrays.asList(
651-
map(CLAZZ, "BooleanParameterDefinition", "name", "flag", "defaultValue", false),
652-
map(CLAZZ, "StringParameterDefinition", "name", "text", "trim", false))));
653+
if (Jenkins.getVersion().isNewerThanOrEqualTo(new VersionNumber("2.281"))) {
654+
roundTrip(ParametersDefinitionProperty.class, map("parameterDefinitions", Arrays.asList(
655+
map(CLAZZ, "BooleanParameterDefinition", "name", "flag"),
656+
map(CLAZZ, "StringParameterDefinition", "name", "text"))));
657+
} else {
658+
roundTrip(ParametersDefinitionProperty.class, map("parameterDefinitions", Arrays.asList(
659+
map(CLAZZ, "BooleanParameterDefinition", "name", "flag", "defaultValue", false),
660+
map(CLAZZ, "StringParameterDefinition", "name", "text", "trim", false))));
661+
}
653662
}
654663

655664
@Issue("JENKINS-26619")

0 commit comments

Comments
 (0)