Skip to content

Commit ff405f0

Browse files
rudsbergdnestoro
authored andcommitted
Update regex pattern in SBOM integration test
1 parent b67fd5a commit ff405f0

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/SBOMFunctionalTest.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
8080

8181
then:
8282
buildSucceeded
83-
outputContainsPattern".*CycloneDX SBOM with \\d+ component\\(s\\) is embedded in binary \\(.*?\\) and exported as JSON \\(see build artifacts\\)\\."
84-
outputDoesNotContain "Use '--enable-sbom' to assemble a Software Bill of Materials (SBOM)"
83+
outputContainsPattern".*CycloneDX SBOM with \\d+ component\\(s\\) is embedded in binary \\(.*?\\) and exported as JSON \\(see build artifacts\\)\\..*"
8584
outputDoesNotContain "Could not generate an augmented SBOM"
8685
validateExportedSBOM sbom
8786
!file(String.format("target/%s", SBOMGenerator.SBOM_FILENAME)).exists()
@@ -101,8 +100,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
101100
102101
then:
103102
buildSucceeded
104-
outputContainsPattern".*CycloneDX SBOM with \\d+ component\\(s\\) is embedded in binary \\(.*?\\)."
105-
outputDoesNotContain "Use '--enable-sbom' to assemble a Software Bill of Materials (SBOM)"
103+
outputContainsPattern".*CycloneDX SBOM with \\d+ component\\(s\\) is embedded in binary \\(.*?\\)\\..*"
106104
outputDoesNotContain "Could not generate an augmented SBOM"
107105
!file(String.format("target/%s", SBOMGenerator.SBOM_FILENAME)).exists()
108106
outputContains "Hello, native!"
@@ -120,7 +118,7 @@ class SBOMFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
120118
}
121119
122120
@Requires({ EE() && unsupportedJDKVersion() })
123-
def "error is thrown when augmented sbom parameter is used with EE but not with an unsupported JDK version"() {
121+
def "error is thrown when augmented sbom parameter is used with EE but with an unsupported JDK version"() {
124122
withSample 'java-application'
125123
126124
when:

0 commit comments

Comments
 (0)