This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit df5c4fcfedb42ebc2d7fafe0ffc523afb2f4f843 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 17:54:28 2026 -0400 JUnit 5 migration of "cayenne-gradle-plugin" module --- cayenne-gradle-plugin/pom.xml | 7 +----- .../java/org/apache/cayenne/tools/BaseTaskIT.java | 13 ++++++----- .../java/org/apache/cayenne/tools/CgenTaskIT.java | 12 +++++------ .../org/apache/cayenne/tools/CgenTaskTest.java | 25 +++++++++++----------- .../org/apache/cayenne/tools/DbGenerateTaskIT.java | 11 ++++------ .../java/org/apache/cayenne/tools/DbImportIT.java | 4 ++-- .../org/apache/cayenne/tools/DbImportTaskTest.java | 16 +++++++------- .../org/apache/cayenne/tools/GradlePluginIT.java | 12 +++++------ .../org/apache/cayenne/tools/GradlePluginTest.java | 4 ++-- .../cayenne/tools/model/DbImportConfigTest.java | 4 ++-- .../cayenne/tools/model/FilterContainerTest.java | 4 ++-- .../cayenne/tools/model/IncludeTableTest.java | 4 ++-- .../cayenne/tools/model/PatternParamTest.java | 8 +++---- 13 files changed, 57 insertions(+), 67 deletions(-) diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml index 9e78c0c81..c82b7aed7 100644 --- a/cayenne-gradle-plugin/pom.xml +++ b/cayenne-gradle-plugin/pom.xml @@ -169,12 +169,7 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> +<dependency> <groupId>org.apache.cayenne.build-tools</groupId> <artifactId>cayenne-test-utilities</artifactId> <version>${project.version}</version> diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java index 4c398e307..ec428f6c0 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java @@ -31,23 +31,22 @@ import java.util.Arrays; import java.util.List; import org.gradle.testkit.runner.GradleRunner; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.io.TempDir; /** * @since 4.0 */ public class BaseTaskIT { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); + @TempDir + protected File tempFolder; protected File projectDir; - @Before + @BeforeEach public void createProjectDir() throws IOException { - projectDir = tempFolder.newFolder(); + projectDir = tempFolder; } protected GradleRunner createRunner(String projectName, String... args) throws Exception { diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java index 781b43d0b..12b759bce 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java @@ -22,7 +22,7 @@ package org.apache.cayenne.tools; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.gradle.testkit.runner.TaskOutcome; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URLDecoder; @@ -30,9 +30,9 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @since 4.0 @@ -121,7 +121,7 @@ public class CgenTaskIT extends BaseTaskIT { } @Test - public void testWithConfigsInDmAndPom() throws Exception { + public void withConfigsInDmAndPom() throws Exception { GradleRunner runner = createRunner( "cgen_with_configs", "cgen", @@ -148,7 +148,7 @@ public class CgenTaskIT extends BaseTaskIT { } @Test - public void testReplaceDatamapMode() throws Exception { + public void replaceDatamapMode() throws Exception { GradleRunner runner = createRunner( "cgen_replaceDatamapMode", "cgen", diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java index de4083226..2d7969500 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java @@ -23,16 +23,15 @@ import org.apache.cayenne.gen.CgenConfiguration; import org.apache.cayenne.gen.CgenTemplate; import org.apache.cayenne.gen.ClassGenerationAction; import org.apache.cayenne.map.DataMap; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.gradle.api.logging.Logging; import java.io.File; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.mockito.Mockito.*; /** @@ -40,8 +39,8 @@ import static org.mockito.Mockito.*; */ public class CgenTaskTest { - @Rule - public TemporaryFolder temp = new TemporaryFolder(); + @TempDir + File temp; DataMap dataMap = new DataMap(); @@ -71,7 +70,7 @@ public class CgenTaskTest { } @Test - public void testGeneratorCreation() { + public void generatorCreation() { CgenTask task = createCgenTaskMock(); task.setEmbeddableSuperTemplate("superTemplate"); task.setEmbeddableTemplate("template"); @@ -97,10 +96,10 @@ public class CgenTaskTest { assertNotNull(cgenConfiguration.getEmbeddableSuperTemplate()); assertNotNull(cgenConfiguration.getEmbeddableTemplate()); - assertEquals(cgenConfiguration.getEncoding(), "UTF-8"); - assertEquals(cgenConfiguration.getArtifactsGenerationMode(), "entity"); - assertEquals(cgenConfiguration.getOutputPattern(), "pattern"); - assertEquals(cgenConfiguration.getSuperPkg(), "org.example.model.auto"); + assertEquals("UTF-8", cgenConfiguration.getEncoding()); + assertEquals("entity", cgenConfiguration.getArtifactsGenerationMode()); + assertEquals("pattern", cgenConfiguration.getOutputPattern()); + assertEquals("org.example.model.auto", cgenConfiguration.getSuperPkg()); assertTrue(cgenTemplate.isFile()); assertEquals("org/apache/cayenne/tools/velotemplate.vm", cgenTemplate.getData()); assertTrue(cgenConfiguration.isMakePairs()); diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java index 97ab00299..15554ccde 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java @@ -19,17 +19,14 @@ package org.apache.cayenne.tools; -import java.io.IOException; -import java.net.URLDecoder; - import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.gradle.testkit.runner.TaskOutcome; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java index fc75425b2..ab5a9b96e 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java @@ -32,9 +32,9 @@ import org.apache.cayenne.test.resource.ResourceUtil; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.gradle.testkit.runner.TaskOutcome; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java index b3d17f14a..18a67302e 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportTaskTest.java @@ -30,10 +30,10 @@ import org.apache.cayenne.tools.model.DbImportConfig; import org.gradle.api.InvalidUserDataException; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; /** @@ -43,7 +43,7 @@ public class DbImportTaskTest { private DbImportTask task; - @Before + @BeforeEach public void createTask() { Project project = ProjectBuilder.builder().build(); @@ -52,13 +52,13 @@ public class DbImportTaskTest { task = (DbImportTask)project.task(parameters, "cdbimportTask"); } - @Test(expected = InvalidUserDataException.class) - public void testRunWithNoConfig() { - task.runImport(); + @Test + public void runWithNoConfig() { + assertThrows(InvalidUserDataException.class, () -> task.runImport()); } @Test - public void testFullConfigCreation() { + public void fullConfigCreation() { File mockFile = mock(File.class); // configure task diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java index 113b6365e..4fa12f9ba 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java @@ -20,13 +20,13 @@ package org.apache.cayenne.tools; import org.gradle.testkit.runner.GradleRunner; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class GradlePluginIT extends BaseTaskIT { @@ -49,7 +49,7 @@ public class GradlePluginIT extends BaseTaskIT { } @Test - public void testGradleVersionsCompatibility() { + public void gradleVersionsCompatibility() { String[] versions = {"8.5"}; @@ -67,11 +67,11 @@ public class GradlePluginIT extends BaseTaskIT { for(String version : failedVersions) { versionString.append(" ").append(version); } - assertTrue(versionString.toString(), failedVersions.isEmpty()); + assertTrue(failedVersions.isEmpty(), versionString.toString()); } @Test - public void testVersion() { + public void version() { assertEquals(7, getJavaMajorVersion("1.7.0_25-b15")); assertEquals(7, getJavaMajorVersion("1.7.2+123")); assertEquals(8, getJavaMajorVersion("1.8.145")); diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java index 5c1a5c9cd..83bd3200e 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginTest.java @@ -21,9 +21,9 @@ package org.apache.cayenne.tools; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java index 555543037..b6a6d54c2 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java @@ -20,9 +20,9 @@ package org.apache.cayenne.tools.model; import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java index 2badfb27f..c7afd04be 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/FilterContainerTest.java @@ -22,9 +22,9 @@ package org.apache.cayenne.tools.model; import groovy.lang.Closure; import org.apache.cayenne.dbsync.reverse.dbimport.Catalog; import org.apache.cayenne.dbsync.reverse.dbimport.Schema; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java index 6038c6bbc..a502996d7 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/IncludeTableTest.java @@ -24,9 +24,9 @@ import java.util.Collection; import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeColumn; import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeRelationship; import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java index ff094fc89..c63c4d981 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/PatternParamTest.java @@ -24,10 +24,10 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeProcedure; import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeTable; import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn; import org.apache.cayenne.dbsync.reverse.dbimport.IncludeProcedure; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.0 @@ -36,7 +36,7 @@ public class PatternParamTest { private PatternParam param; - @Before + @BeforeEach public void createNewPatternParam() { param = new PatternParam("test"); }
