This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 14b2159 Remove JUnit 3 references, drop usage of TestCase
14b2159 is described below
commit 14b2159066a2952aa18e29984e18ab281e9e3a99
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Sat Dec 27 20:39:06 2025 +0100
Remove JUnit 3 references, drop usage of TestCase
---
.../src/main/resources/archetype-resources/pom.xml | 6 +-
.../archetype-resources/src/main/java/App.java | 8 +--
.../archetype-resources/src/test/java/AppTest.java | 12 ++--
.../resources-filtered/archetype-resources/pom.xml | 22 ++------
.../archetype-resources/src/main/java/MyMojo.java | 44 ++++-----------
.../src/test/java/MyMojoTest.java | 66 ++++++++--------------
.../resources-filtered/archetype-resources/pom.xml | 6 +-
.../archetype-resources/src/main/java/App.java | 8 +--
.../archetype-resources/src/test/java/AppTest.java | 33 +++--------
maven-archetype-quickstart/pom.xml | 2 +-
.../resources-filtered/archetype-resources/pom.xml | 7 ++-
.../archetype-resources/src/main/java/App.java | 8 +--
.../archetype-resources/src/test/java/AppTest.java | 33 +++--------
.../resources-filtered/archetype-resources/pom.xml | 9 ---
14 files changed, 79 insertions(+), 185 deletions(-)
diff --git
a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
index ad49520..eb684cd 100644
---
a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
+++
b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
@@ -16,9 +16,9 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${versions.junit5}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
b/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
index bd522c3..c8f5d06 100644
---
a/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
+++
b/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
@@ -4,10 +4,8 @@ package $package;
* Hello world!
*
*/
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
+public class App {
+ public static void main(String[] args) {
+ System.out.println("Hello World!");
}
}
diff --git
a/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
b/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
index 2960309..cae66ef 100644
---
a/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
+++
b/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -1,20 +1,18 @@
package $package;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for simple App.
*/
-public class AppTest
-{
+public class AppTest {
/**
* Rigorous Test :-)
*/
@Test
- public void shouldAnswerWithTrue()
- {
- assertTrue( true );
+ public void shouldAnswerWithTrue() {
+ assertTrue(true);
}
}
diff --git
a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
index a09a1f8..9899763 100644
---
a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
- <maven.version>3.3.9</maven.version>
+ <maven.version>3.9.0</maven.version>
</properties>
<dependencies>
@@ -54,18 +54,6 @@
<version>\${maven.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>\${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>\${maven.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -73,15 +61,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${versions.junit5}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/maven-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyMojo.java
b/maven-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyMojo.java
index 6a202cb..9c00065 100644
---
a/maven-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyMojo.java
+++
b/maven-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyMojo.java
@@ -30,52 +30,28 @@ import java.io.IOException;
/**
* Goal which touches a timestamp file.
*/
-@Mojo( name = "touch", defaultPhase = LifecyclePhase.PROCESS_SOURCES )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
+public class MyMojo extends AbstractMojo {
/**
* Location of the file.
*/
- @Parameter( defaultValue = "${project.build.directory}", property =
"outputDir", required = true )
+ @Parameter(defaultValue = "${project.build.directory}", property =
"outputDir", required = true)
private File outputDirectory;
public void execute()
- throws MojoExecutionException
- {
+ throws MojoExecutionException {
File f = outputDirectory;
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
- File touch = new File( f, "touch.txt" );
+ File touch = new File(f, "touch.txt");
- FileWriter w = null;
- try
- {
- w = new FileWriter( touch );
-
- w.write( "touch.txt" );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error creating file " + touch,
e );
- }
- finally
- {
- if ( w != null )
- {
- try
- {
- w.close();
- }
- catch ( IOException e )
- {
- // ignore
- }
- }
+ try (FileWriter w = new FileWriter(touch)){
+ w.write("touch.txt");
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating file " + touch,
e);
}
}
}
diff --git
a/maven-archetype-plugin/src/main/resources/archetype-resources/src/test/java/MyMojoTest.java
b/maven-archetype-plugin/src/main/resources/archetype-resources/src/test/java/MyMojoTest.java
index b1078d3..24bf2e5 100644
---
a/maven-archetype-plugin/src/main/resources/archetype-resources/src/test/java/MyMojoTest.java
+++
b/maven-archetype-plugin/src/main/resources/archetype-resources/src/test/java/MyMojoTest.java
@@ -16,64 +16,48 @@ package $package;
## limitations under the License.
##
-import org.apache.maven.plugin.testing.MojoRule;
-import org.apache.maven.plugin.testing.WithoutMojo;
+import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoTest;
+import org.apache.maven.api.plugin.testing.MojoExtension;
+import org.junit.jupiter.api.Test;
-import org.junit.Rule;
-import static org.junit.Assert.*;
-import org.junit.Test;
-import java.io.File;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
-public class MyMojoTest
-{
- @Rule
- public MojoRule rule = new MojoRule()
- {
- @Override
- protected void before() throws Throwable
- {
- }
+import java.io.File;
- @Override
- protected void after()
- {
- }
- };
+@MojoTest
+public class MyMojoTest {
/**
* @throws Exception if any
*/
@Test
- public void testSomething()
- throws Exception
- {
- File pom = new File( "target/test-classes/project-to-test/" );
- assertNotNull( pom );
- assertTrue( pom.exists() );
+ @InjectMojo(goal = "touch", pom = "classpath:/project-to-test/pom.xml")
+ public void testSomething(MyMojo myMojo) throws Exception {
- MyMojo myMojo = ( MyMojo ) rule.lookupConfiguredMojo( pom, "touch" );
- assertNotNull( myMojo );
myMojo.execute();
- File outputDirectory = ( File ) rule.getVariableValueFromObject(
myMojo, "outputDirectory" );
- assertNotNull( outputDirectory );
- assertTrue( outputDirectory.exists() );
+ File outputDirectory =
(File)MojoExtension.getVariableValueFromObject(myMojo, "outputDirectory");
+ assertNotNull(outputDirectory);
+ assertTrue(outputDirectory.exists());
- File touch = new File( outputDirectory, "touch.txt" );
- assertTrue( touch.exists() );
+ File touch = new File(outputDirectory, "touch.txt");
+ assertTrue(touch.exists());
- File expectedOutputDirectory = new File
- (pom.getAbsoluteFile(), "target/test-harness/project-to-test");
+ File expectedOutputDirectory = new File(getBasedir(),
"target/test-harness/project-to-test");
assertEquals(expectedOutputDirectory, outputDirectory);
}
- /** Do not need the MojoRule. */
- @WithoutMojo
+ /**
+ * Do not need the Mojo.
+ */
@Test
- public void
testSomethingWhichDoesNotNeedTheMojoAndProbablyShouldBeExtractedIntoANewClassOfItsOwn()
- {
- assertTrue( true );
+ public void
testSomethingWhichDoesNotNeedTheMojoAndProbablyShouldBeExtractedIntoANewClassOfItsOwn()
{
+ assertTrue(true);
}
-
}
diff --git
a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
index 12fdb7b..9878223 100644
---
a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
@@ -20,9 +20,9 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${versions.junit5}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/maven-archetype-profiles/src/main/resources/archetype-resources/src/main/java/App.java
b/maven-archetype-profiles/src/main/resources/archetype-resources/src/main/java/App.java
index bd522c3..c8f5d06 100644
---
a/maven-archetype-profiles/src/main/resources/archetype-resources/src/main/java/App.java
+++
b/maven-archetype-profiles/src/main/resources/archetype-resources/src/main/java/App.java
@@ -4,10 +4,8 @@ package $package;
* Hello world!
*
*/
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
+public class App {
+ public static void main(String[] args) {
+ System.out.println("Hello World!");
}
}
diff --git
a/maven-archetype-profiles/src/main/resources/archetype-resources/src/test/java/AppTest.java
b/maven-archetype-profiles/src/main/resources/archetype-resources/src/test/java/AppTest.java
index 7ddff2b..67fad37 100644
---
a/maven-archetype-profiles/src/main/resources/archetype-resources/src/test/java/AppTest.java
+++
b/maven-archetype-profiles/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -1,38 +1,19 @@
package $package;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
/**
* Unit test for simple App.
*/
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
+public class AppTest {
/**
* Rigourous Test :-)
*/
- public void testApp()
- {
- assertTrue( true );
+ @Test
+ public void testApp() {
+ assertTrue(true);
}
}
diff --git a/maven-archetype-quickstart/pom.xml
b/maven-archetype-quickstart/pom.xml
index 47afaa0..a37ccf5 100644
--- a/maven-archetype-quickstart/pom.xml
+++ b/maven-archetype-quickstart/pom.xml
@@ -34,7 +34,7 @@ under the License.
<properties>
<javaCompilerVersionDefault>17</javaCompilerVersionDefault>
- <junitVersionDefault>5.11.0</junitVersionDefault>
+ <junitVersionDefault>${versions.junit5}</junitVersionDefault>
</properties>
<build>
diff --git
a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
index 5f3ca8c..e39746e 100644
---
a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -21,9 +21,10 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${versions.junit5}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git
a/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
b/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
index 9d9e32b..d31692e 100644
---
a/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
+++
b/maven-archetype-simple/src/main/resources/archetype-resources/src/main/java/App.java
@@ -4,10 +4,8 @@ package ${package};
* Hello world!
*
*/
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
+public class App {
+ public static void main(String[] args) {
+ System.out.println("Hello World!");
}
}
diff --git
a/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
b/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
index 6e97368..9a54121 100644
---
a/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
+++
b/maven-archetype-simple/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -1,38 +1,19 @@
package ${package};
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
/**
* Unit test for simple App.
*/
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
+public class AppTest {
/**
* Rigourous Test :-)
*/
- public void testApp()
- {
- assertTrue( true );
+
+ public void testApp() {
+ assertTrue(true);
}
}
diff --git
a/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
b/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
index af432ec..51be065 100644
---
a/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
+++
b/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml
@@ -19,15 +19,6 @@
<maven.compiler.target>8</maven.compiler.target>
</properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<finalName>\${artifactId}</finalName>
<pluginManagement><!-- lock down plugins versions to avoid using Maven
defaults (may be moved to parent pom) -->
