[JENKINS-62275] Fix tests for Jenkins 2.3+

Author: amuniz

src/test/java/hudson/plugins/build_timeout/impl/AbsoluteTimeOutStrategyTest.java

@@ -26,10 +26,12 @@
 
 import java.util.Arrays;
 
+import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -68,6 +70,8 @@ public void after() {
     @Test
     public void testConfigurationWithParameter() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TIMEOUT", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(
                         new AbsoluteTimeOutStrategy("${TIMEOUT}"),

src/test/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategyTest.java

@@ -24,10 +24,12 @@
 
 package hudson.plugins.build_timeout.impl;
 
+import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -87,6 +89,8 @@ private void testWithParam(int timeToDeadlineInSecondsFromNow, Result expectedRe
         String deadline = getDeadlineTimeFromNow(timeToDeadlineInSecondsFromNow);
 
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("DEADLINE", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(new DeadlineTimeOutStrategy("${DEADLINE}",
                         TOLERANCE_PERIOD_IN_MINUTES), Arrays

src/test/java/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategyJenkinsTest.java

@@ -32,6 +32,8 @@
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -95,6 +97,8 @@ public void testCanConfigureWithWebPage() throws Exception {
     @Test
     public void testFailSafeTimeoutWithVariable() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("FailSafeTimeout", null)));
         p.getBuildWrappersList().add(new BuildTimeoutWrapper(
                 new ElasticTimeOutStrategy("200", "${FailSafeTimeout}", "3", true),
                 null,

src/test/java/hudson/plugins/build_timeout/impl/NoActivityTimeOutStrategyTest.java

@@ -31,6 +31,8 @@
 import java.util.Arrays;
 import java.util.Date;
 
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -252,6 +254,8 @@ public void testCanConfigureWithWebPageUsingStringExpression() throws Exception
     @Test
     public void testConfigurationWithParameter() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TIMEOUT", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(
                         new NoActivityTimeOutStrategy("${TIMEOUT}"),

src/test/java/hudson/plugins/build_timeout/operations/AbortAndRestartOperationTest.java

@@ -32,6 +32,8 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.SleepBuilder;
@@ -116,6 +118,8 @@ public void testAbortAndRestartTwice() throws Exception {
     @Test
     public void testUsingVariable() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("RESTART", null)));
         p.getBuildWrappersList().add(new BuildTimeoutWrapper(
                      new QuickBuildTimeOutStrategy(1000),
                      Arrays.<BuildTimeOutOperation>asList(new AbortAndRestartOperation("${RESTART}")),

src/test/java/hudson/plugins/build_timeout/operations/BuildStepOperationTest.java

@@ -42,6 +42,8 @@
 import hudson.model.Descriptor;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.model.Result;
 import hudson.model.User;
@@ -317,6 +319,8 @@ public void testConfigurationWithoutDbc() throws Exception {
     @Test
     public void testLauncher() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TESTSTRING", null)));
 
         String TESTSTRING = "***THIS IS OUTPUT IN TIMEOUT***";