This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git

commit 3e1f5b53dea39c76e1f457b48d8bc04a6910ebe9
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 31 11:31:10 2026 +0000

    Convert IT verify scripts to plain assertions and add the missing ones
---
 .../ARCHETYPE-241_filter-directory/verify.groovy   |  2 +-
 .../ARCHETYPE-517_failing-goals/verify.groovy      |  2 +-
 .../it/projects/ARCHETYPE-520_mirror/verify.groovy |  5 +-
 .../verify.groovy                                  |  9 +++-
 .../ARCHETYPE-606_include-gitignore/verify.groovy  |  2 +-
 .../verify.groovy                                  |  2 +-
 .../it/projects/build-and-run-its/verify.groovy    | 29 +++-------
 .../src/it/projects/build-archetype/verify.groovy  | 61 ++++++----------------
 .../src/it/projects/build-ignore-eol/verify.groovy | 61 ++++++----------------
 .../src/it/projects/create-2/verify.groovy         | 41 +++++++++++++++
 .../verify.groovy                                  | 28 +++-------
 .../it/projects/create-from-project/verify.groovy  | 20 ++-----
 .../src/it/projects/generate-basic/verify.groovy   | 11 +---
 13 files changed, 105 insertions(+), 168 deletions(-)

diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
index b66e954a..06f80c8d 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
@@ -18,4 +18,4 @@
  */
 
 assert new File( basedir, "myArtifactId/myName-test2" ).exists()
-assert false == new File( basedir, "myArtifactId/__projectName__-test2" 
).exists()
\ No newline at end of file
+assert !new File( basedir, "myArtifactId/__projectName__-test2" ).exists()
\ No newline at end of file
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/verify.groovy
index ec304e96..62d2f469 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/verify.groovy
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-buildLog = new File( basedir, 
"../../logs/ARCHETYPE-517_failing-goals/build.log" )
+def buildLog = new File( basedir, 
"../../logs/ARCHETYPE-517_failing-goals/build.log" )
 assert buildLog.text.contains( "Failed to invoke goals" )
\ No newline at end of file
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
index 2b6ae2d2..ed0a8687 100644
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
@@ -17,5 +17,6 @@
  * under the License.
  */
 
-buildLog = new File( basedir, "../../logs/ARCHETYPE-520_mirror/build.log" )
-assert !buildLog.text.contains( "://repo.maven.apache.org/maven2/" )
\ No newline at end of file
+def buildLog = new File( basedir, "../../logs/ARCHETYPE-520_mirror/build.log" )
+assert !buildLog.text.contains( "://repo.maven.apache.org/maven2/" )
+assert buildLog.text.contains( "Using mirror mrm-maven-plugin" ) : "the mock 
repository mirror from the settings was not used"
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-531_ear-modules/verify.groovy
similarity index 67%
copy from 
maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
copy to 
maven-archetype-plugin/src/it/projects/ARCHETYPE-531_ear-modules/verify.groovy
index b66e954a..58b0bdac 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-531_ear-modules/verify.groovy
@@ -17,5 +17,10 @@
  * under the License.
  */
 
