Support 'NOT_BUILT' result

ikikko · May 5, 2014 · 27bc7fc · 27bc7fc
1 parent 2dde60b
commit 27bc7fc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/typetalk/TypetalkNotifier.java b/src/main/java/org/jenkinsci/plugins/typetalk/TypetalkNotifier.java
@@ -110,6 +110,8 @@ private String toBuildSummary(AbstractBuild<?, ?> build) {
 
 		if (build.getResult().equals(Result.ABORTED)) {
 			return ":astonished: Build aborted.";
+		} else if (build.getResult().equals(Result.NOT_BUILT)) {
+			return ":astonished: Not built.";
 		} else if (build.getResult().equals(Result.FAILURE)) {
 			return ":rage: Build failure.";
 		} else if (build.getResult().equals(Result.UNSTABLE)) {

diff --git a/src/test/groovy/org/jenkinsci/plugins/typetalk/TypetalkNotifierSpec.groovy b/src/test/groovy/org/jenkinsci/plugins/typetalk/TypetalkNotifierSpec.groovy
@@ -20,26 +20,30 @@ class TypetalkNotifierSpec extends Specification {
 		summary ? summary.contains(expected) : expected == null
 
 		where:
-		notifyWhenSuccess | previousResult | result          || expected
-		false             | Result.SUCCESS | Result.SUCCESS  || null
-		false             | Result.SUCCESS | Result.UNSTABLE || 'unstable'
-		false             | Result.SUCCESS | Result.FAILURE  || 'failure'
-		false             | Result.SUCCESS | Result.ABORTED  || 'aborted'
-
-		false             | Result.FAILURE | Result.SUCCESS  || 'recovered'
-		false             | Result.FAILURE | Result.UNSTABLE || 'unstable'
-		false             | Result.FAILURE | Result.FAILURE  || 'failure'
-		false             | Result.FAILURE | Result.ABORTED  || 'aborted'
-
-		true              | Result.SUCCESS | Result.SUCCESS  || 'successful'
-		true              | Result.SUCCESS | Result.UNSTABLE || 'unstable'
-		true              | Result.SUCCESS | Result.FAILURE  || 'failure'
-		true              | Result.SUCCESS | Result.ABORTED  || 'aborted'
-
-		true              | Result.FAILURE | Result.SUCCESS  || 'recovered'
-		true              | Result.FAILURE | Result.UNSTABLE || 'unstable'
-		true              | Result.FAILURE | Result.FAILURE  || 'failure'
-		true              | Result.FAILURE | Result.ABORTED  || 'aborted'
+		notifyWhenSuccess | previousResult | result           || expected
+		false             | Result.SUCCESS | Result.SUCCESS   || null
+		false             | Result.SUCCESS | Result.UNSTABLE  || 'unstable'
+		false             | Result.SUCCESS | Result.FAILURE   || 'failure'
+		false             | Result.SUCCESS | Result.ABORTED   || 'aborted'
+		false             | Result.SUCCESS | Result.NOT_BUILT || 'Not built'
+
+		false             | Result.FAILURE | Result.SUCCESS   || 'recovered'
+		false             | Result.FAILURE | Result.UNSTABLE  || 'unstable'
+		false             | Result.FAILURE | Result.FAILURE   || 'failure'
+		false             | Result.FAILURE | Result.ABORTED   || 'aborted'
+		false             | Result.FAILURE | Result.NOT_BUILT || 'Not built'
+
+		true              | Result.SUCCESS | Result.SUCCESS   || 'successful'
+		true              | Result.SUCCESS | Result.UNSTABLE  || 'unstable'
+		true              | Result.SUCCESS | Result.FAILURE   || 'failure'
+		true              | Result.SUCCESS | Result.ABORTED   || 'aborted'
+		true              | Result.SUCCESS | Result.NOT_BUILT || 'Not built'
+
+		true              | Result.FAILURE | Result.SUCCESS   || 'recovered'
+		true              | Result.FAILURE | Result.UNSTABLE  || 'unstable'
+		true              | Result.FAILURE | Result.FAILURE   || 'failure'
+		true              | Result.FAILURE | Result.ABORTED   || 'aborted'
+		true              | Result.FAILURE | Result.NOT_BUILT || 'Not built'
 	}
 
 	def makeMockBuild(Result result, Result previousResult) {