Changeset 16979 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2020-08-30T10:03:00+02:00 (4 years ago)

Author:

simon04

Message:

fix #19734 - Autofilter: clicking active rule/key opens GPS settings instead of OSM settings

Extract GPXPreference from DrawingPreference

Location:

trunk/test/unit/org/openstreetmap/josm/gui/preferences

Files:

• PreferencesTestUtils.java (modified) (2 diffs)
• display/DrawingPreferenceTest.java (modified) (1 diff)
• display/GPXPreferenceTest.java (copied) (copied from trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java ) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java

@@ -20 +20 @@
     public static void doTestPreferenceSettingAddGui(
             PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass) {
-        doTestPreferenceSettingAddGui(factory, parentClass, 1);
-    }
-
-    /**
-     * Generic test for {@link PreferenceSetting#addGui(PreferenceTabbedPane)}.
-     * @param factory setting factory to test
-     * @param parentClass optional parent setting, can be {@code null}
-     * @param increment expected tab number increment
-     */
-    public static void doTestPreferenceSettingAddGui(
-            PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass, int increment) {
         PreferenceSetting setting = factory.createPreferenceSetting();
         PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
@@ -37 +26 @@
         setting.addGui(tabPane);
         if (parentClass != null) {
-            assertEquals(tabs + increment, tabPane.getSetting(parentClass).getTabPane().getTabCount());
+            assertEquals(tabs + 1, tabPane.getSetting(parentClass).getTabPane().getTabCount());
             assertEquals(tabPane.getSetting(parentClass), ((SubPreferenceSetting) setting).getTabPreferenceSetting(tabPane));
         }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java

@@ -35 +35 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/GPXPreferenceTest.java

@@ -10 +10 @@
 
 /**
- * Unit tests of {@link DrawingPreference} class.
+ * Unit tests of {@link GPXPreference} class.
  */
-public class DrawingPreferenceTest {
+public class GPXPreferenceTest {
 
     /**
@@ -23 +23 @@
 
     /**
-     * Unit test of {@link DrawingPreference#DrawingPreference}.
+     * Unit test of {@link GPXPreference.Factory}.
      */
     @Test
-    public void testDrawingPreference() {
-        assertNotNull(new DrawingPreference.Factory().createPreferenceSetting());
+    public void testGPXPreference() {
+        assertNotNull(new GPXPreference.Factory().createPreferenceSetting());
     }
 
     /**
-     * Unit test of {@link DrawingPreference#addGui}.
+     * Unit test of {@link GPXPreference#addGui}.
      */
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.doTestPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new GPXPreference.Factory(), DisplayPreference.class);
     }
 }