-assert new File( basedir, "myArtifactId/myName-test2" ).exists()
-assert false == new File( basedir, "myArtifactId/__projectName__-test2" 
).exists()
\ No newline at end of file
+def template = new File(basedir, 
'target/generated-sources/archetype/src/main/resources/archetype-resources/pom.xml')
+assert template.exists()
+
+// ARCHETYPE-531: the ear plugin configuration without <modules/> survives the 
template creation
+assert template.text.contains('<packaging>ear</packaging>')
+assert template.text.contains('<index>true</index>')
+assert !template.text.contains('<modules>')
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.groovy
index 77eac963..8b1609ec 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.groovy
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-buildLog = new File( basedir, 
'../../logs/ARCHETYPE-606_include-gitignore/build.log' ).text
+def buildLog = new File( basedir, 
'../../logs/ARCHETYPE-606_include-gitignore/build.log' ).text
 assert buildLog.contains( '[INFO] Invoking post-archetype-generation goals: 
compile' ) : 'post-archetype-generation invocation not recorder in log'
 assert buildLog.contains( '[INFO] [INFO]' ) : 'output of 
post-archetype-generation should be present in log'
 
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/verify.groovy
index 363e7a84..9f9f391f 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/verify.groovy
@@ -36,7 +36,7 @@ assert buildLog.contains("Archetype tests executed!") :
 // we expect the archetype:integration-test to use the settings.xml from the 
main Maven build - so downloading should happen
 // also from local.central specified in the test-settings.xml
 assert buildLog.contains("local.central (file://") :
- "test-settings.xml wasn't passed from the main Maven build!: 'local.central 
(file://' was NOT found in the output! The output was:\n${content}"
+ "test-settings.xml wasn't passed from the main Maven build!: 'local.central 
(file://' was NOT found in the output! The output was:\n${buildLog}"
 
 def settingsXmlPath = new 
File("maven-archetype-plugin/target/it/projects/ARCHETYPE-622_main_build_settings/target/archetype-it",
 "archetype-settings.xml").toPath().toString().replace("\\", "\\\\")
 assert buildLog.matches("(?s).*\\[DEBUG\\] Reading user settings from .*" + 
settingsXmlPath + ".*") : "test-settings.xml wasn't passed from the main Maven 
build!: 'Reading user settings from ... archetype-settings.xml' was NOT found 
in the output! The output was: ${buildLog}"
diff --git 
a/maven-archetype-plugin/src/it/projects/build-and-run-its/verify.groovy 
b/maven-archetype-plugin/src/it/projects/build-and-run-its/verify.groovy
index 2d245ae9..e650006e 100644
--- a/maven-archetype-plugin/src/it/projects/build-and-run-its/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/build-and-run-its/verify.groovy
@@ -18,29 +18,12 @@
  * under the License.
  */
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-basedir = new File( basedir, 
"target/test-classes/projects/basic/project/project/basic" );
-if ( !basedir.exists() ) {
-       throw new Exception( basedir + " is missing." );
-}
-
-File main = new File( basedir, "src/main" );
+def projectDir = new File(basedir, 
"target/test-classes/projects/basic/project/project/basic")
+assert projectDir.exists() : "${projectDir} is missing."
 
 // check <fileset packaged="true">
-File app = new File( main, "java/build/archetype/App.java" );
-if ( !app.isFile() )
-{
-    throw new Exception( app + " file is missing or not a file." );
-}
-
-File buildLog = new File( basedir, "build.log" );
-
-String content = FileUtils.fileRead( buildLog, "UTF-8" );
+def app = new File(projectDir, "src/main/java/build/archetype/App.java")
+assert app.isFile() : "${app} file is missing or not a file."
 
-int idx = content.indexOf( "Yeah Baby, it rocks!" );
-if ( idx < 0 )
-{
-    throw new Exception( "build.log missing System.out.println from 
verify.groovy" );
-}
+def buildLog = new File(projectDir, "build.log")
+assert buildLog.getText("UTF-8").contains("Yeah Baby, it rocks!") : "build.log 
missing System.out.println from verify.groovy"
diff --git 
a/maven-archetype-plugin/src/it/projects/build-archetype/verify.groovy 
b/maven-archetype-plugin/src/it/projects/build-archetype/verify.groovy
index f6d2460c..d8ed381d 100644
--- a/maven-archetype-plugin/src/it/projects/build-archetype/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/build-archetype/verify.groovy
@@ -18,58 +18,27 @@
  * under the License.
  */
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-basedir = new File( basedir, 
"target/test-classes/projects/basic/project/basic" );
-
-File main = new File( basedir, "src/main" );
+def projectDir = new File(basedir, 
"target/test-classes/projects/basic/project/basic")
+def main = new File(projectDir, "src/main")
 
 // check <fileset packaged="true">
-File app = new File( main, "java/build/archetype/App.java" );
-if ( !app.isFile() )
-{
-    throw new Exception( app + " file is missing or not a file." );
-}
+def app = new File(main, "java/build/archetype/App.java")
+assert app.isFile() : "${app} file is missing or not a file."
 
 // check __propertyName__ path replacement
-File artifactId = new File( main, "resources/test-basic.properties" );
-if ( !artifactId.isFile() )
-{
-    throw new Exception( artifactId + " file is missing or not a file." );
-}
+def artifactId = new File(main, "resources/test-basic.properties")
+assert artifactId.isFile() : "${artifactId} file is missing or not a file."
 
-File packageInPathFormat = new File( main, 
"resources/build/archetype/build.archetype.properties" );
-if ( !packageInPathFormat.isFile() )
-{
-    throw new Exception( packageInPathFormat + " file is missing or not a 
file." );
-}
+def packageInPathFormat = new File(main, 
"resources/build/archetype/build.archetype.properties")
+assert packageInPathFormat.isFile() : "${packageInPathFormat} file is missing 
or not a file."
 
 // ARCHETYPE-289 check empty directory creation
-File empty = new File( main, "resources/empty-directory" );
-if ( !empty.isDirectory() )
-{
-    throw new Exception( empty + " directory is missing or not a directory." );
-}
-File filteredEmpty = new File( main, "resources/basic-empty-directory" );
-if ( !filteredEmpty.isDirectory() )
-{
-    throw new Exception( filteredEmpty + " directory is missing or not a 
directory." );
-}
-
-// ARCHETYPE-334 check generated project has been compiled
-File appClass = new File( basedir, "target/classes/build/archetype/App.class" 
);
-if ( !appClass.isFile() )
-{
-    throw new Exception( appClass + " not here: generated project not 
compiled?" );
-}
-
-File buildLog = new File(basedir, "build.log");
+def empty = new File(main, "resources/empty-directory")
+assert empty.isDirectory() : "${empty} directory is missing or not a 
directory."
 
-String content = FileUtils.fileRead( buildLog, "UTF-8" );
+def filteredEmpty = new File(main, "resources/basic-empty-directory")
+assert filteredEmpty.isDirectory() : "${filteredEmpty} directory is missing or 
not a directory."
 
-int idx = content.indexOf( "Yeah Baby it rocks!");
-if ( idx < 0 )
-{
-    throw new Exception( "build.log missing out.println from verify.groovy" );
-}
+// ARCHETYPE-334 check generated project has been compiled
+def appClass = new File(projectDir, "target/classes/build/archetype/App.class")
+assert appClass.isFile() : "${appClass} not here: generated project not 
compiled?"
diff --git 
a/maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.groovy 
b/maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.groovy
index f6d2460c..d8ed381d 100644
--- a/maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/build-ignore-eol/verify.groovy
@@ -18,58 +18,27 @@
  * under the License.
  */
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-basedir = new File( basedir, 
"target/test-classes/projects/basic/project/basic" );
-
-File main = new File( basedir, "src/main" );
+def projectDir = new File(basedir, 
"target/test-classes/projects/basic/project/basic")
+def main = new File(projectDir, "src/main")
 
 // check <fileset packaged="true">
-File app = new File( main, "java/build/archetype/App.java" );
-if ( !app.isFile() )
-{
-    throw new Exception( app + " file is missing or not a file." );
-}
+def app = new File(main, "java/build/archetype/App.java")
+assert app.isFile() : "${app} file is missing or not a file."
 
 // check __propertyName__ path replacement
-File artifactId = new File( main, "resources/test-basic.properties" );
-if ( !artifactId.isFile() )
-{
-    throw new Exception( artifactId + " file is missing or not a file." );
-}
+def artifactId = new File(main, "resources/test-basic.properties")
+assert artifactId.isFile() : "${artifactId} file is missing or not a file."
 
-File packageInPathFormat = new File( main, 
"resources/build/archetype/build.archetype.properties" );
-if ( !packageInPathFormat.isFile() )
-{
-    throw new Exception( packageInPathFormat + " file is missing or not a 
file." );
-}
+def packageInPathFormat = new File(main, 
"resources/build/archetype/build.archetype.properties")
+assert packageInPathFormat.isFile() : "${packageInPathFormat} file is missing 
or not a file."
 
 // ARCHETYPE-289 check empty directory creation
-File empty = new File( main, "resources/empty-directory" );
-if ( !empty.isDirectory() )
-{
-    throw new Exception( empty + " directory is missing or not a directory." );
-}
-File filteredEmpty = new File( main, "resources/basic-empty-directory" );
-if ( !filteredEmpty.isDirectory() )
-{
-    throw new Exception( filteredEmpty + " directory is missing or not a 
directory." );
-}
-
-// ARCHETYPE-334 check generated project has been compiled
-File appClass = new File( basedir, "target/classes/build/archetype/App.class" 
);
-if ( !appClass.isFile() )
-{
-    throw new Exception( appClass + " not here: generated project not 
compiled?" );
-}
-
-File buildLog = new File(basedir, "build.log");
+def empty = new File(main, "resources/empty-directory")
+assert empty.isDirectory() : "${empty} directory is missing or not a 
directory."
 
-String content = FileUtils.fileRead( buildLog, "UTF-8" );
+def filteredEmpty = new File(main, "resources/basic-empty-directory")
+assert filteredEmpty.isDirectory() : "${filteredEmpty} directory is missing or 
not a directory."
 
-int idx = content.indexOf( "Yeah Baby it rocks!");
-if ( idx < 0 )
-{
-    throw new Exception( "build.log missing out.println from verify.groovy" );
-}
+// ARCHETYPE-334 check generated project has been compiled
+def appClass = new File(projectDir, "target/classes/build/archetype/App.class")
+assert appClass.isFile() : "${appClass} not here: generated project not 
compiled?"
diff --git a/maven-archetype-plugin/src/it/projects/create-2/verify.groovy 
b/maven-archetype-plugin/src/it/projects/create-2/verify.groovy
new file mode 100644
index 00000000..0b644790
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/create-2/verify.groovy
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def templateDir = new File(basedir, 
'target/generated-sources/archetype/src/main/resources/archetype-resources')
+
+def root = new File(templateDir, 'pom.xml')
+assert root.exists()
+assert root.text.contains('<artifactId>${artifactId}</artifactId>')
+assert root.text.contains('Maven archetype Test create-2')
+assert root.text.contains('<packaging>pom</packaging>')
+
+def subModule = new File(templateDir, 'subModule/pom.xml')
+assert subModule.exists()
+assert subModule.text.contains('<artifactId>${rootArtifactId}</artifactId>')
+assert subModule.text.contains('<parent>')
+assert subModule.text.contains('Maven archetype Test create-2-subModule')
+
+// the non-standard source directory src/it-test is part of the archetype
+def itApp = new File(templateDir, 'src/it-test/java/subfolder1/App.java')
+assert itApp.exists()
+assert itApp.text.contains('// ${someProperty}')
+
+def descriptor = new File(basedir, 
'target/generated-sources/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml')
+assert descriptor.text.contains('<module id="${rootArtifactId}-subModule" 
dir="subModule"')
+assert descriptor.text.contains('<directory>src/it-test/java</directory>')
diff --git 
a/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/verify.groovy
 
b/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/verify.groovy
index 3c11127d..81cf12cf 100644
--- 
a/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/verify.groovy
+++ 
b/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/verify.groovy
@@ -18,29 +18,15 @@
  * under the License.
  */
 
-import java.io.*;
-
-File archetype = new File( basedir, 
"target/generated-sources/archetype/src/main/resources/archetype-resources/" );
+def archetype = new File(basedir, 
"target/generated-sources/archetype/src/main/resources/archetype-resources/")
 
 // ARCHETYPE-513
-String[] excluded = [ "/", "src/", "src/main/", "src/main/resources/" ] as 
String[];
-for ( String exclude : excluded )
-{
-    File app = new File( archetype, exclude + "toexclude" );
-    if ( app.exists() )
-    {
-        throw new Exception( app + " folder exists when it should have been 
excluded." );
-    }
+for (exclude in ["/", "src/", "src/main/", "src/main/resources/"]) {
+    def excluded = new File(archetype, exclude + "toexclude")
+    assert !excluded.exists() : "${excluded} folder exists when it should have 
been excluded."
 }
 
-String[] included = [ "file.txt", "file.xml" ] as String[];
-for ( String include : included )
-{
-    File app = new File( archetype, "src/main/resources/" + include );
-    if ( !app.isFile() )
-    {
-        throw new Exception( app + " file does not exist when it should have 
been included." );
-    }
+for (include in ["file.txt", "file.xml"]) {
+    def included = new File(archetype, "src/main/resources/" + include)
+    assert included.isFile() : "${included} file does not exist when it should 
have been included."
 }
-
-return true;
diff --git 
a/maven-archetype-plugin/src/it/projects/create-from-project/verify.groovy 
b/maven-archetype-plugin/src/it/projects/create-from-project/verify.groovy
index 84a5f1e6..d1d12887 100644
--- a/maven-archetype-plugin/src/it/projects/create-from-project/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/create-from-project/verify.groovy
@@ -18,21 +18,11 @@
  * under the License.
  */
 
-import java.io.*;
+def archetype = new File(basedir, "target/generated-sources/archetype")
 
-File archetype = new File( basedir, "target/generated-sources/archetype" );
-
-File pom = new File( archetype, "pom.xml" );
-if ( !pom.isFile() )
-{
-    throw new Exception( pom + " file is missing or not a file." );
-}
+def pom = new File(archetype, "pom.xml")
+assert pom.isFile() : "${pom} file is missing or not a file."
 
 // ARCHETYPE-462 filter file name with archetype.properties properties
-File app = new File( archetype, 
"src/main/resources/archetype-resources/src/main/java/__AppName__.java" );
-if ( !app.isFile() )
-{
-    throw new Exception( app + " file is missing or not a file." );
-}
-
-return true;
+def app = new File(archetype, 
"src/main/resources/archetype-resources/src/main/java/__AppName__.java")
+assert app.isFile() : "${app} file is missing or not a file."
diff --git 
a/maven-archetype-plugin/src/it/projects/generate-basic/verify.groovy 
b/maven-archetype-plugin/src/it/projects/generate-basic/verify.groovy
index 91c54259..20e9a301 100644
--- a/maven-archetype-plugin/src/it/projects/generate-basic/verify.groovy
+++ b/maven-archetype-plugin/src/it/projects/generate-basic/verify.groovy
@@ -18,12 +18,5 @@
  * under the License.
  */
 
-import java.io.*;
-
-File pom = new File( basedir, "project/pom.xml" );
-if ( !pom.isFile() )
-{
-    throw new Exception( "No project created from archetype." );
-}
-
-return true;
+def pom = new File(basedir, "project/pom.xml")
+assert pom.isFile() : "No project created from archetype."

Reply via email to