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

Timestamp:

2021-10-09T15:05:34+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21408 - fix fill-default property, add tests (patch by marcello)

File:

• trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java

@@ -28 +28 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().i18n("de");
+    public JOSMTestRules test = new JOSMTestRules().preferences().main().i18n("de");
 
     /**
@@ -55 +55 @@
         KeyedItem.LAST_VALUES.clear();
         KeyedItem.LAST_VALUES.put("addr:country", "AT");
+        Combo.PROP_FILL_DEFAULT.put(false);
+        combo.use_last_as_default = 0;
 
-        combo.use_last_as_default = 0;
         combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, way));
         assertEquals("", combo.getSelectedItem().value);
@@ -79 +80 @@
         combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayAT, waySI));
         assertEquals(Combo.DIFFERENT, combo.getSelectedItem().value);
+
+        Combo.PROP_FILL_DEFAULT.put(true);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, way));
+        assertEquals("AT", combo.getSelectedItem().value);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayTagged));
+        assertEquals("AT", combo.getSelectedItem().value);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayAT));
+        assertEquals("AT", combo.getSelectedItem().value);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, waySI));
+        assertEquals("SI", combo.getSelectedItem().value);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayAT, waySI));
+        assertEquals(Combo.DIFFERENT, combo.getSelectedItem().value);
+        Combo.PROP_FILL_DEFAULT.put(false);
         combo.default_ = null;
 
@@ -104 +118 @@
         combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayAT, waySI));
         assertEquals(Combo.DIFFERENT, combo.getSelectedItem().value);
+        combo.use_last_as_default = 0;
 
         KeyedItem.LAST_VALUES.clear();