[JENKINS-27424] Added tests for currentJob feature.

jenkinsci · Mar 14, 2015 · 2e5c538 · 2e5c538
1 parent 85d1e35
commit 2e5c538
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 2 deletions.
diff --git a/...a/jp/ikedam/jenkins/plugins/groovy_label_assignment/GroovyLabelAssignmentJenkinsRule.java b/...a/jp/ikedam/jenkins/plugins/groovy_label_assignment/GroovyLabelAssignmentJenkinsRule.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.ExecutionException;
 
 import jenkins.model.Jenkins;
-
 import hudson.Functions;
 import hudson.Util;
 import hudson.PluginWrapper;
@@ -147,6 +146,13 @@ public FreeStyleProject createFreeStyleProject() throws IOException
         return super.createFreeStyleProject();
     }
 
+    @Override
+    public FreeStyleProject createFreeStyleProject(String name) throws IOException
+    {
+        // createFreeStyleProject is protected with Jenkins < 1.479
+        return super.createFreeStyleProject(name);
+    }
+
     @Override
     public MatrixProject createMatrixProject() throws IOException
     {

diff --git a/...dam/jenkins/plugins/groovy_label_assignment/GroovyLabelAssignmentPropertyJenkinsTest.java b/...dam/jenkins/plugins/groovy_label_assignment/GroovyLabelAssignmentPropertyJenkinsTest.java
@@ -33,7 +33,7 @@
 import java.util.concurrent.TimeoutException;
 
 import jenkins.model.Jenkins;
-
+import hudson.matrix.Axis;
 import hudson.matrix.AxisList;
 import hudson.matrix.MatrixRun;
 import hudson.matrix.LabelAxis;
@@ -545,4 +545,61 @@ public void testConfiguration() throws Exception
         assertNotNull(prop);
         assertEquals(groovyScript, prop.getGroovyScript());
     }
+
+    @Test
+    public void testCurrentJobWithFreeStyleProject() throws Exception {
+        // This allows a build decides which slave to run on with its project name.
+        // not applicable for slave3.
+        String script = "['test1', 'test2'].find { currentJob.name.contains(it) }";
+
+        // project names and expected nodes map
+        Map<String, Node> projectAndNodeMap = new HashMap<String, Node>();
+        projectAndNodeMap.put("project_test1", slave1);
+        projectAndNodeMap.put("project_test2", slave2);
+        projectAndNodeMap.put("project_test3", j.jenkins);
+
+
+        for(Map.Entry<String, Node> entry: projectAndNodeMap.entrySet())
+        {
+            FreeStyleProject projectToTest = j.createFreeStyleProject(entry.getKey());
+            projectToTest.addProperty(new GroovyLabelAssignmentProperty(script));
+            projectToTest.setAssignedLabel(LabelExpression.parseExpression("master")); // overridden with GroovyLabelAssignmentProperty
+
+            for(int i = 0; i < BUILD_REPEAT; ++i)
+            {
+                FreeStyleBuild build = projectToTest.scheduleBuild2(0).get();
+                assertBuiltOn(entry.getValue(), build);
+            }
+        }
+    }
+
+    @Test
+    public void testCurrentJobWithMatrixProject() throws Exception {
+        // As MatrixRun is passed as currentJob for matrix childs and the name of MatrixRun contains the axis value, 
+        // this allows child builds decide which slave to run on with threir axis value.
+        // not applicable for slave3.
+        String script = "['test1', 'test2'].find { currentJob.name.contains(it) }";
+
+        MatrixProject p = j.createMatrixProject();
+        p.setAxes(new AxisList(new Axis("axisParam", "run-on-test1", "run-on-test2", "run-on-test3")));
+        p.addProperty(new GroovyLabelAssignmentProperty(script));
+        p.setAssignedLabel(LabelExpression.parseExpression("master")); // overridden with GroovyLabelAssignmentProperty
+
+        // axis names and expected nodes map
+        Map<String, Node> axisValueAndNodeMap = new HashMap<String, Node>();
+        axisValueAndNodeMap.put("run-on-test1", slave1);
+        axisValueAndNodeMap.put("run-on-test2", slave2);
+        axisValueAndNodeMap.put("run-on-test3", j.jenkins);
+
+        for(int i = 0; i < BUILD_REPEAT; ++i)
+        {
+            MatrixBuild build = p.scheduleBuild2(0).get();
+
+            for(MatrixRun child: build.getRuns())
+            {
+                String axisValue = child.getProject().getCombination().get("axisParam");
+                assertBuiltOn(axisValueAndNodeMap.get(axisValue), child);
+            }
+        }
+    }
 }