Changeset 9607 in josm

Timestamp:

2016-01-24T04:05:06+01:00 (9 years ago)

Author:

Don-vip

Message:

ConflictDialog: fix findbugs issue, add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -512 +512 @@
     }
 
-    class ConflictPainter extends AbstractVisitor {
+    /**
+     * Paints conflicts.
+     */
+    public static class ConflictPainter extends AbstractVisitor {
         // Manage a stack of visited relations to avoid infinite recursion with cyclic relations (fix #7938)
         private final Set<Relation> visited = new HashSet<>();
@@ -529 +532 @@
         }
 
-        public void visit(Node n1, Node n2) {
+        private void visit(Node n1, Node n2) {
             Point p1 = nc.getPoint(n1);
             Point p2 = nc.getPoint(n2);

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java

@@ -6 +6 @@
 
 import java.awt.Color;
+import java.awt.image.BufferedImage;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.dialogs.ConflictDialog.ConflictPainter;
 
 /**
@@ -39 +46 @@
         assertEquals(Color.gray, ConflictDialog.getColor());
     }
+
+    /**
+     * Unit tests of {@link ConflictPainter} class.
+     */
+    @Test
+    public void testConflictPainter() {
+        ConflictPainter cp = new ConflictPainter(Main.map.mapView, new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics());
+        Node n1 = new Node(1, 1);
+        Node n2 = new Node(2, 1);
+        Way w = new Way(1, 1);
+        w.addNode(n1);
+        w.addNode(n2);
+        Relation r = new Relation(1, 1);
+        r.addMember(new RelationMember("outer", w));
+        cp.visit(n1);
+        cp.visit(n2);
+        cp.visit(w);
+        cp.visit(r);
+    }
 }