Ignore:
Timestamp:
2020-10-28T20:41:00+01:00 (3 years ago)
Author:
Don-vip
Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

    r14977 r17275  
    22package org.openstreetmap.josm.actions.mapmode;
    33
    4 import static org.junit.Assert.assertFalse;
    5 import static org.junit.Assert.assertSame;
    6 import static org.junit.Assert.assertTrue;
     4import static org.junit.jupiter.api.Assertions.assertFalse;
     5import static org.junit.jupiter.api.Assertions.assertSame;
     6import static org.junit.jupiter.api.Assertions.assertTrue;
    77
    88import java.awt.event.InputEvent;
    … …  
    1212import java.util.Collection;
    1313
    14 import org.junit.Rule;
    15 import org.junit.Test;
     14import org.junit.jupiter.api.Test;
     15import org.junit.jupiter.api.extension.RegisterExtension;
    1616import org.openstreetmap.josm.TestUtils;
    1717import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode;
    … …  
    3434 * Unit tests for class {@link SelectAction}.
    3535 */
    36 public class SelectActionTest {
     36class SelectActionTest {
    3737
    3838    boolean nodesMerged;
    … …  
    4949        public void mergeNodes(OsmDataLayer layer, Collection<Node> nodes,
    5050                               Node targetLocationNode) {
    51             assertSame(String.format("Should merge two nodes, %d found", nodes.size()),
    52                        nodes.size(), 2);
     51            assertSame(2, nodes.size(), String.format("Should merge two nodes, %d found", nodes.size()));
    5352            nodesMerged = true;
    5453        }
    … …  
    5857     * Setup test.
    5958     */
    60     @Rule
     59    @RegisterExtension
    6160    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    6261    public JOSMTestRules test = new JOSMTestRules().projection().main();
    … …  
    7069    @Test
    7170    @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
    72     public void testTicket10748() throws ReflectiveOperationException {
     71    void testTicket10748() throws ReflectiveOperationException {
    7372        DataSet dataSet = new DataSet();
    7473        OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
    … …  
    125124
    126125            // As result of test, we must find a 2 nodes way, from EN(0, 0) to EN(100, 0)
    127             assertTrue("Nodes are not merged", nodesMerged);
    128             assertSame(String.format("Expect exactly one way, found %d%n", dataSet.getWays().size()),
    129                        dataSet.getWays().size(), 1);
     126            assertTrue(nodesMerged, "Nodes are not merged");
     127            assertSame(1, dataSet.getWays().size(), String.format("Expect exactly one way, found %d%n", dataSet.getWays().size()));
    130128            Way rw = dataSet.getWays().iterator().next();
    131             assertFalse("Way shouldn't be deleted\n", rw.isDeleted());
    132             assertSame(String.format("Way shouldn't have 2 nodes, %d found%n", w.getNodesCount()),
    133                        rw.getNodesCount(), 2);
     129            assertFalse(rw.isDeleted(), "Way shouldn't be deleted\n");
     130            assertSame(2, rw.getNodesCount(), String.format("Way shouldn't have 2 nodes, %d found%n", w.getNodesCount()));
    134131            Node r1 = rw.firstNode();
    135132            Node r2 = rw.lastNode();
    … …  
    139136                r2 = tmp;
    140137            }
    141             assertSame(String.format("East should be 0, found %f%n", r1.getEastNorth().east()),
    142                        Double.compare(r1.getEastNorth().east(), 0), 0);
    143             assertSame(String.format("East should be 100, found %f%n", r2.getEastNorth().east()),
    144                        Double.compare(r2.getEastNorth().east(), 100), 0);
     138            assertSame(0, Double.compare(r1.getEastNorth().east(), 0),
     139                    String.format("East should be 0, found %f%n", r1.getEastNorth().east()));
     140            assertSame(0, Double.compare(r2.getEastNorth().east(), 100),
     141                    String.format("East should be 100, found %f%n", r2.getEastNorth().east()));
    145142        } finally {
    146143            // Ensure we clean the place before leaving, even if test fails.
    … …  
    153150     */
    154151    @Test
    155     public void testEnumMode() {
     152    void testEnumMode() {
    156153        TestUtils.superficialEnumCodeCoverage(Mode.class);
    157154    }
    … …  
    161158     */
    162159    @Test
    163     public void testEnumSelectActionCursor() {
     160    void testEnumSelectActionCursor() {
    164161        TestUtils.superficialEnumCodeCoverage(SelectActionCursor.class);
    165162    }
Note: See TracChangeset for help on using the changeset viewer.