Changeset 34173 in osm for applications/editors/josm

Timestamp:

2018-04-28T20:31:37+02:00 (7 years ago)

Author:

floscher

Message:

JOSM/wikipedia: Remove dependency on PreferencesTestUtils (not in josm-unittest.jar)

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/gui/SophoxServerPreference.java (modified) (1 diff)
• test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/SophoxServerPreference.java

@@ -32 +32 @@
     public static class Factory implements PreferenceSettingFactory {
         @Override
-        public PreferenceSetting createPreferenceSetting() {
+        public SophoxServerPreference createPreferenceSetting() {
             return new SophoxServerPreference();
         }

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/SophoxServerPreferenceTest.java

@@ -2 +2 @@
 package org.wikipedia.gui;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.server.ServerAccessPreference;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -37 +37 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new SophoxServerPreference.Factory(), ServerAccessPreference.class);
+        final SophoxServerPreference setting = new SophoxServerPreference.Factory().createPreferenceSetting();
+        final PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
+        tabPane.buildGui();
+        int tabs = tabPane.getSetting(ServerAccessPreference.class).getTabPane().getTabCount();
+        setting.addGui(tabPane);
+
+        assertEquals(tabs + 1, tabPane.getSetting(ServerAccessPreference.class).getTabPane().getTabCount());
+        assertEquals(tabPane.getSetting(ServerAccessPreference.class), setting.getTabPreferenceSetting(tabPane));
+
+        setting.ok();
     }
 }