Fixed JENKINS-17546

Added new trigger BuildingTrigger that is triggered on the transition from Failure to Unstable.
jenkinsci · Apr 19, 2013 · 3ea1848 · 3ea1848
1 parent 7cabc47
commit 3ea1848
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/plugins/trigger/BuildingTrigger.java b/src/main/java/hudson/plugins/emailext/plugins/trigger/BuildingTrigger.java
@@ -0,0 +1,67 @@
+package hudson.plugins.emailext.plugins.trigger;
+
+import hudson.model.AbstractBuild;
+import hudson.model.Result;
+import hudson.plugins.emailext.plugins.EmailTrigger;
+import hudson.plugins.emailext.plugins.EmailTriggerDescriptor;
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest;
+
+public class BuildingTrigger extends EmailTrigger {
+
+    public static final String TRIGGER_NAME = "Building";
+
+    @Override
+    public boolean trigger(AbstractBuild<?, ?> build) {
+
+        Result buildResult = build.getResult();
+
+        if (buildResult == Result.UNSTABLE) {
+            AbstractBuild<?, ?> prevBuild = build.getPreviousBuild();
+            if (prevBuild != null && (prevBuild.getResult() == Result.FAILURE)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public EmailTriggerDescriptor getDescriptor() {
+        return DESCRIPTOR;
+    }
+
+    public static DescriptorImpl DESCRIPTOR = new DescriptorImpl();
+
+    public static final class DescriptorImpl extends EmailTriggerDescriptor {
+
+        public DescriptorImpl() {
+
+        }
+
+        @Override
+        public String getTriggerName() {
+            return TRIGGER_NAME;
+        }
+
+        @Override
+        public EmailTrigger newInstance(StaplerRequest req, JSONObject formData) {
+            return new FixedTrigger();
+        }
+
+        @Override
+        public String getHelpText() {
+            return Messages.BuildingTrigger_HelpText();
+        }
+    }
+
+    @Override
+    public boolean getDefaultSendToDevs() {
+        return true;
+    }
+
+    @Override
+    public boolean getDefaultSendToList() {
+        return true;
+    }
+}
diff --git a/src/main/resources/hudson/plugins/emailext/plugins/trigger/Messages.properties b/src/main/resources/hudson/plugins/emailext/plugins/trigger/Messages.properties
@@ -34,3 +34,6 @@ ScriptTrigger.HelpText=\
 PreBuildScriptTrigger.HelpText=\
  Allows the user to define a script which must have the last line resolve to a true or false which will\
  indicate whether the trigger should cause an email to be sent BEFORE build or not.
+BuildingTrigger.HelpText=\
+ An email will be sent any time the build goes from failing, to unstable. This basically means that\
+ all the builds steps were successful, but there are still tests failing.
diff --git a/src/test/java/hudson/plugins/emailext/plugins/trigger/BuildingTriggerTest.java b/src/test/java/hudson/plugins/emailext/plugins/trigger/BuildingTriggerTest.java
@@ -0,0 +1,56 @@
+package hudson.plugins.emailext.plugins.trigger;
+
+import hudson.model.Result;
+import hudson.plugins.emailext.plugins.EmailTrigger;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+/**
+ *
+ * @author acearl
+ */
+public class BuildingTriggerTest extends TriggerTestBase {
+
+    @Override
+    EmailTrigger newInstance() {
+        return new BuildingTrigger();
+    }
+
+    @Test
+    public void testTrigger_success() 
+            throws IOException, InterruptedException {
+        assertNotTriggered(Result.SUCCESS);
+    }
+
+    @Test
+    public void testTrigger_failure() 
+            throws IOException, InterruptedException {
+        assertNotTriggered(Result.SUCCESS);
+    }
+
+    @Test
+    public void testTrigger_failureUnstable() 
+            throws IOException, InterruptedException {
+        assertTriggered(Result.FAILURE, Result.UNSTABLE);
+    }
+
+    @Test
+    public void testTrigger_multipleFailure() 
+            throws IOException, InterruptedException {
+        assertTriggered(Result.FAILURE, Result.FAILURE, Result.FAILURE, Result.UNSTABLE);
+    }
+
+    @Test
+    public void testTrigger_failureSuccess() 
+            throws IOException, InterruptedException {
+        assertNotTriggered(Result.FAILURE, Result.SUCCESS);
+    }
+
+    @Test
+    public void testTrigger_failureSuccessUnstable() 
+            throws IOException, InterruptedException {
+        assertNotTriggered(Result.FAILURE, Result.SUCCESS, Result.UNSTABLE);
+    }
+}
diff --git a/src/test/java/hudson/plugins/emailext/plugins/trigger/FirstFailureTriggerTest.java b/src/test/java/hudson/plugins/emailext/plugins/trigger/FirstFailureTriggerTest.java
@@ -10,7 +10,7 @@
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
-public class FirstFailureTriggerTest extends NthFailureTriggerTestBase {
+public class FirstFailureTriggerTest extends TriggerTestBase {
 
 	@Override
 	EmailTrigger newInstance() {

diff --git a/src/test/java/hudson/plugins/emailext/plugins/trigger/SecondFailureTriggerTest.java b/src/test/java/hudson/plugins/emailext/plugins/trigger/SecondFailureTriggerTest.java
@@ -7,7 +7,7 @@
 
 import org.junit.Test;
 
-public class SecondFailureTriggerTest extends NthFailureTriggerTestBase {
+public class SecondFailureTriggerTest extends TriggerTestBase {
 
 	@Override
 	EmailTrigger newInstance() {

diff --git a/...ns/trigger/NthFailureTriggerTestBase.java → ...lext/plugins/trigger/TriggerTestBase.java b/...ns/trigger/NthFailureTriggerTestBase.java → ...lext/plugins/trigger/TriggerTestBase.java
@@ -15,7 +15,7 @@
 /**
  * Base class for testing
  */
-public abstract class NthFailureTriggerTestBase {
+public abstract class TriggerTestBase {
 
 	abstract EmailTrigger newInstance();