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 22be1b1756f80875fe718b4399010c274faa95f6 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 09:23:18 2026 -0400 JUnit 5 converstion of "cayenne-project" --- cayenne-project/pom.xml | 7 +---- .../project/DataChannelProjectLoaderTest.java | 6 ++-- .../project/DataChannelProjectSaverTest.java | 8 +++--- .../cayenne/project/FileProjectSaverTest.java | 14 +++++----- .../cayenne/project/ProjectModuleProviderTest.java | 4 +-- .../org/apache/cayenne/project/ProjectTest.java | 10 +++---- .../apache/cayenne/project/unit/Project2Case.java | 5 +--- .../project/upgrade/DefaultUpgradeServiceTest.java | 10 +++---- .../upgrade/handlers/BaseUpgradeHandlerTest.java | 12 ++------ .../upgrade/handlers/UpgradeHandler_V10Test.java | 13 ++++----- .../upgrade/handlers/UpgradeHandler_V11Test.java | 21 ++++++-------- .../upgrade/handlers/UpgradeHandler_V12Test.java | 32 ++++++++++------------ .../upgrade/handlers/UpgradeHandler_V7Test.java | 13 ++++----- .../upgrade/handlers/UpgradeHandler_V8Test.java | 13 ++++----- .../upgrade/handlers/UpgradeHandler_V9Test.java | 13 ++++----- 15 files changed, 73 insertions(+), 108 deletions(-) diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml index ac1b34477..4a52f38df 100644 --- a/cayenne-project/pom.xml +++ b/cayenne-project/pom.xml @@ -53,12 +53,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</groupId> <artifactId>cayenne</artifactId> <version>${project.version}</version> diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectLoaderTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectLoaderTest.java index 06a1f206f..8f48488ca 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectLoaderTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectLoaderTest.java @@ -39,17 +39,17 @@ import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory; import org.apache.cayenne.di.spi.DefaultClassLoaderManager; import org.apache.cayenne.resource.Resource; import org.apache.cayenne.resource.URLResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.XMLReader; import java.net.URL; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DataChannelProjectLoaderTest { @Test - public void testLoad() { + public void load() { DataChannelProjectLoader loader = new DataChannelProjectLoader(); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectSaverTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectSaverTest.java index 7446f608d..500230559 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectSaverTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/DataChannelProjectSaverTest.java @@ -41,7 +41,7 @@ import org.apache.cayenne.project.extension.ProjectExtension; import org.apache.cayenne.project.unit.Project2Case; import org.apache.cayenne.resource.Resource; import org.apache.cayenne.resource.URLResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.XMLReader; import java.io.File; @@ -49,12 +49,12 @@ import java.io.PrintWriter; import java.net.URL; import java.util.Collections; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DataChannelProjectSaverTest extends Project2Case { @Test - public void testSaveAs() throws Exception { + public void saveAs() throws Exception { FileProjectSaver saver = new FileProjectSaver(Collections.<ProjectExtension>emptyList()); @@ -100,7 +100,7 @@ public class DataChannelProjectSaverTest extends Project2Case { } @Test - public void testSaveAs_RecoverFromSaveError() throws Exception { + public void saveAs_RecoverFromSaveError() throws Exception { FileProjectSaver saver = new FileProjectSaver(Collections.<ProjectExtension>emptyList()) { diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java index 61ccd336a..3145a1dfd 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/FileProjectSaverTest.java @@ -30,8 +30,8 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.project.extension.ProjectExtension; import org.apache.cayenne.project.unit.Project2Case; import org.apache.cayenne.resource.URLResource; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -43,14 +43,14 @@ import java.net.URL; import java.util.Arrays; import java.util.Collections; -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 FileProjectSaverTest extends Project2Case { private FileProjectSaver saver; - @Before + @BeforeEach public void setUp() throws Exception { Module testModule = binder -> binder .bind(ConfigurationNameMapper.class) @@ -62,7 +62,7 @@ public class FileProjectSaverTest extends Project2Case { } @Test - public void testSaveAs_Sorted() throws Exception { + public void saveAs_Sorted() throws Exception { File testFolder = setupTestDirectory("testSaveAs_Sorted"); @@ -141,7 +141,7 @@ public class FileProjectSaverTest extends Project2Case { * @throws Exception */ @Test - public void testSaveForProjectFileWithRelatedPaths() throws Exception { + public void saveForProjectFileWithRelatedPaths() throws Exception { File testFolder = setupTestDirectory("testSaveForProjectFileWithRelatedPaths"); String mapFilePath = testFolder.toURI() + "../test.map.xml"; diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java index a7af92577..4d1aa742d 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java @@ -20,12 +20,12 @@ package org.apache.cayenne.project; import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider; import org.apache.cayenne.unit.util.ModuleProviderChecker; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProjectModuleProviderTest { @Test - public void testProviderPresent() { + public void providerPresent() { ModuleProviderChecker.testProviderPresent(ProjectModuleProvider.class, CayenneRuntimeModuleProvider.class); } } diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectTest.java index f9d3f987d..2d282a322 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectTest.java @@ -21,16 +21,16 @@ package org.apache.cayenne.project; import org.apache.cayenne.configuration.ConfigurationNode; import org.apache.cayenne.configuration.ConfigurationNodeVisitor; import org.apache.cayenne.configuration.ConfigurationTree; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ProjectTest { @Test - public void testRootNode() { + public void rootNode() { ConfigurationNode object = new ConfigurationNode() { diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java b/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java index c98008bc4..41ed63297 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/unit/Project2Case.java @@ -29,15 +29,12 @@ import javax.xml.parsers.ParserConfigurationException; import java.io.File; import java.io.IOException; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class Project2Case { /** * A helper method returning the contents of an XML source as a DOM Document. - * - * @throws IOException - * @throws SAXException */ protected Document toDOMTree(File file) { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java index cc048e4d1..78a32172f 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/DefaultUpgradeServiceTest.java @@ -23,8 +23,8 @@ import org.apache.cayenne.project.upgrade.handlers.UpgradeHandler; import org.apache.cayenne.resource.Resource; import org.apache.cayenne.resource.URLResource; import org.apache.cayenne.util.Util; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -36,8 +36,8 @@ import java.net.URL; 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; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -50,7 +50,7 @@ public class DefaultUpgradeServiceTest { List<UpgradeHandler> handlers; - @Before + @BeforeEach public void createService() { createHandlers(); upgradeService = new DefaultUpgradeService(handlers); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/BaseUpgradeHandlerTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/BaseUpgradeHandlerTest.java index e021b1590..7b548a3a7 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/BaseUpgradeHandlerTest.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/BaseUpgradeHandlerTest.java @@ -26,18 +26,15 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.cayenne.project.upgrade.UpgradeUnit; import org.apache.cayenne.resource.URLResource; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.w3c.dom.Document; import org.xml.sax.InputSource; -/** - * @since 4.1 - */ abstract class BaseUpgradeHandlerTest { UpgradeHandler handler; - @Before + @BeforeEach public void createHandler() { handler = newHandler(); } @@ -58,11 +55,6 @@ abstract class BaseUpgradeHandlerTest { return unit.getDocument(); } - Document documentFromString(String xml) throws Exception { - DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - return db.parse(new InputSource(new StringReader(xml))); - } - Document documentFromResource(String resource) throws Exception { DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); return db.parse(new InputSource(new InputStreamReader(getClass().getResourceAsStream(resource)))); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java index addf403bd..50f7d7119 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java @@ -20,17 +20,14 @@ package org.apache.cayenne.project.upgrade.handlers; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; -/** - * @since 4.1 - */ public class UpgradeHandler_V10Test extends BaseUpgradeHandlerTest{ UpgradeHandler newHandler() { @@ -38,7 +35,7 @@ public class UpgradeHandler_V10Test extends BaseUpgradeHandlerTest{ } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { Document document = processProjectDom("cayenne-project-v9.xml"); Element root = document.getDocumentElement(); @@ -48,7 +45,7 @@ public class UpgradeHandler_V10Test extends BaseUpgradeHandlerTest{ } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v9.map.xml"); Element root = document.getDocumentElement(); @@ -58,7 +55,7 @@ public class UpgradeHandler_V10Test extends BaseUpgradeHandlerTest{ } @Test - public void testModelUpgrade() throws Exception { + public void modelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); verifyNoInteractions(descriptor); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java index efa77253a..5011494ec 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java @@ -20,22 +20,19 @@ package org.apache.cayenne.project.upgrade.handlers; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; -/** - * @since 5.0 - */ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { UpgradeHandler newHandler() { @@ -43,7 +40,7 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { Document document = processProjectDom("cayenne-project-v10.xml"); Element root = document.getDocumentElement(); @@ -59,7 +56,7 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v10.map.xml"); Element root = document.getDocumentElement(); @@ -87,7 +84,7 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { } @Test - public void testCgenDomUpgrade() throws Exception { + public void cgenDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v10.map.xml"); Element root = document.getDocumentElement(); @@ -154,7 +151,7 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { } @Test - public void testDbImportDomUpgrade() throws Exception { + public void dbImportDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v10.map.xml"); Element root = document.getDocumentElement(); @@ -189,7 +186,7 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest { } @Test - public void testModelUpgrade() { + public void modelUpgrade() { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); verifyNoInteractions(descriptor); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12Test.java index b8d8fbef9..c755f706c 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12Test.java @@ -22,9 +22,8 @@ package org.apache.cayenne.project.upgrade.handlers; import org.apache.cayenne.configuration.DataChannelDescriptor; import org.apache.cayenne.project.upgrade.UpgradeUnit; import org.apache.cayenne.resource.URLResource; -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.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -38,17 +37,14 @@ import java.io.File; import java.io.InputStream; import java.nio.file.Files; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; -/** - * @since 5.0 - */ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); + @TempDir + public File tempFolder; @Override UpgradeHandler newHandler() { @@ -56,10 +52,10 @@ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { File projectFile = copyResourceToTemp("../v12/cayenne-project1.xml", "cayenne-project.xml"); File graphFile = copyResourceToTemp("../v12/project1.graph.xml", "project1.graph.xml"); - assertTrue("precondition: graph file exists", graphFile.exists()); + assertTrue(graphFile.exists(), "precondition: graph file exists"); Document document = processProjectDomFromFile(projectFile); @@ -70,7 +66,7 @@ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { XPath xpath = XPathFactory.newInstance().newXPath(); NodeList includes = (NodeList) xpath.evaluate("/domain/*[local-name()='include']", document, XPathConstants.NODESET); - assertEquals("xi:include must be removed", 0, includes.getLength()); + assertEquals(0, includes.getLength(), "xi:include must be removed"); NodeList validation = (NodeList) xpath.evaluate("/domain/*[local-name()='validation']", document, XPathConstants.NODESET); @@ -78,11 +74,11 @@ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { assertEquals("http://cayenne.apache.org/schema/12/validation";, ((Element) validation.item(0)).getAttribute("xmlns")); - assertFalse("graph file must be deleted", graphFile.exists()); + assertFalse(graphFile.exists(), "graph file must be deleted"); } @Test - public void testProjectDomUpgradeNoGraphFile() throws Exception { + public void projectDomUpgradeNoGraphFile() throws Exception { File projectFile = copyResourceToTemp("../v12/cayenne-project1.xml", "cayenne-project.xml"); // graph file intentionally absent — upgrade must complete without exception @@ -94,11 +90,11 @@ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { XPath xpath = XPathFactory.newInstance().newXPath(); NodeList includes = (NodeList) xpath.evaluate("/domain/*[local-name()='include']", document, XPathConstants.NODESET); - assertEquals("xi:include must be removed", 0, includes.getLength()); + assertEquals(0, includes.getLength(), "xi:include must be removed"); } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("../v12/map1.map.xml"); Element root = document.getDocumentElement(); @@ -120,14 +116,14 @@ public class UpgradeHandler_V12Test extends BaseUpgradeHandlerTest { } @Test - public void testModelUpgrade() { + public void modelUpgrade() { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); verifyNoInteractions(descriptor); } private File copyResourceToTemp(String resourcePath, String targetName) throws Exception { - File target = new File(tempFolder.getRoot(), targetName); + File target = new File(tempFolder, targetName); try (InputStream in = getClass().getResourceAsStream(resourcePath)) { Files.copy(in, target.toPath()); } diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7Test.java index 0bd301f8d..328e4a359 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7Test.java @@ -25,16 +25,13 @@ import org.apache.cayenne.configuration.DataChannelDescriptor; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -/** - * @since 4.1 - */ public class UpgradeHandler_V7Test extends BaseUpgradeHandlerTest { @Override @@ -43,7 +40,7 @@ public class UpgradeHandler_V7Test extends BaseUpgradeHandlerTest { } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { Document document = processProjectDom("cayenne-project-v6.xml"); Element root = document.getDocumentElement(); @@ -54,7 +51,7 @@ public class UpgradeHandler_V7Test extends BaseUpgradeHandlerTest { } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v6.map.xml"); Element root = document.getDocumentElement(); @@ -64,7 +61,7 @@ public class UpgradeHandler_V7Test extends BaseUpgradeHandlerTest { } @Test - public void testModelUpgrade() throws Exception { + public void modelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); DataMap map = new DataMap(); when(descriptor.getDataMaps()).thenReturn(Collections.singletonList(map)); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java index f077611f0..42e27dcad 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java @@ -20,19 +20,16 @@ package org.apache.cayenne.project.upgrade.handlers; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NodeList; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; -/** - * @since 4.1 - */ public class UpgradeHandler_V8Test extends BaseUpgradeHandlerTest { @Override @@ -41,7 +38,7 @@ public class UpgradeHandler_V8Test extends BaseUpgradeHandlerTest { } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { Document document = processProjectDom("cayenne-project-v7.xml"); Element root = document.getDocumentElement(); @@ -51,7 +48,7 @@ public class UpgradeHandler_V8Test extends BaseUpgradeHandlerTest { } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v7.map.xml"); Element root = document.getDocumentElement(); @@ -88,7 +85,7 @@ public class UpgradeHandler_V8Test extends BaseUpgradeHandlerTest { } @Test - public void testModelUpgrade() throws Exception { + public void modelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); verifyNoInteractions(descriptor); diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java index 48d859ecf..c1cf02492 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java @@ -20,17 +20,14 @@ package org.apache.cayenne.project.upgrade.handlers; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; -/** - * @since 4.1 - */ public class UpgradeHandler_V9Test extends BaseUpgradeHandlerTest { @@ -40,7 +37,7 @@ public class UpgradeHandler_V9Test extends BaseUpgradeHandlerTest { } @Test - public void testProjectDomUpgrade() throws Exception { + public void projectDomUpgrade() throws Exception { Document document = processProjectDom("cayenne-project-v8.xml"); Element root = document.getDocumentElement(); @@ -50,7 +47,7 @@ public class UpgradeHandler_V9Test extends BaseUpgradeHandlerTest { } @Test - public void testDataMapDomUpgrade() throws Exception { + public void dataMapDomUpgrade() throws Exception { Document document = processDataMapDom("test-map-v8.map.xml"); Element root = document.getDocumentElement(); @@ -61,7 +58,7 @@ public class UpgradeHandler_V9Test extends BaseUpgradeHandlerTest { } @Test - public void testModelUpgrade() throws Exception { + public void modelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); verifyNoInteractions(descriptor);
