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

Timestamp:

2016-01-26T00:02:31+01:00 (8 years ago)

Author:

Don-vip

Message:

fix unit tests

Location:

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

Files:

• PreferencesTestUtils.java (modified) (2 diffs)
• display/DrawingPreferenceTest.java (modified) (1 diff)
• display/LanguagePreferenceTest.java (modified) (1 diff)

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

@@ -19 +19 @@
      */
     public static void testPreferenceSettingAddGui(PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass) {
+        testPreferenceSettingAddGui(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 testPreferenceSettingAddGui(PreferenceSettingFactory factory, Class<? extends DefaultTabPreferenceSetting> parentClass,
+            int increment) {
         PreferenceSetting setting = factory.createPreferenceSetting();
         PreferenceTabbedPane tabPane = new PreferenceTabbedPane();
@@ -25 +36 @@
         setting.addGui(tabPane);
         if (parentClass != null) {
-            assertEquals(tabs + 1, tabPane.getSetting(parentClass).getTabPane().getTabCount());
+            assertEquals(tabs + increment, 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.testPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class);
+        PreferencesTestUtils.testPreferenceSettingAddGui(new DrawingPreference.Factory(), DisplayPreference.class, 2);
     }
 }

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

@@ -35 +35 @@
     @Test
     public void testAddGui() {
-        PreferencesTestUtils.testPreferenceSettingAddGui(new LanguagePreference.Factory(), DisplayPreference.class);
+        PreferencesTestUtils.testPreferenceSettingAddGui(new LanguagePreference.Factory(), null);
     }
 }