Add catch error with map parameter

Author: Bilgetz

src/main/groovy/com/lesfurets/jenkins/unit/BasePipelineTest.groovy

@@ -149,6 +149,24 @@ abstract class BasePipelineTest {
                 updateBuildStatus('FAILURE')
             }
         }
+        helper.registerAllowedMethod('catchError', [Map, Closure]) { Map args, Closure c ->
+            c.delegate = delegate
+            try {
+                helper.callClosure(c)
+            } catch(ignored) {
+                if (args.message) {
+                    println args.message
+                }
+                if (args.buildResult == null || args.buildResult == 'SUCCESS') {
+                    return
+                }
+                if (binding.getVariable('currentBuild').currentResult == 'FAILURE') {
+                    // The build result can only get worse, so we must ignore the desired buildResult argument
+                    return
+                }
+                updateBuildStatus(args.buildResult)
+            }
+        }
         helper.registerAllowedMethod("checkout", [Map])
         helper.registerAllowedMethod("choice", [Map])
         helper.registerAllowedMethod('cifsPublisher', [Map], {true})

src/test/groovy/com/TestCatchError.groovy

@@ -0,0 +1,87 @@
+package com.lesfurets.jenkins
+
+import com.lesfurets.jenkins.unit.BasePipelineTest
+import org.junit.Before
+import org.junit.Test
+
+class TestCatchError  extends BasePipelineTest {
+
+    @Override
+    @Before
+    void setUp() throws Exception {
+        super.setUp()
+    }
+
+    @Test()
+    void should_fail_with_fail_before_and_SuccesCatch() throws Exception {
+        def script = runInlineScript("""
+            node() {
+                stage('test') {
+                    error 'error'
+                    catchError(buildResult: 'SUCCESS') {
+                        throw new Exception()
+                    }
+                }
+            }
+    """)
+        assertJobStatusFailure()
+    }
+
+    @Test()
+    void should_unstable_with_unstable_before_and_SuccesCatch() throws Exception {
+        def script = runInlineScript("""
+            node() {
+                stage('test') {
+                    unstable 'unstable'
+                    catchError(buildResult: 'SUCCESS') {
+                        throw new Exception()
+                    }
+                }
+            }
+    """)
+        assertJobStatusUnstable()
+    }
+
+    @Test()
+    void should_succes_with_SuccesCatch() throws Exception {
+        def script = runInlineScript("""
+            node() {
+                stage('test') {
+                    catchError(buildResult: 'SUCCESS') {
+                        throw new Exception()
+                    }
+                }
+            }
+    """)
+        assertJobStatusSuccess()
+    }
+
+    @Test()
+    void should_unstable_with_UnstableCatch() throws Exception {
+        def script = runInlineScript("""
+            node() {
+                stage('test') {
+                    catchError(buildResult: 'UNSTABLE') {
+                        throw new Exception()
+                    }
+                }
+            }
+    """)
+        assertJobStatusUnstable()
+    }
+
+    @Test()
+    void should_fail_with_no_parameter() throws Exception {
+        def script = runInlineScript("""
+            node() {
+                stage('test') {
+                    catchError() {
+                        throw new Exception()
+                    }
+                }
+            }
+    """)
+        assertJobStatusFailure()
+    }
+
+}