Changeset 12045 in josm

Timestamp:

2017-05-03T13:50:39+02:00 (8 years ago)

Author:

michael2402

Message:

PropertiesMergerTest: Test that buttons have been added.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (3 diffs)
• gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -6 +6 @@
 
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Graphics2D;
 import java.io.File;
@@ -17 +18 @@
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.command.Command;
@@ -307 +310 @@
         }
     }
+
+    /**
+     * Get a descendant component by name.
+     * @param root The root component to start searching from.
+     * @param name The component name
+     * @return The component with that name or null if it does not exist.
+     * @since 12045
+     */
+    public static Component getComponentByName(Component root, String name) {
+        if (name.equals(root.getName())) {
+            return root;
+        } else if (root instanceof Container) {
+            Container container = (Container) root;
+            return Stream.of(container.getComponents())
+                    .map(child -> getComponentByName(child, name))
+                    .filter(Objects::nonNull)
+                    .findFirst().orElse(null);
+        } else {
+            return null;
+        }
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -6 +6 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -27 +28 @@
     @Test
     public void testPropertiesMerger() {
-        assertNotNull(new PropertiesMerger());
+        PropertiesMerger merger = new PropertiesMerger();
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmycoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheircoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidecoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmydeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheirdeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidedeletedstate"));
     }
 }