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 b815afe7fe6e57bd262d3f523ab67d17a6e59650 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 3 11:46:17 2026 -0400 Migrating to JUnit 5 * modeler switched to native JUnit 5 --- modeler/cayenne-modeler/pom.xml | 6 ------ .../cayenne/configuration/event/DataNodeEventTest.java | 8 ++++---- .../apache/cayenne/modeler/CayenneModelerValidationIT.java | 12 ++++++------ .../modeler/editor/dbimport/DbImportSorterTest.java | 8 ++++---- .../cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java | 2 +- .../modeler/editor/dbimport/tree/CatalogNodeTest.java | 6 +++--- .../modeler/editor/dbimport/tree/ColumnNodeTest.java | 6 +++--- .../modeler/editor/dbimport/tree/SchemaNodeTest.java | 6 +++--- .../editor/dbimport/tree/SchemaProcedureNodeTest.java | 6 +++--- .../modeler/editor/dbimport/tree/SchemaTableNodeTest.java | 6 +++--- .../editor/templateeditor/ArtifactsConfiguratorTest.java | 12 ++++++------ .../editor/templateeditor/EditorTemplateLoaderTest.java | 8 ++++---- .../editor/templateeditor/EditorTemplateSaverTest.java | 8 ++++---- .../templateeditor/PreviewActionConfiguratorTest.java | 10 +++++----- .../modeler/event/display/DomainDisplayEventTest.java | 4 ++-- .../cayenne/modeler/event/model/DataMapEventTest.java | 6 +++--- .../cayenne/modeler/event/model/DbAttributeEventTest.java | 4 ++-- .../cayenne/modeler/event/model/DbEntityEventTest.java | 10 +++++----- .../modeler/event/model/DbRelationshipEventTest.java | 4 ++-- .../cayenne/modeler/event/model/DomainEventTest.java | 6 +++--- .../apache/cayenne/modeler/event/model/ModelEventTest.java | 12 ++++++------ .../pref/migration/toV5/_3_GeneralPrefsMigrationTest.java | 6 +++--- .../cayenne/modeler/ui/action/CreateNodeActionTest.java | 8 ++++---- .../general/GeneralPreferencesControllerTest.java | 14 +++++++------- .../cayenne/modeler/util/ApplicationFileFilterTest.java | 10 +++++----- .../apache/cayenne/modeler/util/DataMapFileFilterTest.java | 10 +++++----- .../apache/cayenne/modeler/util/EOModelFileFilterTest.java | 10 +++++----- 27 files changed, 101 insertions(+), 107 deletions(-) diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml index 6cf5cf379..d71aefe66 100644 --- a/modeler/cayenne-modeler/pom.xml +++ b/modeler/cayenne-modeler/pom.xml @@ -84,12 +84,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/configuration/event/DataNodeEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/configuration/event/DataNodeEventTest.java index 9e98a4e34..e18e90709 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/configuration/event/DataNodeEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/configuration/event/DataNodeEventTest.java @@ -22,11 +22,11 @@ package org.apache.cayenne.configuration.event; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.modeler.event.model.ModelEvent; import org.apache.cayenne.modeler.event.model.DataNodeEvent; -import org.junit.Test; +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 DataNodeEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java index 1c4170404..97fa5555e 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java @@ -30,17 +30,17 @@ import org.apache.cayenne.project.validation.Inspection; import org.apache.cayenne.project.validation.ProjectValidator; import org.apache.cayenne.project.validation.ValidationConfig; import org.apache.cayenne.resource.URLResource; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.EnumSet; import java.util.List; -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; public class CayenneModelerValidationIT { @@ -49,7 +49,7 @@ public class CayenneModelerValidationIT { private static final Logger LOGGER = LoggerFactory.getLogger(CayenneModelerValidationIT.class); private static Injector injector; - @BeforeClass + @BeforeAll public static void setUp() { injector = DIBootstrap.createInjector(List.of( new ToolsModule(LOGGER), diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java index 2a4de6c0d..61b16b57e 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java @@ -24,16 +24,16 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn; import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable; import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode; -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.*; public class DbImportSorterTest { private DbImportTreeNode node; - @Before + @BeforeEach public void createNode(){ node = new DbImportTreeNode(new Catalog()); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java index 661f84999..d626812c2 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java @@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable; import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering; import org.apache.cayenne.dbsync.reverse.dbimport.Schema; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; class BaseNodeTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java index 0d20b392b..b6894b05a 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java @@ -19,14 +19,14 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CatalogNodeTest extends BaseNodeTest { private CatalogNode node; - @Before + @BeforeEach public void createNode() { node = new CatalogNode("catalog"); } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java index 4acaf4b05..441ab46b2 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java @@ -19,14 +19,14 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ColumnNodeTest extends BaseNodeTest { private ColumnNode node; - @Before + @BeforeEach public void createNode() { CatalogNode catalogNode = new CatalogNode("catalog"); SchemaNode schemaNode = new SchemaNode("schema", catalogNode); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java index 88d520b9c..93e6aaa97 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java @@ -19,14 +19,14 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SchemaNodeTest extends BaseNodeTest { private SchemaNode node; - @Before + @BeforeEach public void createNode() { CatalogNode catalogNode = new CatalogNode("catalog"); node = new SchemaNode("schema", catalogNode); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java index ecbcd05eb..c556c2fa9 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java @@ -19,14 +19,14 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SchemaProcedureNodeTest extends BaseNodeTest { private SchemaProcedureNode node; - @Before + @BeforeEach public void createNode() { CatalogNode catalogNode = new CatalogNode("catalog"); SchemaNode schemaNode = new SchemaNode("schema", catalogNode); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java index 0f88238f3..baf83cc88 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java @@ -19,14 +19,14 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SchemaTableNodeTest extends BaseNodeTest { private SchemaTableNode node; - @Before + @BeforeEach public void createNode() { CatalogNode catalogNode = new CatalogNode("catalog"); SchemaNode schemaNode = new SchemaNode("schema", catalogNode); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java index 3bfc5bea2..c95bde807 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java @@ -30,15 +30,15 @@ import org.apache.cayenne.map.QueryDescriptor; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.DataMapArtefactsConfigurator; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EmbeddableArtefactsConfigurator; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EntityArtefactsConfigurator; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.Collection; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ArtifactsConfiguratorTest { private DataMap dataMap; @@ -47,7 +47,7 @@ public class ArtifactsConfiguratorTest { private EmbeddableArtefactsConfigurator embeddableArtefactsConfigurator; private DataMapArtefactsConfigurator dataMapArtefactsConfigurator; - @Before + @BeforeEach public void config(){ this.dataMap = configureDataMap(); this.action = new ClassGenerationAction(createCgenConfiguration()); @@ -70,7 +70,7 @@ public class ArtifactsConfiguratorTest { artifactsField.setAccessible(true); Collection<Artifact> artifacts = (Collection<Artifact>) artifactsField.get(configuration); - Assert.assertEquals(3, artifacts.size()); + Assertions.assertEquals(3, artifacts.size()); } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java index 1d8f27c0c..376d3e325 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java @@ -24,14 +24,14 @@ import org.apache.cayenne.gen.CgenTemplate; import org.apache.cayenne.gen.TemplateType; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EditorTemplateLoader; import org.apache.velocity.exception.ResourceNotFoundException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class EditorTemplateLoaderTest { @@ -39,7 +39,7 @@ public class EditorTemplateLoaderTest { private EditorTemplateLoader loader; private static final String CUSTOM_TPL = "Custom tpl"; - @Before + @BeforeEach public void createCgenConfiguration (){ this.configuration = new CgenConfiguration(); this.loader = new EditorTemplateLoader(configuration,null); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java index a977777f6..ab253a9ed 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java @@ -23,12 +23,12 @@ import org.apache.cayenne.gen.CgenConfiguration; import org.apache.cayenne.gen.TemplateType; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.TemplateEditorView; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EditorTemplateSaver; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class EditorTemplateSaverTest { @@ -36,7 +36,7 @@ public class EditorTemplateSaverTest { private EditorTemplateSaver saver; private static final String CUSTOM_TPL = "Custom tpl"; - @Before + @BeforeEach public void config(){ this.configuration = new CgenConfiguration(); this.saver = new EditorTemplateSaver(configuration); diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java index def79bbb6..f1be0588b 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java @@ -33,9 +33,9 @@ import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor. import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EntityArtefactsConfigurator; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.PreviewActionConfigurator; import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.TemplateEditorController; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.Writer; @@ -48,7 +48,7 @@ public class PreviewActionConfiguratorTest { private TemplateEditorController editorController; - @Before + @BeforeEach public void config() { DataMap dataMap = configureDataMap(); @@ -103,7 +103,7 @@ public class PreviewActionConfiguratorTest { ClassGenerationAction action = actionConfigurator.preparePreviewAction(TEST_TEMPLATE_TEXT); action.execute(); Writer writer = actionConfigurator.getWriter(); - Assert.assertEquals(TEST_TEMPLATE_TEXT, writer.toString()); + Assertions.assertEquals(TEST_TEMPLATE_TEXT, writer.toString()); } } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java index 4f9530741..7211c607b 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java @@ -20,9 +20,9 @@ package org.apache.cayenne.modeler.event.display; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class DomainDisplayEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java index 686d0ae3c..c61cb0379 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java @@ -20,10 +20,10 @@ package org.apache.cayenne.modeler.event.model; import org.apache.cayenne.map.DataMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class DataMapEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java index 09da07666..676c09853 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java @@ -21,9 +21,9 @@ package org.apache.cayenne.modeler.event.model; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class DbAttributeEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java index 98a53a63e..33b240641 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java @@ -20,12 +20,12 @@ package org.apache.cayenne.modeler.event.model; import org.apache.cayenne.map.DbEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -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.assertEquals; +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 DbEntityEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java index 282677ec0..f812e0438 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java @@ -21,9 +21,9 @@ package org.apache.cayenne.modeler.event.model; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.DbRelationship; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class DbRelationshipEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java index ffe59ead3..6a594f103 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java @@ -20,10 +20,10 @@ package org.apache.cayenne.modeler.event.model; import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class DomainEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java index fffc301cb..9c243e50f 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java @@ -19,13 +19,13 @@ package org.apache.cayenne.modeler.event.model; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -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.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ModelEventTest { diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java index 076ed2dcd..f504c731b 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java @@ -19,10 +19,10 @@ package org.apache.cayenne.modeler.pref.migration.toV5; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/CreateNodeActionTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/CreateNodeActionTest.java index 8d499b701..f6bde7278 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/CreateNodeActionTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/CreateNodeActionTest.java @@ -22,10 +22,10 @@ package org.apache.cayenne.modeler.ui.action; import org.apache.cayenne.configuration.DataChannelDescriptor; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.DataSourceDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class CreateNodeActionTest { @@ -51,6 +51,6 @@ public class CreateNodeActionTest { DataSourceDescriptor ds1 = new DataSourceDescriptor(); node.setDataSourceDescriptor(ds1); - assertSame("Project DataNode must not wrap the DataSource", ds1, node.getDataSourceDescriptor()); + assertSame(ds1, node.getDataSourceDescriptor(), "Project DataNode must not wrap the DataSource"); } } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesControllerTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesControllerTest.java index fb24adb99..1be47c24e 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesControllerTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesControllerTest.java @@ -19,24 +19,24 @@ package org.apache.cayenne.modeler.ui.preferences.general; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.charset.Charset; -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 GeneralPreferencesControllerTest { @Test public void standardEncodingsAreSupportedByJVM() { - assertTrue("STANDARD_ENCODINGS must not be empty", - GeneralPreferencesController.STANDARD_ENCODINGS.length > 0); + assertTrue(GeneralPreferencesController.STANDARD_ENCODINGS.length > 0, + "STANDARD_ENCODINGS must not be empty"); for (String encoding : GeneralPreferencesController.STANDARD_ENCODINGS) { - assertTrue("Charset not supported by JVM: " + encoding, - Charset.isSupported(encoding)); + assertTrue(Charset.isSupported(encoding), + "Charset not supported by JVM: " + encoding); } } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java index 13add0eb0..65e0370b5 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java @@ -19,21 +19,21 @@ package org.apache.cayenne.modeler.util; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.filechooser.FileFilter; import java.io.File; -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 ApplicationFileFilterTest { protected FileFilter filter; - @Before + @BeforeEach public void setUp() throws Exception { filter = FileFilters.getApplicationFilter(); } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java index 6a162702d..3193aabd1 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java @@ -19,21 +19,21 @@ package org.apache.cayenne.modeler.util; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.filechooser.FileFilter; import java.io.File; -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 DataMapFileFilterTest { protected FileFilter filter; - @Before + @BeforeEach public void setUp() throws Exception { filter = FileFilters.getDataMapFilter(); } diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/EOModelFileFilterTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/EOModelFileFilterTest.java index 128d4b59a..27616923b 100644 --- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/EOModelFileFilterTest.java +++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/EOModelFileFilterTest.java @@ -19,21 +19,21 @@ package org.apache.cayenne.modeler.util; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.filechooser.FileFilter; import java.io.File; -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 EOModelFileFilterTest { protected FileFilter filter; - @Before + @BeforeEach public void setUp() throws Exception { filter = FileFilters.getEOModelFilter(); }
