Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 9606)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 9607)
@@ -6,8 +6,15 @@
 
 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,3 +46,22 @@
         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);
+    }
 }