add sources for code coverage (#349)

* add sources for code coverage
* hand-in mocked script
* remove obsolete test case

pom.xml

@@ -132,7 +132,6 @@
 
     </dependencies>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -140,8 +139,21 @@
                 <version>1.12</version>
                 <executions>
                     <execution>
-                        <id>add-test-source</id>
+                        <id>add-groovy-sources</id>
                         <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src</source>
+                                <source>vars</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-groovy-test-sources</id>
+                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>add-test-source</goal>
                         </goals>

test/groovy/CheckChangeInDevelopmentTest.groovy

@@ -41,6 +41,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
 
         ChangeManagement cm = getChangeManagementUtils(true)
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
                      cmUtils: cm,
                      changeManagement: [endpoint: 'https://example.org/cm'],
                      failIfStatusIsNotInDevelopment: true)
@@ -63,6 +64,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
 
         ChangeManagement cm = getChangeManagementUtils(false)
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             cmUtils: cm,
             changeManagement: [endpoint: 'https://example.org/cm'])
     }
@@ -72,6 +74,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
 
         ChangeManagement cm = getChangeManagementUtils(false)
         boolean inDevelopment = jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
                                     cmUtils: cm,
                                     changeManagement: [endpoint: 'https://example.org/cm'],
                                     failIfStatusIsNotInDevelopment: false)
@@ -83,6 +86,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
         ChangeManagement cm = getChangeManagementUtils(true, '0815')
 
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             changeDocumentId: '42',
             cmUtils: cm,
             changeManagement: [endpoint: 'https://example.org/cm'])
@@ -95,6 +99,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
         ChangeManagement cm = getChangeManagementUtils(true, '0815')
 
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             cmUtils: cm,
             changeManagement : [endpoint: 'https://example.org/cm'])
 
@@ -120,6 +125,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
         }
 
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             cmUtils: cm,
             changeManagement: [endpoint: 'https://example.org/cm'])
     }
@@ -134,6 +140,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
 
         ChangeManagement cm = getChangeManagementUtils(false, null)
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             cmUtils: cm,
             changeManagement: [endpoint: 'https://example.org/cm'])
     }
@@ -148,6 +155,7 @@ class CheckChangeInDevelopmentTest extends BasePiperTest {
 
         ChangeManagement cm = getChangeManagementUtils(false, '')
         jsr.step.checkChangeInDevelopment(
+            script: nullScript, 
             cmUtils: cm,
             changeManagement: [endpoint: 'https://example.org/cm'])
     }

test/groovy/DockerExecuteTest.groovy

@@ -115,17 +115,6 @@ class DockerExecuteTest extends BasePiperTest {
         assertTrue(bodyExecuted)
     }
 
-    @Test
-    void testExecuteInsideDockerNoScript() throws Exception {
-        jsr.step.dockerExecute(dockerImage: 'maven:3.5-jdk-8-alpine') {
-            bodyExecuted = true
-        }
-        assertEquals('maven:3.5-jdk-8-alpine', docker.getImageName())
-        assertTrue(docker.isImagePulled())
-        assertEquals('--env http_proxy --env https_proxy --env no_proxy --env HTTP_PROXY --env HTTPS_PROXY --env NO_PROXY', docker.getParameters().trim())
-        assertTrue(bodyExecuted)
-    }
-
     @Test
     void testExecuteInsideDockerContainerWithParameters() throws Exception {
         jsr.step.dockerExecute(script: nullScript,

test/groovy/TestsPublishResultsTest.groovy

@@ -48,7 +48,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishNothingWithDefaultSettings() throws Exception {
-        jsr.step.testsPublishResults()
+        jsr.step.testsPublishResults(script: nullScript)
 
         // ensure nothing is published
         assertTrue('WarningsPublisher options not empty', publisherStepOptions.junit == null)
@@ -59,7 +59,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishNothingWithAllDisabled() throws Exception {
-        jsr.step.testsPublishResults(junit: false, jacoco: false, cobertura: false, jmeter: false)
+        jsr.step.testsPublishResults(script: nullScript, junit: false, jacoco: false, cobertura: false, jmeter: false)
 
         // ensure nothing is published
         assertTrue('WarningsPublisher options not empty', publisherStepOptions.junit == null)
@@ -70,7 +70,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishUnitTestsWithDefaultSettings() throws Exception {
-        jsr.step.testsPublishResults(junit: true)
+        jsr.step.testsPublishResults(script: nullScript, junit: true)
 
         assertTrue('JUnit options are empty', publisherStepOptions.junit != null)
         // ensure default patterns are set
@@ -84,7 +84,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishCoverageWithDefaultSettings() throws Exception {
-        jsr.step.testsPublishResults(jacoco: true, cobertura: true)
+        jsr.step.testsPublishResults(script: nullScript, jacoco: true, cobertura: true)
 
         assertTrue('JaCoCo options are empty', publisherStepOptions.jacoco != null)
         assertTrue('Cobertura options are empty', publisherStepOptions.cobertura != null)
@@ -99,7 +99,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishJMeterWithDefaultSettings() throws Exception {
-        jsr.step.testsPublishResults(jmeter: true)
+        jsr.step.testsPublishResults(script: nullScript, jmeter: true)
 
         assertTrue('JMeter options are empty', publisherStepOptions.jmeter != null)
         assertEquals('JMeter default pattern not set',
@@ -113,7 +113,7 @@ class TestsPublishResultsTest extends BasePiperTest {
 
     @Test
     void testPublishUnitTestsWithCustomSettings() throws Exception {
-        jsr.step.testsPublishResults(junit: [pattern: 'fancy/file/path', archive: true, active: true])
+        jsr.step.testsPublishResults(script: nullScript, junit: [pattern: 'fancy/file/path', archive: true, active: true])
 
         assertTrue('JUnit options are empty', publisherStepOptions.junit != null)
         // ensure default patterns are set