From a4180ec60e222fb42017c0839be8350c3bd5081f Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 26 Oct 2023 17:56:38 +0200 Subject: [PATCH] Update Maven tests --- ...aApplicationWithTestsFunctionalTest.groovy | 2 +- .../JavaApplicationFunctionalTest.groovy | 10 ++++----- ...aApplicationWithAgentFunctionalTest.groovy | 22 +++++++++---------- ...licationWithResourcesFunctionalTest.groovy | 4 ++-- ...aApplicationWithTestsFunctionalTest.groovy | 12 +++++----- .../maven/JavaLibraryFunctionalTest.groovy | 2 +- .../MetadataRepositoryFunctionalTest.groovy | 18 +++++++-------- ...ialMetadataRepositoryFunctionalTest.groovy | 4 ++-- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy index a9b372c12..8f7213970 100644 --- a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy +++ b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy @@ -48,7 +48,7 @@ class MultiProjectJavaApplicationWithTestsFunctionalTest extends AbstractFunctio @Unroll("transitive dependencies are included when testing with JUnit Platform #junitVersion") def "transitive dependencies are included when testing"() { given: - withSample("multi-project-with-tests") + withSample("multi-project-with-tests", false) when: run 'nativeTest' diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy index 5509d88ae..f546e1434 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy @@ -66,7 +66,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { withSample("java-application") when: - mvn '-Pnative', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -77,7 +77,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { withSample("java-application") when: - mvn '-Pshaded', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pshaded', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -90,7 +90,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { withSample("java-application") when: - mvn '-Pnative', '-DskipTests', 'package', 'exec:exec@native', "-DuseArgFile=${argFile}" + mvn '-Pnative', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native', "-DuseArgFile=${argFile}" then: buildSucceeded @@ -104,7 +104,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { withSample("java-application-with-custom-packaging") when: - mvnDebug 'package', '-Dpackaging=native-image', 'exec:exec@native' + mvnDebug '-DquickBuild', 'package', '-Dpackaging=native-image', 'exec:exec@native' then: buildSucceeded @@ -116,7 +116,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { withSample("java-application") when: - mvn '-Pnative', 'native:write-args-file' + mvn '-DquickBuild', '-Pnative', 'native:write-args-file' then: buildSucceeded diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy index a471652e9..282e25be0 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithAgentFunctionalTest.groovy @@ -54,7 +54,7 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio when: // Run Maven in debug mode (-X) in order to capture the command line arguments // used to launch Surefire with the agent. - mvnDebug '-Pnative', 'test', '-Dagent=true', '-DskipNativeTests' + mvnDebug '-Pnative', '-DquickBuild', 'test', '-Dagent=true', '-DskipNativeTests' then: // Agent is used with Surefire @@ -81,10 +81,10 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio def "test agent with metadata copy task"() { given: withSample("java-application-with-reflection") - mvn'-Pnative', '-DskipNativeBuild=true', 'package', '-Dagent=true', 'exec:exec@java-agent' + mvn'-Pnative', '-DquickBuild', '-DskipNativeBuild=true', 'package', '-Dagent=true', 'exec:exec@java-agent' when: - mvn'-Pnative', '-DskipNativeTests', '-Dagent=true', 'native:metadata-copy' + mvn'-Pnative', '-DquickBuild', '-DskipNativeTests', '-Dagent=true', 'native:metadata-copy' then: buildSucceeded @@ -98,10 +98,10 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio def "test agent with metadata copy task and disabled stages"() { given: withSample("java-application-with-reflection") - mvn'-PagentConfigurationWithDisabledStages', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' + mvn'-PagentConfigurationWithDisabledStages', '-DquickBuild', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' when: - mvn '-PagentConfigurationWithDisabledStages', '-DskipNativeTests', 'native:metadata-copy' + mvn '-PagentConfigurationWithDisabledStages', '-DquickBuild', '-DskipNativeTests', 'native:metadata-copy' then: buildSucceeded @@ -116,10 +116,10 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio def "test agent in direct mode with metadata copy task"() { given: withSample("java-application-with-reflection") - mvn'-PagentConfigurationDirectMode', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' + mvn'-PagentConfigurationDirectMode', '-DquickBuild', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' when: - mvn '-PagentConfigurationDirectMode', '-DskipNativeTests', 'native:metadata-copy' + mvn '-PagentConfigurationDirectMode', '-DquickBuild', '-DskipNativeTests', 'native:metadata-copy' then: buildSucceeded @@ -132,10 +132,10 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio def "test agent in conditional mode with metadata copy task"() { given: withSample("java-application-with-reflection") - mvn '-PagentConfigurationConditionalMode', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' + mvn '-PagentConfigurationConditionalMode', '-DquickBuild', '-DskipNativeBuild=true', 'package', 'exec:exec@java-agent' when: - mvn '-PagentConfigurationConditionalMode', '-DskipNativeTests', 'native:metadata-copy' + mvn '-PagentConfigurationConditionalMode', '-DquickBuild', '-DskipNativeTests', 'native:metadata-copy' then: buildSucceeded @@ -149,7 +149,7 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-reflection") when: - mvn'-PnoAgentConfiguration', 'package' + mvn'-PnoAgentConfiguration', '-DquickBuild', 'package' then: buildSucceeded @@ -160,7 +160,7 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-reflection") when: - mvn '-Pnative', '-Dagent=false', 'test' + mvn '-Pnative', '-DquickBuild', '-Dagent=false', 'test' then: outputContains """ diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithResourcesFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithResourcesFunctionalTest.groovy index 3fbd42830..4ad028362 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithResourcesFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithResourcesFunctionalTest.groovy @@ -25,7 +25,7 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractGraalVMMavenFun } when: - mvn(['-Pnative', '-DskipTests', *options, 'package', 'exec:exec@native']) + mvn(['-Pnative', '-DquickBuild', '-DskipTests', *options, 'package', 'exec:exec@native']) then: buildSucceeded @@ -69,7 +69,7 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractGraalVMMavenFun } when: - mvn(['-Pnative', 'test', *options]) + mvn(['-Pnative', '-DquickBuild', 'test', *options]) then: buildSucceeded diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithTestsFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithTestsFunctionalTest.groovy index 5ad0a91f6..80e6f5c18 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithTestsFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithTestsFunctionalTest.groovy @@ -49,7 +49,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-tests") when: - mvn '-Pnative', 'test' + mvn '-Pnative', '-DquickBuild', 'test' then: buildSucceeded @@ -74,7 +74,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-tests") when: - mvn '-Pshaded', 'integration-test' + mvn '-Pshaded', '-DquickBuild', 'integration-test' then: buildSucceeded @@ -100,7 +100,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-tests") when: - mvn '-Pnative', 'test', '-DskipTests' + mvn '-Pnative', '-DquickBuild', 'test', '-DskipTests' then: buildSucceeded @@ -114,7 +114,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-tests") when: - mvn '-Pnative', 'test', '-DskipNativeTests' + mvn '-Pnative', '-DquickBuild', 'test', '-DskipNativeTests' then: buildSucceeded @@ -129,7 +129,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("java-application-with-tests") when: - mvn '-Pnative', '-Ptest-variables', 'test' + mvn '-Pnative', '-DquickBuild', '-Ptest-variables', 'test' then: buildSucceeded @@ -146,7 +146,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractGraalVMMavenFunctio withSample("multi-project-with-tests") when: - mvn 'package' + mvn '-DquickBuild', 'package' then: buildSucceeded diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaLibraryFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaLibraryFunctionalTest.groovy index 0534bfd09..e41083f06 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaLibraryFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaLibraryFunctionalTest.groovy @@ -57,7 +57,7 @@ class JavaLibraryFunctionalTest extends AbstractGraalVMMavenFunctionalTest { def library = file("target/java-library" + libExt) when: - mvn '-Pnative', '-DskipTests', 'package', '-DuseArgFile=false' + mvn '-Pnative', '-DquickBuild', '-DskipTests', 'package', '-DuseArgFile=false' then: buildSucceeded diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy index 10c8ce04a..abc06cc30 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy @@ -50,7 +50,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -62,7 +62,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative,metadataLocal', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataLocal', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -92,7 +92,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative,metadataMissing', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataMissing', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -105,7 +105,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative,metadataExclude', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataExclude', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -117,7 +117,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative,metadataForceVersion', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataForceVersion', '-DquickBuild','-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -130,7 +130,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-Pnative,metadataArchive', '-DrepoFormat=zip', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataArchive', '-DquickBuild', '-DrepoFormat=zip', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -149,7 +149,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withLocalServer() when: - mvn '-Pnative,metadataUrl', "-Dmetadata.url=http://localhost:${localServerPort}/target/repo.zip", '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataUrl', '-DquickBuild', "-Dmetadata.url=http://localhost:${localServerPort}/target/repo.zip", '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -169,7 +169,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withLocalServer() when: - mvn '-Pnative,metadataUrl', "-Dmetadata.url=https://google.com/notfound", '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative,metadataUrl', '-DquickBuild', "-Dmetadata.url=https://google.com/notfound", '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -182,7 +182,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes withSample("native-config-integration") when: - mvn '-X', '-PaddMetadataHints', '-DskipTests', 'package' + mvn '-X', '-PaddMetadataHints', '-DquickBuild', '-DskipTests', 'package' then: buildSucceeded diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/OfficialMetadataRepositoryFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/OfficialMetadataRepositoryFunctionalTest.groovy index 51394b205..d289175f7 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/OfficialMetadataRepositoryFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/OfficialMetadataRepositoryFunctionalTest.groovy @@ -50,7 +50,7 @@ class OfficialMetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunct withSample("metadata-repo-integration") when: - mvn '-Pnative', '-DskipTests', 'package', 'exec:exec@native' + mvn '-Pnative', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded @@ -70,7 +70,7 @@ class OfficialMetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunct withSample("metadata-repo-integration") when: - mvn '-PnativeVersioned', '-DskipTests', 'package', 'exec:exec@native' + mvn '-PnativeVersioned', '-DquickBuild', '-DskipTests', 'package', 'exec:exec@native' then: buildSucceeded