Ignore:
Timestamp:
2023-10-04T00:03:40+02:00 (21 months ago)
Author:
taylor.smock
Message:

See #16567: Update to JUnit 5

This removes new JOSMTestRules() with no additional setup and most
JOSMFixture calls.

Removing the bare JOSMTestRules speeds up the test suite since there are two
fewer System.gc() calls per test.

Location:
trunk/test/unit/org/openstreetmap/josm/command
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    98import org.openstreetmap.josm.data.osm.User;
    109import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    11 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1210
    13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1411import nl.jqno.equalsverifier.EqualsVerifier;
    1512import nl.jqno.equalsverifier.Warning;
    … …  
    1916 */
    2017class TransformNodesCommandTest {
    21 
    22     /**
    23      * Setup test.
    24      */
    25     @RegisterExtension
    26     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    27     public JOSMTestRules test = new JOSMTestRules();
    28 
    2918    /**
    3019     * Unit test of methods {@link TransformNodesCommand#equals} and {@link TransformNodesCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

    r17275 r18853  
    88import org.junit.jupiter.api.BeforeEach;
    99import org.junit.jupiter.api.Test;
    10 import org.junit.jupiter.api.extension.RegisterExtension;
    1110import org.openstreetmap.josm.TestUtils;
    1211import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    … …  
    1716import org.openstreetmap.josm.data.osm.Way;
    1817import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    19 import org.openstreetmap.josm.testutils.JOSMTestRules;
    2018
    21 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    2219import nl.jqno.equalsverifier.EqualsVerifier;
    2320import nl.jqno.equalsverifier.Warning;
    … …  
    2724 */
    2825class ConflictAddCommandTest {
    29 
    30     /**
    31      * Setup test.
    32      */
    33     @RegisterExtension
    34     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    35     public JOSMTestRules test = new JOSMTestRules();
    3626    private CommandTestData testData;
    3727

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    109import org.openstreetmap.josm.data.osm.User;
    1110import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    12 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1311
    14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1512import nl.jqno.equalsverifier.EqualsVerifier;
    1613import nl.jqno.equalsverifier.Warning;
    … …  
    2017 */
    2118class ConflictResolveCommandTest {
    22 
    23     /**
    24      * Setup test.
    25      */
    26     @RegisterExtension
    27     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    28     public JOSMTestRules test = new JOSMTestRules();
    29 
    3019    /**
    3120     * Unit test of methods {@link ConflictResolveCommand#equals} and {@link ConflictResolveCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

    r17275 r18853  
    88import org.junit.jupiter.api.BeforeEach;
    99import org.junit.jupiter.api.Test;
    10 import org.junit.jupiter.api.extension.RegisterExtension;
    1110import org.openstreetmap.josm.TestUtils;
    1211import org.openstreetmap.josm.command.CommandTest.CommandTestData;
    … …  
    1918import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
    2019import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    21 import org.openstreetmap.josm.testutils.JOSMTestRules;
    2220
    23 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    2421import nl.jqno.equalsverifier.EqualsVerifier;
    2522import nl.jqno.equalsverifier.Warning;
    … …  
    3128
    3229    private CommandTestData testData;
    33 
    34     /**
    35      * Setup test.
    36      */
    37     @RegisterExtension
    38     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    39     public JOSMTestRules test = new JOSMTestRules();
    4030
    4131    /**

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.Way;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class DeletedStateConflictResolveCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link DeletedStateConflictResolveCommand#equals} and {@link DeletedStateConflictResolveCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.Way;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class ModifiedConflictResolveCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link ModifiedConflictResolveCommand#equals} and {@link ModifiedConflictResolveCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.User;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class RelationMemberConflictResolverCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link RelationMemberConflictResolverCommand#equals} and {@link RelationMemberConflictResolverCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.Way;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class TagConflictResolveCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link TagConflictResolveCommand#equals} and {@link TagConflictResolveCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.Way;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class VersionConflictResolveCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link VersionConflictResolveCommand#equals} and {@link VersionConflictResolveCommand#hashCode}.

  • trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java

    r17275 r18853  
    22package org.openstreetmap.josm.command.conflict;
    33
    4 import org.junit.jupiter.api.extension.RegisterExtension;
    54import org.junit.jupiter.api.Test;
    65import org.openstreetmap.josm.TestUtils;
    … …  
    1110import org.openstreetmap.josm.data.osm.Way;
    1211import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    13 import org.openstreetmap.josm.testutils.JOSMTestRules;
    1412
    15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    1613import nl.jqno.equalsverifier.EqualsVerifier;
    1714import nl.jqno.equalsverifier.Warning;
    … …  
    2118 */
    2219class WayNodesConflictResolverCommandTest {
    23 
    24     /**
    25      * Setup test.
    26      */
    27     @RegisterExtension
    28     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    29     public JOSMTestRules test = new JOSMTestRules();
    30 
    3120    /**
    3221     * Unit test of methods {@link WayNodesConflictResolverCommand#equals} and {@link WayNodesConflictResolverCommand#hashCode}.
Note: See TracChangeset for help on using the changeset viewer.