Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditorTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditorTest.java	(revision 9945)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditorTest.java	(revision 9945)
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.pair.relation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.awt.Component;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.RelationMember;
+
+/**
+ * Unit tests of {@link RelationMemberTableCellEditor} class.
+ */
+public class RelationMemberTableCellEditorTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link RelationMemberTableCellEditor#RelationMemberTableCellEditor}.
+     */
+    @Test
+    public void testRelationMemberTableCellEditor() {
+        RelationMemberTableCellEditor editor = new RelationMemberTableCellEditor();
+        assertNull(editor.getTableCellEditorComponent(null, null, false, 0, 0));
+        Component component = editor.getTableCellEditorComponent(null, new RelationMember("foo", new Node()), false, 0, 0);
+        assertNotNull(component);
+        assertEquals("foo", editor.getCellEditorValue());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRendererTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRendererTest.java	(revision 9945)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRendererTest.java	(revision 9945)
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.pair.relation;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.swing.JTable;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.conflict.pair.ListRole;
+import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
+
+/**
+ * Unit tests of {@link RelationMemberTableCellRenderer} class.
+ */
+public class RelationMemberTableCellRendererTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link RelationMemberTableCellRenderer#RelationMemberTableCellRenderer}.
+     */
+    @Test
+    public void testRelationMemberTableCellRenderer() {
+        JTable table = new JTable(new NodeListMergeModel().new EntriesTableModel(ListRole.MY_ENTRIES));
+        RelationMember member = new RelationMember("foo", new Node());
+        RelationMemberTableCellRenderer r = new RelationMemberTableCellRenderer();
+        assertEquals(r, r.getTableCellRendererComponent(table, member, false, false, 0, 0));
+        assertEquals(r, r.getTableCellRendererComponent(table, member, false, false, 0, 1));
+        assertEquals(r, r.getTableCellRendererComponent(table, member, false, false, 0, 2));
+        assertEquals(r, r.getTableCellRendererComponent(table, member, false, false, 0, 3));
+    }
+}