Merge branch 'master' into JENKINS-21010

Diabol · Jan 31, 2014 · a617360 · a617360
2 parents 3d61083 + b4a097f
commit a617360
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java b/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java
@@ -86,8 +86,7 @@ public static AbstractProject getProject(String name) {
             return (AbstractProject) items.get(name);
         } else {
             List<ItemGroup> groups = Util.createSubList(items.values(), ItemGroup.class);
-            for (int i = 0; i < groups.size(); i++) {
-                ItemGroup group = groups.get(i);
+            for (ItemGroup group : groups) {
                 AbstractProject project = find(group, name);
                 if (project != null) {
                     return project;

diff --git a/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java b/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java
@@ -176,6 +176,7 @@ public void testGetPipelines() throws Exception {
         assertEquals(0, component.getPipelines().size());
         assertEquals("Comp", component.getName());
 
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(build);
 
         components = view.getPipelines();

diff --git a/src/test/java/se/diabol/jenkins/pipeline/PipelineFactoryTest.java b/src/test/java/se/diabol/jenkins/pipeline/PipelineFactoryTest.java
@@ -367,6 +367,7 @@ public void testFirstUpstreamBuildFirstProjectHasUpstreamJob() throws Exception
         upstream.getPublishersList().add(new BuildTrigger("build", false));
         build.getPublishersList().add(new BuildTrigger("package", false));
         jenkins.getInstance().rebuildDependencyGraph();
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(upstream);
         jenkins.waitUntilNoActivity();
 
@@ -570,6 +571,7 @@ public void testGetChangesNoBrowser() throws Exception {
         FakeChangeLogSCM scm = new FakeChangeLogSCM();
         scm.addChange().withAuthor("test-user").withMsg("Fixed bug");
         project.setScm(scm);
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(project);
         AbstractBuild build = project.getLastBuild();
         List<Change> changes = PipelineFactory.getChanges(build);
@@ -588,6 +590,7 @@ public void testGetChangesWithBrowser() throws Exception {
         FakeRepositoryBrowserSCM scm = new FakeRepositoryBrowserSCM();
         scm.addChange().withAuthor("test-user").withMsg("Fixed bug");
         project.setScm(scm);
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(project);
         AbstractBuild build = project.getLastBuild();
         List<Change> changes = PipelineFactory.getChanges(build);
@@ -603,6 +606,7 @@ public void testGetChangesWithBrowser() throws Exception {
     @Test
     public void testGetTriggeredBy() throws Exception {
         FreeStyleProject project = jenkins.createFreeStyleProject("build");
+        jenkins.setQuietPeriod(0);
         project.scheduleBuild(new Cause.UserIdCause());
         jenkins.waitUntilNoActivity();
         Set<UserInfo> contributors = PipelineFactory.getContributors(project.getLastBuild());
@@ -632,6 +636,7 @@ public void testGetTriggeredByWithChangeLog() throws Exception {
     @Test
     public void testGetTriggeredByWithNoUserIdCause() throws Exception {
         FreeStyleProject project = jenkins.createFreeStyleProject("build");
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(project);
         Set<UserInfo> contributors = PipelineFactory.getContributors(project.getLastBuild());
         assertEquals(0, contributors.size());
@@ -660,16 +665,40 @@ public void testGetTriggeredBySCMChange() throws Exception {
         FakeRepositoryBrowserSCM scm = new FakeRepositoryBrowserSCM();
         scm.addChange().withAuthor("test-user").withMsg("Fixed bug");
         project.setScm(scm);
+        jenkins.setQuietPeriod(0);
         project.scheduleBuild(new SCMTrigger.SCMTriggerCause("SCM"));
         jenkins.waitUntilNoActivity();
         List<Trigger> triggeredBy = PipelineFactory.getTriggeredBy(project.getLastBuild());
         assertEquals(1, triggeredBy.size());
         assertEquals(Trigger.TYPE_SCM, triggeredBy.iterator().next().getType());
     }
 
+    @Test
+    public void testGetTriggeredByRemoteCause() throws Exception {
+        FreeStyleProject project = jenkins.createFreeStyleProject("build");
+        jenkins.setQuietPeriod(0);
+        project.scheduleBuild(new Cause.RemoteCause("localhost", "Remote"));
+        jenkins.waitUntilNoActivity();
+        List<Trigger> triggeredBy = PipelineFactory.getTriggeredBy(project.getLastBuild());
+        assertEquals(1, triggeredBy.size());
+        assertEquals(Trigger.TYPE_REMOTE, triggeredBy.iterator().next().getType());
+    }
+
+    @Test
+    public void testGetTriggeredByDeeplyNestedUpstreamCause() throws Exception {
+        FreeStyleProject project = jenkins.createFreeStyleProject("build");
+        jenkins.setQuietPeriod(0);
+        project.scheduleBuild(new Cause.UpstreamCause.DeeplyNestedUpstreamCause());
+        jenkins.waitUntilNoActivity();
+        List<Trigger> triggeredBy = PipelineFactory.getTriggeredBy(project.getLastBuild());
+        assertEquals(1, triggeredBy.size());
+        assertEquals(Trigger.TYPE_UPSTREAM, triggeredBy.iterator().next().getType());
+    }
+
     @Test
     public void testGetTriggeredByUpStreamJob() throws Exception {
         FreeStyleProject upstream = jenkins.createFreeStyleProject("upstream");
+        jenkins.setQuietPeriod(0);
         jenkins.buildAndAssertSuccess(upstream);
         FreeStyleProject project = jenkins.createFreeStyleProject("build");
         FakeRepositoryBrowserSCM scm = new FakeRepositoryBrowserSCM();