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

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java

    r17179 r17275  
    22package org.openstreetmap.josm.gui.preferences.server;
    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.gui.preferences.PreferencesTestUtils;
    99import org.openstreetmap.josm.testutils.JOSMTestRules;
     
    1414 * Unit tests of {@link ProxyPreference} class.
    1515 */
    16 public class ProxyPreferenceTest {
     16class ProxyPreferenceTest {
    1717
    1818    /**
    1919     * Setup tests
    2020     */
    21     @Rule
     21    @RegisterExtension
    2222    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2323    public JOSMTestRules test = new JOSMTestRules().preferences();
     
    2727     */
    2828    @Test
    29     public void testProxyPreference() {
     29    void testProxyPreference() {
    3030        assertNotNull(new ProxyPreference.Factory().createPreferenceSetting());
    3131    }
     
    3535     */
    3636    @Test
    37     public void testAddGui() {
     37    void testAddGui() {
    3838        PreferencesTestUtils.doTestPreferenceSettingAddGui(new ProxyPreference.Factory(), null);
    3939    }
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java

    r14138 r17275  
    22package org.openstreetmap.josm.gui.preferences.server;
    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.gui.preferences.PreferencesTestUtils;
    99import org.openstreetmap.josm.testutils.JOSMTestRules;
     
    1414 * Unit tests of {@link ServerAccessPreference} class.
    1515 */
    16 public class ServerAccessPreferenceTest {
     16class ServerAccessPreferenceTest {
    1717
    1818    /**
    1919     * Setup tests
    2020     */
    21     @Rule
     21    @RegisterExtension
    2222    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
    2323    public JOSMTestRules test = new JOSMTestRules().preferences();
     
    2727     */
    2828    @Test
    29     public void testServerAccessPreference() {
     29    void testServerAccessPreference() {
    3030        assertNotNull(new ServerAccessPreference.Factory().createPreferenceSetting());
    3131    }
     
    3535     */
    3636    @Test
    37     public void testAddGui() {
     37    void testAddGui() {
    3838        PreferencesTestUtils.doTestPreferenceSettingAddGui(new ServerAccessPreference.Factory(), null);
    3939    }
Note: See TracChangeset for help on using the changeset viewer.