From 304d2d5c5ee1b22542aa0ed44ef04bc0613fd226 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sun, 18 Sep 2022 15:27:09 +0200 Subject: [PATCH] [MINVOKER-311] Override reports directory in IT test --- pom.xml | 2 ++ src/it/MINVOKER-196_junit_report_file/verify.groovy | 2 +- src/it/MINVOKER-288-failed-setup-run/verify.groovy | 2 +- src/it/MINVOKER-288-failed-setup-verify/verify.groovy | 2 +- src/it/invocation-cmdline-exclude/verify.groovy | 4 ++-- src/it/project-setup/verify.bsh | 2 +- src/it/selector-scripts/setup.groovy | 2 +- src/it/selector-scripts/verify.bsh | 10 +++++----- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d9f06404..114770d1 100644 --- a/pom.xml +++ b/pom.xml @@ -359,6 +359,8 @@ under the License. ${maven.compiler.source} ${maven.compiler.target} + + target/invoker-reports-test ${project.version} diff --git a/src/it/MINVOKER-196_junit_report_file/verify.groovy b/src/it/MINVOKER-196_junit_report_file/verify.groovy index df3402fc..34fb6f19 100644 --- a/src/it/MINVOKER-196_junit_report_file/verify.groovy +++ b/src/it/MINVOKER-196_junit_report_file/verify.groovy @@ -19,7 +19,7 @@ File buildLog = new File( basedir, 'build.log' ) assert buildLog.text.contains( '[INFO] run post-build script verify.groovy' ) -File invokerReports = new File( new File(basedir, "target"), 'invoker-reports' ) +File invokerReports = new File( new File(basedir, "target"), 'invoker-reports-test' ) assert invokerReports.exists() // test on first project diff --git a/src/it/MINVOKER-288-failed-setup-run/verify.groovy b/src/it/MINVOKER-288-failed-setup-run/verify.groovy index 92bed15a..5aac8b50 100644 --- a/src/it/MINVOKER-288-failed-setup-run/verify.groovy +++ b/src/it/MINVOKER-288-failed-setup-run/verify.groovy @@ -18,7 +18,7 @@ */ -File invokerReports = new File( new File(basedir, 'target'), 'invoker-reports' ) +File invokerReports = new File( new File(basedir, 'target'), 'invoker-reports-test' ) assert invokerReports.exists() def build1 = new XmlSlurper().parse( new File( invokerReports, 'BUILD-project1.xml' ) ) diff --git a/src/it/MINVOKER-288-failed-setup-verify/verify.groovy b/src/it/MINVOKER-288-failed-setup-verify/verify.groovy index 450fd574..991388b2 100644 --- a/src/it/MINVOKER-288-failed-setup-verify/verify.groovy +++ b/src/it/MINVOKER-288-failed-setup-verify/verify.groovy @@ -18,7 +18,7 @@ */ -File invokerReports = new File( new File(basedir, "target"), 'invoker-reports' ) +File invokerReports = new File( new File(basedir, "target"), 'invoker-reports-test' ) assert invokerReports.exists() def build1 = new XmlSlurper().parse( new File( invokerReports, "BUILD-project1.xml" ) ) diff --git a/src/it/invocation-cmdline-exclude/verify.groovy b/src/it/invocation-cmdline-exclude/verify.groovy index aab48ab1..ee8a8f97 100644 --- a/src/it/invocation-cmdline-exclude/verify.groovy +++ b/src/it/invocation-cmdline-exclude/verify.groovy @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -assert new File(basedir, 'target/invoker-reports/BUILD-minvoker-140-executable.xml').exists() -assert !new File(basedir, 'target/invoker-reports/BUILD-minvoker-140-ignorable.xml').exists() +assert new File(basedir, 'target/invoker-reports-test/BUILD-minvoker-140-executable.xml').exists() +assert !new File(basedir, 'target/invoker-reports-test/BUILD-minvoker-140-ignorable.xml').exists() diff --git a/src/it/project-setup/verify.bsh b/src/it/project-setup/verify.bsh index 59a985d4..d6d8643c 100644 --- a/src/it/project-setup/verify.bsh +++ b/src/it/project-setup/verify.bsh @@ -59,7 +59,7 @@ try return false; } - File reportFile = new File( basedir, "target/invoker-reports/BUILD-project1.xml" ); + File reportFile = new File( basedir, "target/invoker-reports-test/BUILD-project1.xml" ); if ( !reportFile.exists() ) { System.out.println( "reportFile not exists FAILED!" ); diff --git a/src/it/selector-scripts/setup.groovy b/src/it/selector-scripts/setup.groovy index ac781158..054111a1 100644 --- a/src/it/selector-scripts/setup.groovy +++ b/src/it/selector-scripts/setup.groovy @@ -21,7 +21,7 @@ import org.apache.commons.io.FileUtils // Previous potential target 'content' has impact on IT execution // (Some new file should be created by verify.sh) -FileUtils.deleteQuietly( new File( basedir, "target/invoker-reports" ) ); +FileUtils.deleteQuietly( new File( basedir, "target/invoker-reports-test" ) ); FileUtils.deleteQuietly( new File( basedir, "src/it/script-ret-quiet/target" ) ); FileUtils.deleteQuietly( new File( basedir, "src/it/script-ret-true/target" ) ); return true; diff --git a/src/it/selector-scripts/verify.bsh b/src/it/selector-scripts/verify.bsh index 422b5d92..62021042 100644 --- a/src/it/selector-scripts/verify.bsh +++ b/src/it/selector-scripts/verify.bsh @@ -57,8 +57,8 @@ try } String[] success = { - "target/invoker-reports/BUILD-script-ret-true.xml", - "target/invoker-reports/BUILD-script-ret-quiet.xml", + "target/invoker-reports-test/BUILD-script-ret-true.xml", + "target/invoker-reports-test/BUILD-script-ret-quiet.xml", }; for ( String file : success ) { @@ -73,8 +73,8 @@ try } String[] skipped = { - "target/invoker-reports/BUILD-script-ret-false.xml", - "target/invoker-reports/BUILD-script-ret-other.xml", + "target/invoker-reports-test/BUILD-script-ret-false.xml", + "target/invoker-reports-test/BUILD-script-ret-other.xml", }; for ( String file : skipped ) { @@ -90,7 +90,7 @@ try String[] inerror = { - "target/invoker-reports/BUILD-script-throw.xml", + "target/invoker-reports-test/BUILD-script-throw.xml", }; for ( String file : inerror ) {