Index: /trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java	(revision 10130)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java	(revision 10130)
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.correction.RoleCorrection;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+
+/**
+ * Unit tests of {@link RoleCorrectionTable} class.
+ */
+public class RoleCorrectionTableTest {
+
+    /**
+     * Setup tests
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Test of {@link RoleCorrectionTable#RoleCorrectionTable}.
+     */
+    @Test
+    public void testRoleCorrectionTable() {
+        Relation r = new Relation();
+        RelationMember member = new RelationMember("foo", new Node());
+        r.addMember(member);
+        RoleCorrectionTable t = new RoleCorrectionTable(Arrays.asList(new RoleCorrection(r, 0, member, "bar")));
+        assertNotNull(t.getCellRenderer(0, 0));
+        assertNotNull(t.getCellRenderer(0, 1));
+        assertNotNull(t.getCellRenderer(0, 2));
+        assertNotNull(t.getCellRenderer(0, 3));
+        RoleCorrectionTableModel model = t.getCorrectionTableModel();
+        assertEquals(1, model.getCorrections().size());
+        assertEquals(1, model.getRowCount());
+        assertEquals(3, model.getApplyColumn());
+        assertTrue(model.getApply(0));
+        assertEquals(String.class, model.getColumnClass(0));
+        assertEquals(Boolean.class, model.getColumnClass(3));
+        assertEquals("Relation", model.getColumnName(0));
+        assertEquals("Old role", model.getColumnName(1));
+        assertEquals("New role", model.getColumnName(2));
+        assertEquals("Apply?", model.getColumnName(3));
+        assertNull(model.getColumnName(4));
+        assertFalse(model.isCellEditable(0, 0));
+        assertTrue(model.isCellEditable(0, 3));
+        assertEquals("relation (0, 1 member)", model.getValueAt(0, 0));
+        assertEquals("foo", model.getValueAt(0, 1));
+        assertEquals("bar", model.getValueAt(0, 2));
+        assertEquals(Boolean.TRUE, model.getValueAt(0, 3));
+        assertNull(model.getValueAt(0, 4));
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java	(revision 10130)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java	(revision 10130)
@@ -0,0 +1,62 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.correction.TagCorrection;
+
+/**
+ * Unit tests of {@link TagCorrectionTable} class.
+ */
+public class TagCorrectionTableTest {
+
+    /**
+     * Setup tests
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Test of {@link TagCorrectionTable#TagCorrectionTable}.
+     */
+    @Test
+    public void testTagCorrectionTable() {
+        TagCorrectionTable t = new TagCorrectionTable(Arrays.asList(new TagCorrection("foo", "bar", "foo", "baz")));
+        assertNotNull(t.getCellRenderer(0, 0));
+        assertNotNull(t.getCellRenderer(0, 1));
+        assertNotNull(t.getCellRenderer(0, 2));
+        assertNotNull(t.getCellRenderer(0, 3));
+        TagCorrectionTableModel model = t.getCorrectionTableModel();
+        assertEquals(1, model.getCorrections().size());
+        assertEquals(1, model.getRowCount());
+        assertEquals(4, model.getApplyColumn());
+        assertTrue(model.getApply(0));
+        assertEquals(String.class, model.getColumnClass(0));
+        assertEquals(Boolean.class, model.getColumnClass(4));
+        assertEquals("Old key", model.getColumnName(0));
+        assertEquals("Old value", model.getColumnName(1));
+        assertEquals("New key", model.getColumnName(2));
+        assertEquals("New value", model.getColumnName(3));
+        assertEquals("Apply?", model.getColumnName(4));
+        assertNull(model.getColumnName(5));
+        assertFalse(model.isCellEditable(0, 0));
+        assertTrue(model.isCellEditable(0, 4));
+        assertEquals("foo", model.getValueAt(0, 0));
+        assertEquals("bar", model.getValueAt(0, 1));
+        assertEquals("foo", model.getValueAt(0, 2));
+        assertEquals("baz", model.getValueAt(0, 3));
+        assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
+        assertNull(model.getValueAt(0, 5));
+    }
+}