Merge remote-tracking branch 'github/master' into HEAD

README.md

@@ -117,7 +117,7 @@ otherwise in the [LICENSE file][piper-library-license]
 [piper-library-pages-plugins]: https://sap.github.io/jenkins-library/jenkins/requiredPlugins
 [piper-library-issues]: https://github.com/SAP/jenkins-library/issues
 [piper-library-license]: ./LICENSE
-[piper-library-contribution]: ./CONTRIBUTING.md
+[piper-library-contribution]: .github/CONTRIBUTING.md
 [jenkins-doc-pipelines]: https://jenkins.io/solutions/pipeline
 [jenkins-doc-libraries]: https://jenkins.io/doc/book/pipeline/shared-libraries
 [jenkins-doc-steps]: https://jenkins.io/doc/pipeline/steps

test/groovy/ArtifactSetVersionTest.groovy

@@ -156,11 +156,4 @@ class ArtifactSetVersionTest extends BasePiperTest {
         )
         assertThat(sshAgentList, hasItem('testCredentials'))
     }
-
-    void prepareObjectInterceptors(object) {
-        object.metaClass.invokeMethod = helper.getMethodInterceptor()
-        object.metaClass.static.invokeMethod = helper.getMethodInterceptor()
-        object.metaClass.methodMissing = helper.getMethodMissingInterceptor()
-    }
-
 }

test/groovy/com/sap/piper/GitUtilsTest.groovy

@@ -19,8 +19,13 @@ import static org.junit.Assert.assertNotNull
 import static org.junit.Assert.assertNull
 import static org.junit.Assert.assertThat
 
+import org.springframework.beans.factory.annotation.Autowired
+
 class GitUtilsTest extends BasePiperTest {
 
+    @Autowired
+    GitUtils gitUtils
+
     JenkinsShellCallRule jscr = new JenkinsShellCallRule(this)
     ExpectedException thrown = ExpectedException.none()
 

test/groovy/com/sap/piper/MtaUtilsTest.groovy

@@ -39,10 +39,7 @@ class MtaUtilsTest extends BasePiperTest {
     @Before
     void init() {
         targetMtaDescriptor = "${tmp.getRoot()}/generated_mta.yml"
-        def script = new Object()
-        mtaUtils = new MtaUtils(script)
-
-        prepareObjectInterceptors(script)
+        mtaUtils = new MtaUtils(nullScript)
 
         this.helper.registerAllowedMethod('readJSON', [Map], { Map parameters ->
             return new JsonSlurper().parse(new File(parameters.file))

test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy

@@ -40,13 +40,11 @@ class DockerArtifactVersioningTest extends BasePiperTest{
             passedDir = s
             return closure()
         })
-
-        prepareObjectInterceptors(this)
     }
 
     @Test
     void testVersioningFrom() {
-        av = new DockerArtifactVersioning(this, [filePath: 'Dockerfile', dockerVersionSource: 'FROM'])
+        av = new DockerArtifactVersioning(nullScript, [filePath: 'Dockerfile', dockerVersionSource: 'FROM'])
         assertEquals('1.2.3', av.getVersion())
         av.setVersion('1.2.3-20180101')
         assertEquals('1.2.3-20180101', jwfr.files['VERSION'])
@@ -55,15 +53,8 @@ class DockerArtifactVersioningTest extends BasePiperTest{
 
     @Test
     void testVersioningEnv() {
-        av = new DockerArtifactVersioning(this, [filePath: 'Dockerfile', dockerVersionSource: 'TEST'])
+        av = new DockerArtifactVersioning(nullScript, [filePath: 'Dockerfile', dockerVersionSource: 'TEST'])
         assertEquals('2.3.4', av.getVersion())
         assertTrue(jlr.log.contains('[DockerArtifactVersioning] Version from Docker environment variable TEST: 2.3.4'))
     }
-
-
-    void prepareObjectInterceptors(object) {
-        object.metaClass.invokeMethod = helper.getMethodInterceptor()
-        object.metaClass.static.invokeMethod = helper.getMethodInterceptor()
-        object.metaClass.methodMissing = helper.getMethodMissingInterceptor()
-    }
 }

test/groovy/util/BasePiperTest.groovy

@@ -20,9 +20,6 @@ abstract class BasePiperTest extends BasePipelineTest {
     @Autowired
     Script nullScript
 
-    @Autowired
-    GitUtils gitUtils
-
     @Autowired
     Utils utils
 

test/groovy/util/BasePiperTestContext.groovy

@@ -30,8 +30,8 @@ class BasePiperTestContext {
     Utils mockUtils() {
         def mockUtils = new Utils()
         mockUtils.steps = [
-            stash  : { m -> println "stash name = ${m.name}" },
-            unstash: { println "unstash called ..." }
+            stash  : {  },
+            unstash: {  }
         ]
         LibraryLoadingTestExecutionListener.prepareObjectInterceptors(mockUtils)
         return mockUtils