Ignore:
Timestamp:
2020-10-28T20:41:00+01:00 (5 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

Location:
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

    r16913 r17275  
    22package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    4 import static org.junit.Assert.assertEquals;
    5 import static org.junit.Assert.assertFalse;
    6 import static org.junit.Assert.assertTrue;
    7 import static org.junit.Assert.fail;
     4import static org.junit.jupiter.api.Assertions.fail;
     5import static org.junit.jupiter.api.Assertions.assertEquals;
     6import static org.junit.jupiter.api.Assertions.assertFalse;
     7import static org.junit.jupiter.api.Assertions.assertTrue;
    88
    99import java.beans.PropertyChangeEvent;
    … …  
    1919import javax.swing.DefaultListSelectionModel;
    2020
    21 import org.junit.Rule;
    22 import org.junit.Test;
     21import org.junit.jupiter.api.Test;
     22import org.junit.jupiter.api.extension.RegisterExtension;
    2323import org.openstreetmap.josm.TestUtils;
    2424import org.openstreetmap.josm.data.osm.Node;
    … …  
    3434 * Unit tests of {@link NodeListMergeModel}.
    3535 */
    36 public class NodeListMergeModelTest {
     36class NodeListMergeModelTest {
    3737
    3838    private final DatasetFactory my = new DatasetFactory();
    … …  
    4242     * Setup test.
    4343     */
    44     @Rule
     44    @RegisterExtension
    4545    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    4646    public JOSMTestRules test = new JOSMTestRules();
    … …  
    7979            if (idx[i] instanceof Integer) {
    8080                int j = (Integer) idx[i];
    81                 assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
     81                assertTrue(model.isSelectedIndex(j), "expected row " + j + " to be selected");
    8282                break;
    8383            }
    … …  
    9090            }
    9191            for (int j = rows[0]; j <= rows[1]; j++) {
    92                 assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
     92                assertTrue(model.isSelectedIndex(j), "expected row " + j + " to be selected");
    9393            }
    9494        }
    … …  
    9696
    9797    @Test
    98     public void testCopyMyNodesToTop1() {
     98    void testCopyMyNodesToTop1() {
    9999        NodeListMergeModel model = new NodeListMergeModel();
    100100
    … …  
    118118
    119119    @Test
    120     public void testCopyMyNodesToTop2() {
     120    void testCopyMyNodesToTop2() {
    121121        NodeListMergeModel model = new NodeListMergeModel();
    122122
    … …  
    144144
    145145    @Test
    146     public void testCopyMyNodesToTop3() {
     146    void testCopyMyNodesToTop3() {
    147147        NodeListMergeModel model = new NodeListMergeModel();
    148148
    … …  
    170170
    171171    @Test
    172     public void testCopyMyNodesToTop4() {
     172    void testCopyMyNodesToTop4() {
    173173        NodeListMergeModel model = new NodeListMergeModel();
    174174
    … …  
    197197
    198198    @Test
    199     public void testCopyMyNodesToEnd1() {
     199    void testCopyMyNodesToEnd1() {
    200200        NodeListMergeModel model = new NodeListMergeModel();
    201201
    … …  
    218218
    219219    @Test
    220     public void testCopyMyNodesToEnd2() {
     220    void testCopyMyNodesToEnd2() {
    221221        NodeListMergeModel model = new NodeListMergeModel();
    222222
    … …  
    243243
    244244    @Test
    245     public void testCopyMyNodesToEnd3() {
     245    void testCopyMyNodesToEnd3() {
    246246        NodeListMergeModel model = new NodeListMergeModel();
    247247
    … …  
    270270
    271271    @Test
    272     public void testCopyMyNodesToEnd4() {
     272    void testCopyMyNodesToEnd4() {
    273273        NodeListMergeModel model = new NodeListMergeModel();
    274274
    … …  
    303303
    304304    @Test
    305     public void testCopyMyNodesBeforeCurrent1() {
     305    void testCopyMyNodesBeforeCurrent1() {
    306306        NodeListMergeModel model = new NodeListMergeModel();
    307307
    … …  
    330330
    331331    @Test
    332     public void testCopyMyNodesBeforeCurrent2() {
     332    void testCopyMyNodesBeforeCurrent2() {
    333333        NodeListMergeModel model = new NodeListMergeModel();
    334334
    … …  
    358358
    359359    @Test
    360     public void testCopyMyNodesBeforeCurrent3() {
     360    void testCopyMyNodesBeforeCurrent3() {
    361361        NodeListMergeModel model = new NodeListMergeModel();
    362362
    … …  
    393393    /* ----------------------------------------------------------------------------- */
    394394    @Test
    395     public void testCopyMyNodesAfterCurrent1() {
     395    void testCopyMyNodesAfterCurrent1() {
    396396        NodeListMergeModel model = new NodeListMergeModel();
    397397
    … …  
    420420
    421421    @Test
    422     public void testCopyMyNodesAfterCurrent2() {
     422    void testCopyMyNodesAfterCurrent2() {
    423423        NodeListMergeModel model = new NodeListMergeModel();
    424424
    … …  
    449449
    450450    @Test
    451     public void testCopyMyNodesAfterCurrent3() {
     451    void testCopyMyNodesAfterCurrent3() {
    452452        NodeListMergeModel model = new NodeListMergeModel();
    453453
    … …  
    482482    /* ----------------------------------------------------------------------------- */
    483483    @Test
    484     public void testMoveUpMergedNodes1() {
     484    void testMoveUpMergedNodes1() {
    485485        NodeListMergeModel model = new NodeListMergeModel();
    486486
    … …  
    508508
    509509    @Test
    510     public void testMoveUpMergedNodes2() {
     510    void testMoveUpMergedNodes2() {
    511511        NodeListMergeModel model = new NodeListMergeModel();
    512512
    … …  
    538538
    539539    @Test
    540     public void testMoveUpMergedNodes3() {
     540    void testMoveUpMergedNodes3() {
    541541        NodeListMergeModel model = new NodeListMergeModel();
    542542
    … …  
    571571    /* ----------------------------------------------------------------------------- */
    572572    @Test
    573     public void testMoveDownMergedNodes1() {
     573    void testMoveDownMergedNodes1() {
    574574        NodeListMergeModel model = new NodeListMergeModel();
    575575
    … …  
    597597
    598598    @Test
    599     public void testMoveDownMergedNodes2() {
     599    void testMoveDownMergedNodes2() {
    600600        NodeListMergeModel model = new NodeListMergeModel();
    601601
    … …  
    627627
    628628    @Test
    629     public void testMoveDownMergedNodes3() {
     629    void testMoveDownMergedNodes3() {
    630630        NodeListMergeModel model = new NodeListMergeModel();
    631631
    … …  
    660660    /* ----------------------------------------------------------------------------- */
    661661    @Test
    662     public void testAddPropertyChangeListener() throws ReflectiveOperationException {
     662    void testAddPropertyChangeListener() throws ReflectiveOperationException {
    663663        NodeListMergeModel model = new NodeListMergeModel();
    664664
    … …  
    675675
    676676    @Test
    677     public void testRemovePropertyChangeListener() throws ReflectiveOperationException {
     677    void testRemovePropertyChangeListener() throws ReflectiveOperationException {
    678678        NodeListMergeModel model = new NodeListMergeModel();
    679679
    … …  
    693693    /* ----------------------------------------------------------------------------- */
    694694    @Test
    695     public void testSetFrozen() {
     695    void testSetFrozen() {
    696696        NodeListMergeModel model = new NodeListMergeModel();
    697697        model.setFrozen(true);
    … …  
    703703
    704704    @Test
    705     public void testSetFrozenWithPropertyChangeNotification() {
     705    void testSetFrozenWithPropertyChangeNotification() {
    706706        NodeListMergeModel model = new NodeListMergeModel();
    707707

  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java

    r10962 r17275  
    22package org.openstreetmap.josm.gui.conflict.pair.nodes;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.Rule;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.extension.RegisterExtension;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.testutils.JOSMTestRules;
    99
    … …  
    1313 * Unit tests of {@link NodeListMerger} class.
    1414 */
    15 public class NodeListMergerTest {
     15class NodeListMergerTest {
    1616
    1717    /**
    1818     * Setup test.
    1919     */
    20     @Rule
     20    @RegisterExtension
    2121    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2222    public JOSMTestRules test = new JOSMTestRules().preferences();
    … …  
    2626     */
    2727    @Test
    28     public void testNodeListMerger() {
     28    void testNodeListMerger() {
    2929        assertNotNull(new NodeListMerger());
    3030    }
Note: See TracChangeset for help on using the changeset viewer.