fix wrong copy command for copying xunit-reports in gradle build

opendevstack · Jan 20, 2022 · 729986c · renedupont · Feb 24, 2022 · oalyman
1 parent 198261b
commit 729986c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ listed in the changelog.
 ### Fixed
 - Cannot enable debug mode in some tasks ([#377](https://github.com/opendevstack/ods-pipeline/issues/377))
 - Gradle task does not expose Nexus env variables ([#373](https://github.com/opendevstack/ods-pipeline/issues/373))
+- Gradle build fails when it contains more than one test class ([#414](https://github.com/opendevstack/ods-pipeline/issues/414))
 
 ## [0.2.0] - 2021-12-22
 ### Added

diff --git a/build/package/scripts/build-gradle.sh b/build/package/scripts/build-gradle.sh
@@ -75,7 +75,7 @@ UNIT_TEST_RESULT_DIR="${BUILD_DIR}/test-results/test"
 if [ -d "${UNIT_TEST_RESULT_DIR}" ]; then
     UNIT_TEST_ARTIFACTS_DIR="${ARTIFACTS_DIR}/xunit-reports"
     mkdir -p "${UNIT_TEST_ARTIFACTS_DIR}"
-    cp "${UNIT_TEST_RESULT_DIR}/"*.xml "${UNIT_TEST_ARTIFACTS_DIR}/${ARTIFACT_PREFIX}report.xml"
+    cp "${UNIT_TEST_RESULT_DIR}/"*.xml "${UNIT_TEST_ARTIFACTS_DIR}/${ARTIFACT_PREFIX}"
 else
   echo "Build failed: no unit test results found in ${UNIT_TEST_RESULT_DIR}"
   exit 1

diff --git a/test/tasks/ods-build-gradle_test.go b/test/tasks/ods-build-gradle_test.go
@@ -34,7 +34,8 @@ func TestTaskODSBuildGradle(t *testing.T) {
 					checkFilesExist(t, wsDir,
 						"docker/Dockerfile",
 						"docker/app.jar",
-						filepath.Join(pipelinectxt.XUnitReportsPath, "report.xml"),
+						filepath.Join(pipelinectxt.XUnitReportsPath, "TEST-ods.java.gradle.sample.app.AppTest.xml"),
+						filepath.Join(pipelinectxt.XUnitReportsPath, "TEST-ods.java.gradle.sample.app.AppTest2.xml"),
 						filepath.Join(pipelinectxt.CodeCoveragesPath, "coverage.xml"),
 						filepath.Join(pipelinectxt.SonarAnalysisPath, "analysis-report.md"),
 						filepath.Join(pipelinectxt.SonarAnalysisPath, "issues-report.csv"),

diff --git a/...tdata/workspaces/gradle-sample-app/src/test/java/ods/java/gradle/sample/app/AppTest2.java b/...tdata/workspaces/gradle-sample-app/src/test/java/ods/java/gradle/sample/app/AppTest2.java
@@ -0,0 +1,15 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package ods.java.gradle.sample.app;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+// this class exists to have more than one test xml in the end
+class AppTest2 {
+    @Test void appHasAGreetingTwo() {
+        App classUnderTest = new App();
+        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
+    }
+}