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 c059345d019d25489306020bd981a1c9f5641e59 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 10:06:14 2026 -0400 JUnit 5 migration of "cayenne-cgen" module - Migrate all 13 test files from JUnit 4 to JUnit 5 (org.junit.jupiter) - Replace @Rule TemporaryFolder with @TempDir File - Replace @RunWith(Enclosed.class) with @Nested inner classes - Replace @Test(expected=...) with assertThrows - Replace Assume with Assumptions - Remove test prefix from test method names - Fix argument order for assertion messages (JUnit 4 vs 5 flip) - Remove junit-vintage-engine from pom.xml - Add cayenne-test-utilities test dependency (needed for ModuleProviderChecker) --- cayenne-cgen/pom.xml | 5 +- .../cayenne/gen/BaseTemplatesGenerationTest.java | 25 +++-- .../apache/cayenne/gen/CgenConfigurationTest.java | 75 ++++++------- .../apache/cayenne/gen/CgenModuleProviderTest.java | 4 +- .../cayenne/gen/ClassGenerationActionTest.java | 79 +++++++------- .../apache/cayenne/gen/ClassGenerationCase.java | 4 +- .../org/apache/cayenne/gen/DataMapUtilsTest.java | 16 +-- .../org/apache/cayenne/gen/EntityUtilsTest.java | 32 +++--- .../org/apache/cayenne/gen/ImportUtilsTest.java | 119 +++++++++------------ .../org/apache/cayenne/gen/PropertyUtilsTest.java | 14 +-- .../cayenne/gen/SingleClassGenerationTest.java | 14 +-- .../org/apache/cayenne/gen/StringUtilsTest.java | 34 +++--- .../cayenne/gen/SuperClassGenerationTest.java | 14 +-- .../apache/cayenne/gen/TemplateLocationTest.java | 36 ++++--- .../cayenne/gen/xml/CgenSaverDelegateTest.java | 14 +-- 15 files changed, 234 insertions(+), 251 deletions(-) diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml index 09eccef71..5d470d411 100644 --- a/cayenne-cgen/pom.xml +++ b/cayenne-cgen/pom.xml @@ -79,8 +79,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> + <groupId>org.apache.cayenne.build-tools</groupId> + <artifactId>cayenne-test-utilities</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/BaseTemplatesGenerationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/BaseTemplatesGenerationTest.java index cebbdd08f..fdf1b76d8 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/BaseTemplatesGenerationTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/BaseTemplatesGenerationTest.java @@ -29,10 +29,9 @@ import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.QueryDescriptor; import org.apache.cayenne.map.SQLTemplateDescriptor; import org.apache.cayenne.map.SelectQueryDescriptor; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.BufferedReader; import java.io.File; @@ -46,19 +45,19 @@ import java.sql.Types; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BaseTemplatesGenerationTest { - @Rule - public TemporaryFolder folder= new TemporaryFolder(); + @TempDir + public File folder; protected CgenConfiguration cgenConfiguration; protected ClassGenerationAction action; protected DataMap dataMap; protected ObjEntity objEntity; - @Before + @BeforeEach public void setUp() { cgenConfiguration = new CgenConfiguration(); action = new ClassGenerationAction(cgenConfiguration); @@ -68,7 +67,7 @@ public class BaseTemplatesGenerationTest { } @Test - public void testSelectQuery() throws Exception { + public void selectQuery() throws Exception { dataMap.setName("SelectQuery"); String param = "param"; @@ -97,7 +96,7 @@ public class BaseTemplatesGenerationTest { } @Test - public void testSQLTemplate() throws Exception { + public void sqlTemplate() throws Exception { dataMap.setName("SQLTemplate"); DbEntity dbEntity = new DbEntity(); @@ -119,7 +118,7 @@ public class BaseTemplatesGenerationTest { } @Test - public void testGenClass() throws Exception { + public void genClass() throws Exception { dataMap.setName("ObjEntity"); DbEntity dbEntity = new DbEntity(); @@ -144,7 +143,7 @@ public class BaseTemplatesGenerationTest { public void execute(Artifact artifact) throws Exception{ cgenConfiguration.addArtifact(artifact); - cgenConfiguration.setRootPath(folder.getRoot().toPath()); + cgenConfiguration.setRootPath(folder.toPath()); cgenConfiguration.updateOutputPath(Paths.get(".")); cgenConfiguration.loadEntity(objEntity); cgenConfiguration.setDataMap(dataMap); @@ -162,7 +161,7 @@ public class BaseTemplatesGenerationTest { String expected = readResource(fileName); StringBuilder generated = new StringBuilder(); - Files.readAllLines(new File(folder.getRoot() + "/test/" + fileName + ".java").toPath()) + Files.readAllLines(new File(folder + "/test/" + fileName + ".java").toPath()) .forEach(generated::append); assertEquals(expected, generated.toString()); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenConfigurationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenConfigurationTest.java index 319a74f4e..b306cb565 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenConfigurationTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenConfigurationTest.java @@ -20,34 +20,34 @@ package org.apache.cayenne.gen; import org.apache.cayenne.validation.ValidationException; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Locale; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -@RunWith(Enclosed.class) public class CgenConfigurationTest { - public static class CgenWindowsConfigurationTest { + @Nested + public class CgenWindowsConfigurationTest { CgenConfiguration configuration; - @Before + @BeforeEach public void setUp() { configuration = new CgenConfiguration(); } - @Before + @BeforeEach public void checkPlatform() { - Assume.assumeTrue(System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")); + Assumptions.assumeTrue(System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")); } @Test @@ -110,14 +110,13 @@ public class CgenConfigurationTest { assertEquals(relPath, configuration.buildOutputPath()); } - @Test(expected = ValidationException.class) + @Test public void emptyRootNotEmptyRelPath() { - configuration.setRootPath(Paths.get("")); Path relPath = Paths.get("E:\\"); - configuration.updateOutputPath(relPath); - - assertEquals(Paths.get("E:\\"), configuration.getRawOutputPath()); - assertEquals(relPath, configuration.buildOutputPath()); + assertThrows(ValidationException.class, () -> { + configuration.setRootPath(Paths.get("")); + configuration.updateOutputPath(relPath); + }); } @Test @@ -131,9 +130,9 @@ public class CgenConfigurationTest { assertEquals(Paths.get("E:\\"), configuration.buildOutputPath()); } - @Test(expected = InvalidPathException.class) + @Test public void invalidRootPath() { - configuration.setRootPath(Paths.get("invalidRoot:\\test")); + assertThrows(InvalidPathException.class, () -> configuration.setRootPath(Paths.get("invalidRoot:\\test"))); } @Test @@ -144,18 +143,19 @@ public class CgenConfigurationTest { } } - public static class CgenUnixConfigurationTest { + @Nested + public class CgenUnixConfigurationTest { CgenConfiguration configuration; - @Before + @BeforeEach public void setUp() { configuration = new CgenConfiguration(); } - @Before + @BeforeEach public void checkPlatform() { - Assume.assumeFalse(System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")); + Assumptions.assumeFalse(System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")); } @Test @@ -199,14 +199,13 @@ public class CgenConfigurationTest { assertEquals(Paths.get("/test1/test2/test3/test1/test2/test3"), configuration.buildOutputPath()); } - @Test(expected = ValidationException.class) + @Test public void emptyRootNotEmptyRelPath() { - configuration.setRootPath(Paths.get("")); Path relPath = Paths.get("/"); - configuration.updateOutputPath(relPath); - - assertEquals(Paths.get("/"), configuration.getRawOutputPath()); - assertEquals(relPath, configuration.buildOutputPath()); + assertThrows(ValidationException.class, () -> { + configuration.setRootPath(Paths.get("")); + configuration.updateOutputPath(relPath); + }); } @Test @@ -218,16 +217,20 @@ public class CgenConfigurationTest { assertEquals(Paths.get("/"), configuration.buildOutputPath()); } - @Test(expected = ValidationException.class) + @Test public void invalidRootPath() { - configuration.setRootPath(Paths.get("invalidRoot:/test")); - configuration.updateOutputPath(Paths.get("/test1/test2/test3")); + assertThrows(ValidationException.class, () -> { + configuration.setRootPath(Paths.get("invalidRoot:/test")); + configuration.updateOutputPath(Paths.get("/test1/test2/test3")); + }); } - @Test(expected = ValidationException.class) + @Test public void concatInvalidRootPathAndRelPath() { - configuration.setRootPath(Paths.get("invalidRoot:/test")); - configuration.updateOutputPath(Paths.get("test1/test2/test3")); + assertThrows(ValidationException.class, () -> { + configuration.setRootPath(Paths.get("invalidRoot:/test")); + configuration.updateOutputPath(Paths.get("test1/test2/test3")); + }); } @Test @@ -238,4 +241,4 @@ public class CgenConfigurationTest { } } -} \ No newline at end of file +} diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java index 62a3b7339..27d415412 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/CgenModuleProviderTest.java @@ -21,14 +21,14 @@ package org.apache.cayenne.gen; import org.apache.cayenne.tools.CayenneToolsModuleProvider; import org.apache.cayenne.unit.util.ModuleProviderChecker; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 4.2 */ public class CgenModuleProviderTest { @Test - public void testProviderPresent() { + public void providerPresent() { ModuleProviderChecker.testProviderPresent(CgenToolsModuleProvider.class, CayenneToolsModuleProvider.class); } } diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java index 5da3055ca..d1d613f52 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java @@ -32,27 +32,26 @@ import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; import org.apache.cayenne.map.QueryDescriptor; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class ClassGenerationActionTest extends CgenCase { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); + @TempDir + public File tempFolder; protected ClassGenerationAction action; protected Collection<StringWriter> writers; protected CgenConfiguration cgenConfiguration; - @Before + @BeforeEach public void setUp() throws Exception { writers = new ArrayList<>(3); cgenConfiguration = new CgenConfiguration(); @@ -60,14 +59,14 @@ public class ClassGenerationActionTest extends CgenCase { .createAction(cgenConfiguration), writers); } - @After + @AfterEach public void tearDown() throws Exception { action = null; writers = null; } @Test - public void testExecuteArtifactPairsImports() throws Exception { + public void executeArtifactPairsImports() throws Exception { ObjEntity testEntity1 = new ObjEntity("TE1"); testEntity1.setClassName("org.example.TestClass1"); @@ -80,16 +79,16 @@ public class ClassGenerationActionTest extends CgenCase { assertEquals(2, generated.size()); String superclass = generated.get(0); - assertTrue(superclass, superclass.contains("package org.example.auto;")); - assertTrue(superclass, superclass.contains("import org.apache.cayenne.PersistentObject;")); + assertTrue(superclass.contains("package org.example.auto;"), superclass); + assertTrue(superclass.contains("import org.apache.cayenne.PersistentObject;"), superclass); String subclass = generated.get(1); - assertTrue(subclass, subclass.contains("package org.example;")); - assertTrue(subclass, subclass.contains("import org.example.auto._TestClass1;")); + assertTrue(subclass.contains("package org.example;"), subclass); + assertTrue(subclass.contains("import org.example.auto._TestClass1;"), subclass); } @Test - public void testExecuteArtifactPairsMapRelationships() throws Exception { + public void executeArtifactPairsMapRelationships() throws Exception { ObjEntity testEntity1 = new ObjEntity("TE1"); testEntity1.setClassName("org.example.TestClass1"); @@ -121,11 +120,11 @@ public class ClassGenerationActionTest extends CgenCase { assertEquals(2, generated.size()); String superclass = generated.get(0); - assertTrue(superclass, superclass.contains("import java.util.Map;")); + assertTrue(superclass.contains("import java.util.Map;"), superclass); } @Test - public void testExecuteArtifactPairsAttribute() throws Exception { + public void executeArtifactPairsAttribute() throws Exception { ObjEntity testEntity1 = new ObjEntity("TE1"); testEntity1.setClassName("org.example.TestClass1"); @@ -148,22 +147,22 @@ public class ClassGenerationActionTest extends CgenCase { assertEquals(2, generated.size()); String superclass = generated.get(0); - assertTrue(superclass, superclass.contains("public void setID(int ID)")); - assertTrue(superclass, superclass.contains("this.ID = ID;")); + assertTrue(superclass.contains("public void setID(int ID)"), superclass); + assertTrue(superclass.contains("this.ID = ID;"), superclass); - assertTrue(superclass, superclass.contains("public int getID()")); - assertTrue(superclass, superclass.contains("return this.ID;")); + assertTrue(superclass.contains("public int getID()"), superclass); + assertTrue(superclass.contains("return this.ID;"), superclass); - assertTrue(superclass, superclass.contains("public void setName(char name)")); - assertTrue(superclass, superclass.contains("this.name = name;")); + assertTrue(superclass.contains("public void setName(char name)"), superclass); + assertTrue(superclass.contains("this.name = name;"), superclass); - assertTrue(superclass, superclass.contains("public char getName()")); - assertTrue(superclass, superclass.contains("return this.name;")); + assertTrue(superclass.contains("public char getName()"), superclass); + assertTrue(superclass.contains("return this.name;"), superclass); } @Test - public void testExecuteDataMapQueryNames() throws Exception { + public void executeDataMapQueryNames() throws Exception { runDataMapTest(); } @@ -182,7 +181,7 @@ public class ClassGenerationActionTest extends CgenCase { } @Test - public void testCallbackMethodGeneration() throws Exception { + public void callbackMethodGeneration() throws Exception { assertCallbacks(); } @@ -202,15 +201,15 @@ public class ClassGenerationActionTest extends CgenCase { String superclass = generated.get(0); - assertTrue(superclass, superclass.contains("public abstract class _TestClass1")); + assertTrue(superclass.contains("public abstract class _TestClass1"), superclass); for (int j = 0; j < i; j++) { - assertTrue(superclass, superclass.contains("protected abstract void cb" + j + "();")); + assertTrue(superclass.contains("protected abstract void cb" + j + "();"), superclass); } String subclass = generated.get(1); for (int j = 0; j < i; j++) { - assertTrue(subclass, subclass.contains("protected void cb" + j + "() {")); + assertTrue(subclass.contains("protected void cb" + j + "() {"), subclass); } } @@ -226,7 +225,7 @@ public class ClassGenerationActionTest extends CgenCase { } @Test - public void testIsOld() { + public void isOld() { File file = mock(File.class); when(file.lastModified()).thenReturn(1000L); @@ -238,7 +237,7 @@ public class ClassGenerationActionTest extends CgenCase { } @Test - public void testFileNeedUpdate() { + public void fileNeedUpdate() { File file = mock(File.class); when(file.lastModified()).thenReturn(1000L); @@ -264,11 +263,11 @@ public class ClassGenerationActionTest extends CgenCase { } @Test - public void testFileForSuperclass() throws Exception { + public void fileForSuperclass() throws Exception { TemplateType templateType = TemplateType.DATAMAP_SUPERCLASS; - cgenConfiguration.setRootPath(tempFolder.getRoot().toPath()); + cgenConfiguration.setRootPath(tempFolder.toPath()); cgenConfiguration.updateOutputPath(Paths.get(".")); action = new ClassGenerationAction(cgenConfiguration); ObjEntity testEntity1 = new ObjEntity("TEST"); @@ -276,7 +275,7 @@ public class ClassGenerationActionTest extends CgenCase { action.context.put(Artifact.SUPER_PACKAGE_KEY, ""); action.context.put(Artifact.SUPER_CLASS_KEY, "TestClass1"); - File outFile = new File(tempFolder.getRoot() + "/TestClass1.java"); + File outFile = new File(tempFolder + "/TestClass1.java"); assertFalse(outFile.exists()); action.openWriter(templateType); @@ -286,11 +285,11 @@ public class ClassGenerationActionTest extends CgenCase { } @Test - public void testFileForClass() throws Exception { + public void fileForClass() throws Exception { TemplateType templateType = TemplateType.DATAMAP_SINGLE_CLASS; - cgenConfiguration.setRootPath(tempFolder.getRoot().toPath()); + cgenConfiguration.setRootPath(tempFolder.toPath()); cgenConfiguration.updateOutputPath(Paths.get(".")); action = new ClassGenerationAction(cgenConfiguration); ObjEntity testEntity1 = new ObjEntity("TEST"); @@ -298,7 +297,7 @@ public class ClassGenerationActionTest extends CgenCase { action.context.put(Artifact.SUB_PACKAGE_KEY, ""); action.context.put(Artifact.SUB_CLASS_KEY, "TestClass1"); - File outFile = new File(tempFolder.getRoot() + "/TestClass1.java"); + File outFile = new File(tempFolder + "/TestClass1.java"); assertFalse(outFile.exists()); action.openWriter(templateType); @@ -312,4 +311,4 @@ public class ClassGenerationActionTest extends CgenCase { cgenConfiguration.setOverwrite(true); assertNull(action.openWriter(templateType)); } -} \ No newline at end of file +} diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationCase.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationCase.java index cb8c717d4..b2b72fa9b 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationCase.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationCase.java @@ -28,7 +28,7 @@ import org.apache.cayenne.di.spi.DefaultScope; import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public class ClassGenerationCase { @@ -41,7 +41,7 @@ public class ClassGenerationCase { injector = DIBootstrap.createInjector(new CgenCaseModule(testScope), new CgenModule()); } - @Before + @BeforeEach public void setUp() throws Exception { Properties props = new Properties(); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/DataMapUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/DataMapUtilsTest.java index 10d86b6a6..4f3479df2 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/DataMapUtilsTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/DataMapUtilsTest.java @@ -31,31 +31,31 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.SelectQueryDescriptor; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DataMapUtilsTest { protected DataMapUtils dataMapUtils = null; protected ObjEntity objEntity = null; - @Before + @BeforeEach public void setUp() { dataMapUtils = new DataMapUtils(); objEntity = new ObjEntity(); } - @After + @AfterEach public void tearDown() { dataMapUtils = null; objEntity = null; } @Test - public void testGetParameterNamesWithFilledQueriesMap() { + public void getParameterNamesWithFilledQueriesMap() { String param = "param"; String qualifierString = "name = $" + param; @@ -81,7 +81,7 @@ public class DataMapUtilsTest { } @Test - public void testGetParameterNamesWithEmptyQueriesMap() { + public void getParameterNamesWithEmptyQueriesMap() { DbEntity dbEntity = new DbEntity("test"); ObjAttribute attribute = new ObjAttribute("name"); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/EntityUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/EntityUtilsTest.java index 748b23723..ad2ed7f27 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/EntityUtilsTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/EntityUtilsTest.java @@ -25,30 +25,30 @@ import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; import java.util.Set; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class EntityUtilsTest { - + protected EntityUtils entityUtils = null; protected DataMap dataMap = null; protected ObjEntity objEntity = null; - - @Before + + @BeforeEach public void setUp() throws Exception { dataMap = new DataMap(); objEntity = new ObjEntity(); } - - @After + + @AfterEach public void tearDown() throws Exception { dataMap = null; objEntity = null; @@ -56,8 +56,8 @@ public class EntityUtilsTest { } @Test - public void testAllCallbackNamesUnique() throws Exception { - + public void allCallbackNamesUnique() throws Exception { + CallbackDescriptor[] callbacks = objEntity.getCallbackMap().getCallbacks(); for (int i = 0; i < callbacks.length; i++) { callbacks[i].addCallbackMethod("callback1"); @@ -65,7 +65,7 @@ public class EntityUtilsTest { callbacks[i].addCallbackMethod("callback3"); } entityUtils = new EntityUtils(dataMap, objEntity, "TestBaseClass", "TestSuperClass", "TestSubClass"); - + boolean hasNoDuplicates = true; Set<String> callbackNames = new LinkedHashSet<String>(); for (String cbName : entityUtils.getCallbackNames()) { @@ -73,12 +73,12 @@ public class EntityUtilsTest { hasNoDuplicates = false; } } - - assertTrue("Contains duplicate callback names.", hasNoDuplicates); + + assertTrue(hasNoDuplicates, "Contains duplicate callback names."); } @Test - public void testDeclaresDbAttribute() throws Exception { + public void declaresDbAttribute() throws Exception { DbEntity dbEntity = new DbEntity("test"); DbAttribute exists = new DbAttribute("testKey"); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java index e2cfc857d..b16fb7584 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java @@ -19,79 +19,71 @@ package org.apache.cayenne.gen; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -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; public class ImportUtilsTest { protected ImportUtils importUtils = null; - @Before + @BeforeEach public void setUp() throws Exception { importUtils = new ImportUtils(); } - @After + @AfterEach public void tearDown() throws Exception { importUtils = null; } @Test - public void testSetPackageGeneratesPackageStatement() throws Exception { + public void setPackageGeneratesPackageStatement() throws Exception { final String packageName = "org.myPackage"; final String expectedPackageStatement = "package " + packageName + ";"; importUtils.setPackage(packageName); String generatedStatements = importUtils.generate(); - assertTrue("<" - + generatedStatements - + "> does not start with <" - + expectedPackageStatement - + ">", generatedStatements.startsWith(expectedPackageStatement)); - assertEquals("package statement appears multiple times.", generatedStatements - .lastIndexOf(expectedPackageStatement), generatedStatements - .lastIndexOf(expectedPackageStatement)); + assertTrue(generatedStatements.startsWith(expectedPackageStatement), + "<" + generatedStatements + "> does not start with <" + expectedPackageStatement + ">"); + assertEquals(generatedStatements.lastIndexOf(expectedPackageStatement), + generatedStatements.lastIndexOf(expectedPackageStatement), + "package statement appears multiple times."); } @Test - public void testAddTypeGeneratesImportStatement() throws Exception { + public void addTypeGeneratesImportStatement() throws Exception { final String type = "org.myPackage.myType"; final String expectedImportStatement = "import " + type + ";"; importUtils.addType(type); String generatedStatements = importUtils.generate(); - assertFalse("<" - + generatedStatements - + "> does not contain <" - + expectedImportStatement - + ">", !generatedStatements.contains(expectedImportStatement)); - assertEquals("import statement appears multiple times.", generatedStatements - .lastIndexOf(expectedImportStatement), generatedStatements - .lastIndexOf(expectedImportStatement)); + assertFalse(!generatedStatements.contains(expectedImportStatement), + "<" + generatedStatements + "> does not contain <" + expectedImportStatement + ">"); + assertEquals(generatedStatements.lastIndexOf(expectedImportStatement), + generatedStatements.lastIndexOf(expectedImportStatement), + "import statement appears multiple times."); } @Test - public void testAddReservedTypeGeneratesNoImportStatement() throws Exception { + public void addReservedTypeGeneratesNoImportStatement() throws Exception { final String type = "org.myPackage.myType"; importUtils.addReservedType(type); String generatedStatements = importUtils.generate(); - assertEquals( - "<" + generatedStatements + "> contains <" + type + ">", - -1, - generatedStatements.indexOf(type)); + assertEquals(-1, generatedStatements.indexOf(type), + "<" + generatedStatements + "> contains <" + type + ">"); } @Test - public void testAddTypeAfterReservedTypeGeneratesNoImportStatement() throws Exception { + public void addTypeAfterReservedTypeGeneratesNoImportStatement() throws Exception { final String baseType = "myType"; final String reservedType = "org.myPackage." + baseType; final String nonReservedType = "org.myPackage2." + baseType; @@ -100,18 +92,14 @@ public class ImportUtilsTest { importUtils.addType(nonReservedType); String generatedStatements = importUtils.generate(); - assertEquals( - "<" + generatedStatements + "> contains <" + reservedType + ">", - -1, - generatedStatements.indexOf(reservedType)); - assertEquals( - "<" + generatedStatements + "> contains <" + nonReservedType + ">", - -1, - generatedStatements.indexOf(nonReservedType)); + assertEquals(-1, generatedStatements.indexOf(reservedType), + "<" + generatedStatements + "> contains <" + reservedType + ">"); + assertEquals(-1, generatedStatements.indexOf(nonReservedType), + "<" + generatedStatements + "> contains <" + nonReservedType + ">"); } @Test - public void testAddTypeAfterPackageReservedTypeGeneratesNoImportStatement() + public void addTypeAfterPackageReservedTypeGeneratesNoImportStatement() throws Exception { final String baseType = "myType"; final String packageType = "org.myPackage"; @@ -124,18 +112,14 @@ public class ImportUtilsTest { String generatedStatements = importUtils.generate(); - assertEquals( - "<" + generatedStatements + "> contains <" + reservedType + ">", - -1, - generatedStatements.indexOf(reservedType)); - assertEquals( - "<" + generatedStatements + "> contains <" + nonReservedType + ">", - -1, - generatedStatements.indexOf(nonReservedType)); + assertEquals(-1, generatedStatements.indexOf(reservedType), + "<" + generatedStatements + "> contains <" + reservedType + ">"); + assertEquals(-1, generatedStatements.indexOf(nonReservedType), + "<" + generatedStatements + "> contains <" + nonReservedType + ">"); } @Test - public void testAddTypeAfterTypeGeneratesNoImportStatement() throws Exception { + public void addTypeAfterTypeGeneratesNoImportStatement() throws Exception { final String baseType = "myType"; final String firstType = "org.myPackage." + baseType; final String secondType = "org.myPackage2." + baseType; @@ -147,23 +131,18 @@ public class ImportUtilsTest { String generatedStatements = importUtils.generate(); - assertFalse("<" - + generatedStatements - + "> does not contain <" - + expectedImportStatement - + ">", !generatedStatements.contains(expectedImportStatement)); - assertEquals("import statement appears multiple times.", generatedStatements - .lastIndexOf(expectedImportStatement), generatedStatements - .lastIndexOf(expectedImportStatement)); + assertFalse(!generatedStatements.contains(expectedImportStatement), + "<" + generatedStatements + "> does not contain <" + expectedImportStatement + ">"); + assertEquals(generatedStatements.lastIndexOf(expectedImportStatement), + generatedStatements.lastIndexOf(expectedImportStatement), + "import statement appears multiple times."); - assertEquals( - "<" + generatedStatements + "> contains <" + secondType + ">", - -1, - generatedStatements.indexOf(secondType)); + assertEquals(-1, generatedStatements.indexOf(secondType), + "<" + generatedStatements + "> contains <" + secondType + ">"); } @Test - public void testAddSimilarTypeTwiceBeforeFormatJavaTypeGeneratesCorrectFQNs() + public void addSimilarTypeTwiceBeforeFormatJavaTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String firstType = "org.myPackage." + baseType; @@ -177,7 +156,7 @@ public class ImportUtilsTest { } @Test - public void testAddTypeBeforeFormatJavaTypeGeneratesCorrectFQNs() throws Exception { + public void addTypeBeforeFormatJavaTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String fullyQualifiedType = "org.myPackage." + baseType; @@ -187,7 +166,7 @@ public class ImportUtilsTest { } @Test - public void testAddReservedTypeBeforeFormatJavaTypeGeneratesCorrectFQNs() + public void addReservedTypeBeforeFormatJavaTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String fullyQualifiedType = "org.myPackage." + baseType; @@ -198,7 +177,7 @@ public class ImportUtilsTest { } @Test - public void testFormatJavaTypeWithPrimitives() throws Exception { + public void formatJavaTypeWithPrimitives() throws Exception { assertEquals("int", importUtils.formatJavaType("int", true)); assertEquals("Integer", importUtils.formatJavaType("int", false)); @@ -214,7 +193,7 @@ public class ImportUtilsTest { } @Test - public void testFormatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() throws Exception { + public void formatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String fullyQualifiedType = "org.myPackage." + baseType; @@ -222,7 +201,7 @@ public class ImportUtilsTest { } @Test - public void testPackageFormatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() + public void packageFormatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String packageType = "org.myPackage"; @@ -234,14 +213,14 @@ public class ImportUtilsTest { } @Test - public void testFormatJavaType() { + public void formatJavaType() { assertEquals("x.X", importUtils.formatJavaType("x.X")); assertEquals("X", importUtils.formatJavaType("java.lang.X")); assertEquals("java.lang.x.X", importUtils.formatJavaType("java.lang.x.X")); } @Test - public void testJavaLangTypeFormatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() + public void javaLangTypeFormatJavaTypeWithoutAddTypeGeneratesCorrectFQNs() throws Exception { final String baseType = "myType"; final String packageType = "java.lang"; diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java index cc9f38063..269d6f0fd 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java @@ -40,15 +40,15 @@ import org.apache.cayenne.map.EmbeddedAttribute; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -62,7 +62,7 @@ public class PropertyUtilsTest { ImportUtils importUtils; Logger logger = LoggerFactory.getLogger(PropertyUtilsTest.class); - @Before + @BeforeEach public void setup() { importUtils = new ImportUtils(); @@ -76,7 +76,7 @@ public class PropertyUtilsTest { } @Test - public void testImportAttribute() throws Exception { + public void importAttribute() throws Exception { ObjAttribute attribute = new ObjAttribute(); attribute.setName("test"); attribute.setType(java.util.Date.class.getName()); @@ -93,7 +93,7 @@ public class PropertyUtilsTest { } @Test - public void testImportRelationship() { + public void importRelationship() { String typeName = "org.example.model.TargetEntity"; ObjEntity entity = mock(ObjEntity.class); when(entity.getClassName()).thenReturn(typeName); @@ -366,4 +366,4 @@ public class PropertyUtilsTest { definition); } -} \ No newline at end of file +} diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java index 2fe7a2b13..15e121b03 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SingleClassGenerationTest.java @@ -23,19 +23,19 @@ import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; import org.apache.velocity.VelocityContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SingleClassGenerationTest extends ClassGenerationCase { Logger logger = LoggerFactory.getLogger(SingleClassGenerationTest.class); @Test - public void testNotContainsPropertyImport() throws Exception { + public void notContainsPropertyImport() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); VelocityContext context = new VelocityContext(); @@ -53,7 +53,7 @@ public class SingleClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImportForAttributes() throws Exception { + public void containsPropertyImportForAttributes() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjAttribute attr = new ObjAttribute("attr"); attr.setType("java.lang.Integer"); @@ -74,7 +74,7 @@ public class SingleClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImportForRelationships() throws Exception { + public void containsPropertyImportForRelationships() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjRelationship rel = new ObjRelationship("rel"); objEntity.addRelationship(rel); @@ -94,7 +94,7 @@ public class SingleClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImport() throws Exception { + public void containsPropertyImport() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjAttribute attr = new ObjAttribute("attr"); attr.setType("java.lang.Integer"); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/StringUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/StringUtilsTest.java index 5b53e8e15..6af78a4dc 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/StringUtilsTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/StringUtilsTest.java @@ -19,28 +19,28 @@ package org.apache.cayenne.gen; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class StringUtilsTest { protected StringUtils stringUtils; - @Before + @BeforeEach public void setUp() throws Exception { stringUtils = new StringUtils(); } - @After + @AfterEach public void tearDown() throws Exception { stringUtils = null; } @Test - public void testPluralize() throws Exception { + public void pluralize() throws Exception { assertEquals("Words", stringUtils.pluralize("Word")); assertEquals("Statuses", stringUtils.pluralize("Status")); assertEquals("Indexes", stringUtils.pluralize("Index")); @@ -51,55 +51,55 @@ public class StringUtilsTest { @Test - public void testCapitalizedAsConstant1() throws Exception { + public void capitalizedAsConstant1() throws Exception { String expected = "LAST_NAME"; assertEquals(expected, stringUtils.capitalizedAsConstant("LastName")); } @Test - public void testCapitalizedAsConstant2() throws Exception { + public void capitalizedAsConstant2() throws Exception { String expected = "A_CLASS"; assertEquals(expected, stringUtils.capitalizedAsConstant("aClass")); } @Test - public void testCapitalizedAsConstant3() throws Exception { + public void capitalizedAsConstant3() throws Exception { String expected = "VAR_A"; assertEquals(expected, stringUtils.capitalizedAsConstant("varA")); } @Test - public void testCapitalizedAsConstant4() throws Exception { + public void capitalizedAsConstant4() throws Exception { String expected = "LAST_NAME"; assertEquals(expected, stringUtils.capitalizedAsConstant("LAST_NAME")); } @Test - public void testCapitalizedAsConstant5() throws Exception { + public void capitalizedAsConstant5() throws Exception { String expected = "ABC_A"; assertEquals(expected, stringUtils.capitalizedAsConstant("abc_A")); } @Test - public void testCapitalizedAsConstant6() throws Exception { + public void capitalizedAsConstant6() throws Exception { String expected = "A123"; assertEquals(expected, stringUtils.capitalizedAsConstant("a123")); } @Test - public void testCapitalizedAsConstant7() throws Exception { + public void capitalizedAsConstant7() throws Exception { String expected = "AB_CDEF"; assertEquals(expected, stringUtils.capitalizedAsConstant("abCDEF")); } @Test - public void testCapitalizedAsConstant8() throws Exception { + public void capitalizedAsConstant8() throws Exception { String expected = "AB_CE"; assertEquals(expected, stringUtils.capitalizedAsConstant("abCe")); } @Test - public void testStripGeneric() throws Exception { + public void stripGeneric() throws Exception { assertEquals("List", stringUtils.stripGeneric("List")); assertEquals("List", stringUtils.stripGeneric("List<Integer>")); assertEquals("List", stringUtils.stripGeneric("List<List<Map<Integer,List<String>>>>")); @@ -111,7 +111,7 @@ public class StringUtilsTest { * Test pattern expansion. */ @Test - public void testReplaceWildcardInStringWithString() throws Exception { + public void replaceWildcardInStringWithString() throws Exception { assertEquals(null, stringUtils.replaceWildcardInStringWithString("*", null, "Entity")); assertEquals("*.java", stringUtils.replaceWildcardInStringWithString(null, "*.java", "Entity")); assertEquals("Entity.java", stringUtils.replaceWildcardInStringWithString("*", "*.java", "Entity")); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java index 94999da92..77d06f47f 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/SuperClassGenerationTest.java @@ -26,19 +26,19 @@ import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; import org.apache.velocity.VelocityContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SuperClassGenerationTest extends ClassGenerationCase { Logger logger = LoggerFactory.getLogger(SuperClassGenerationTest.class); @Test - public void testNotContainsPropertyImport() throws Exception { + public void notContainsPropertyImport() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); VelocityContext context = new VelocityContext(); @@ -56,7 +56,7 @@ public class SuperClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImportForAttributes() throws Exception { + public void containsPropertyImportForAttributes() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjAttribute attr = new ObjAttribute("attr"); attr.setType("int"); @@ -77,7 +77,7 @@ public class SuperClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImportForRelationships() throws Exception { + public void containsPropertyImportForRelationships() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjRelationship rel = new ObjRelationship("rel"); objEntity.addRelationship(rel); @@ -97,7 +97,7 @@ public class SuperClassGenerationTest extends ClassGenerationCase { } @Test - public void testContainsPropertyImport() throws Exception { + public void containsPropertyImport() throws Exception { ObjEntity objEntity = new ObjEntity("TEST1"); ObjAttribute attr = new ObjAttribute("attr"); diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/TemplateLocationTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/TemplateLocationTest.java index 1acca841a..9e69db5c5 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/TemplateLocationTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/TemplateLocationTest.java @@ -19,25 +19,25 @@ package org.apache.cayenne.gen; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import java.io.File; import java.nio.file.Paths; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TemplateLocationTest { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); + @TempDir + public File tempFolder; private CgenConfiguration cgenConfiguration; private ClassGenerationAction action; private TemplateType templateType; - @Before + @BeforeEach public void setUp() { cgenConfiguration = new CgenConfiguration(); action = new ClassGenerationAction(cgenConfiguration); @@ -46,25 +46,27 @@ public class TemplateLocationTest { @Test public void upperLevel() throws Exception { - cgenConfiguration.setRootPath(tempFolder.newFolder().toPath()); - tempFolder.newFile("testTemplate.vm"); - cgenConfiguration.setTemplate(new CgenTemplate("../testTemplate.vm",false,TemplateType.ENTITY_SUBCLASS)); + File subFolder = new File(tempFolder, "sub"); + subFolder.mkdir(); + cgenConfiguration.setRootPath(subFolder.toPath()); + new File(tempFolder, "testTemplate.vm").createNewFile(); + cgenConfiguration.setTemplate(new CgenTemplate("../testTemplate.vm", false, TemplateType.ENTITY_SUBCLASS)); assertNotNull(action.getTemplate(templateType)); } @Test public void sameLevel() throws Exception { - cgenConfiguration.setRootPath(tempFolder.getRoot().toPath()); - tempFolder.newFile("testTemplate2.vm"); - cgenConfiguration.setTemplate(new CgenTemplate("testTemplate2.vm",false,TemplateType.ENTITY_SUBCLASS)); + cgenConfiguration.setRootPath(tempFolder.toPath()); + new File(tempFolder, "testTemplate2.vm").createNewFile(); + cgenConfiguration.setTemplate(new CgenTemplate("testTemplate2.vm", false, TemplateType.ENTITY_SUBCLASS)); assertNotNull(action.getTemplate(templateType)); } @Test public void aboveLevel() throws Exception { - cgenConfiguration.setRootPath(Paths.get(tempFolder.getRoot().getParent())); - tempFolder.newFile("testTemplate3.vm"); - cgenConfiguration.setTemplate(new CgenTemplate(tempFolder.getRoot() + "/testTemplate3.vm",false,TemplateType.ENTITY_SUBCLASS)); + cgenConfiguration.setRootPath(Paths.get(tempFolder.getParent())); + new File(tempFolder, "testTemplate3.vm").createNewFile(); + cgenConfiguration.setTemplate(new CgenTemplate(tempFolder + "/testTemplate3.vm", false, TemplateType.ENTITY_SUBCLASS)); assertNotNull(action.getTemplate(templateType)); } } diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java index 628ae8180..90c49496b 100644 --- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java +++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java @@ -23,9 +23,9 @@ import java.net.URL; import java.nio.file.Paths; import org.apache.cayenne.gen.CgenConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @since 4.2 @@ -33,7 +33,7 @@ import static org.junit.Assert.*; public class CgenSaverDelegateTest { @Test - public void testExistingRootOverride() throws Exception { + public void existingRootOverride() throws Exception { CgenConfiguration config = new CgenConfiguration(); config.setRootPath(Paths.get("/tmp/src/main/java").toAbsolutePath()); @@ -46,7 +46,7 @@ public class CgenSaverDelegateTest { } @Test - public void testExistingRootAndRelPath() throws Exception { + public void existingRootAndRelPath() throws Exception { CgenConfiguration config = new CgenConfiguration(); config.setRootPath(Paths.get("/tmp/src/main/java").toAbsolutePath()); @@ -61,7 +61,7 @@ public class CgenSaverDelegateTest { } @Test - public void testEmptyRootInMavenTree() throws Exception { + public void emptyRootInMavenTree() throws Exception { CgenConfiguration config = new CgenConfiguration(); URL baseURL = Paths.get("/tmp/src/main/resources").toUri().toURL(); @@ -73,7 +73,7 @@ public class CgenSaverDelegateTest { } @Test - public void testEmptyRoot() throws Exception { + public void emptyRoot() throws Exception { CgenConfiguration config = new CgenConfiguration(); URL baseURL = Paths.get("/tmp/somefolder").toUri().toURL(); @@ -83,4 +83,4 @@ public class CgenSaverDelegateTest { assertEquals(Paths.get("/tmp/somefolder").toAbsolutePath(), config.getRootPath()); assertEquals(Paths.get(""), config.getRawOutputPath()); } -} \ No newline at end of file +}
