Ignore:
Timestamp:
2020-10-28T20:41:00+01:00 (7 months 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/preferences/display
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java

    r17179 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link ColorPreference} class.
    1313 */
    14 public class ColorPreferenceTest {
     14class ColorPreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testColorPreference() {
     28    void testColorPreference() {
    2929        assertNotNull(new ColorPreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new ColorPreference.Factory(), null);
    3838    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java

    r10378 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link DisplayPreference} class.
    1313 */
    14 public class DisplayPreferenceTest {
     14class DisplayPreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testDisplayPreference() {
     28    void testDisplayPreference() {
    2929        assertNotNull(new DisplayPreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DisplayPreference.Factory(), null);
    3838    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java

    r17179 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link DrawingPreference} class.
    1313 */
    14 public class DrawingPreferenceTest {
     14class DrawingPreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testDrawingPreference() {
     28    void testDrawingPreference() {
    2929        assertNotNull(new DrawingPreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), null);
    3838    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java

    r17179 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link GPXPreference} class.
    1313 */
    14 public class GPXPreferenceTest {
     14class GPXPreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testGPXPreference() {
     28    void testGPXPreference() {
    2929        assertNotNull(new GPXPreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new GPXPreference.Factory(), null);
    3838    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java

    r17179 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link LafPreference} class.
    1313 */
    14 public class LafPreferenceTest {
     14class LafPreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testLafPreference() {
     28    void testLafPreference() {
    2929        assertNotNull(new LafPreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new LafPreference.Factory(), null);
    3838    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java

    r10378 r17275  
    22package org.openstreetmap.josm.gui.preferences.display;
    33
    4 import static org.junit.Assert.assertNotNull;
     4import static org.junit.jupiter.api.Assertions.assertNotNull;
    55
    6 import org.junit.BeforeClass;
    7 import org.junit.Test;
     6import org.junit.jupiter.api.BeforeAll;
     7import org.junit.jupiter.api.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    99import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
     
    1212 * Unit tests of {@link LanguagePreference} class.
    1313 */
    14 public class LanguagePreferenceTest {
     14class LanguagePreferenceTest {
    1515
    1616    /**
    1717     * Setup test.
    1818     */
    19     @BeforeClass
     19    @BeforeAll
    2020    public static void setUpBeforeClass() {
    2121        JOSMFixture.createUnitTestFixture().init();
     
    2626     */
    2727    @Test
    28     public void testLanguagePreference() {
     28    void testLanguagePreference() {
    2929        assertNotNull(new LanguagePreference.Factory().createPreferenceSetting());
    3030    }
     
    3434     */
    3535    @Test
    36     public void testAddGui() {
     36    void testAddGui() {
    3737        PreferencesTestUtils.doTestPreferenceSettingAddGui(new LanguagePreference.Factory(), null);
    3838    }
Note: See TracChangeset for help on using the changeset viewer.