Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialogTest.java	(revision 9849)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialogTest.java	(revision 9849)
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.tags;
+
+import static org.junit.Assert.assertEquals;
+
+import java.beans.PropertyChangeEvent;
+
+import javax.swing.JSplitPane;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.AutoAdjustingSplitPane;
+
+/**
+ * Unit tests of {@link CombinePrimitiveResolverDialog} class.
+ */
+public class CombinePrimitiveResolverDialogTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void init() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link CombinePrimitiveResolverDialog.AutoAdjustingSplitPane} class.
+     */
+    @Test
+    public void testAutoAdjustingSplitPane() {
+        AutoAdjustingSplitPane pane = new CombinePrimitiveResolverDialog.AutoAdjustingSplitPane(JSplitPane.VERTICAL_SPLIT);
+        assertEquals(-1, pane.getDividerLocation());
+        assertEquals(0, pane.getHeight());
+        pane.propertyChange(new PropertyChangeEvent(this, null, null, null));
+        pane.propertyChange(new PropertyChangeEvent(this, JSplitPane.DIVIDER_LOCATION_PROPERTY, null, 50));
+        assertEquals(-1, pane.getDividerLocation());
+        pane.setSize(10, 10);
+        assertEquals(10, pane.getHeight());
+        pane.propertyChange(new PropertyChangeEvent(this, JSplitPane.DIVIDER_LOCATION_PROPERTY, null, 50));
+        pane.ancestorResized(null);
+        pane.ancestorMoved(null);
+        assertEquals(50, pane.getDividerLocation());
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialogTest.java	(revision 9849)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialogTest.java	(revision 9849)
@@ -0,0 +1,61 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.tags;
+
+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 java.awt.Insets;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog.StatisticsInfo;
+import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog.StatisticsInfoTable;
+import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog.StatisticsTableModel;
+
+/**
+ * Unit tests of {@link PasteTagsConflictResolverDialog} class.
+ */
+public class PasteTagsConflictResolverDialogTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void init() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test of {@link PasteTagsConflictResolverDialog#PANE_TITLES}.
+     */
+    @Test
+    public void testPaneTitles() {
+        assertNotNull(PasteTagsConflictResolverDialog.PANE_TITLES);
+        assertNotNull(PasteTagsConflictResolverDialog.PANE_TITLES.get(OsmPrimitiveType.NODE));
+        assertNotNull(PasteTagsConflictResolverDialog.PANE_TITLES.get(OsmPrimitiveType.WAY));
+        assertNotNull(PasteTagsConflictResolverDialog.PANE_TITLES.get(OsmPrimitiveType.RELATION));
+    }
+
+    /**
+     * Unit test of {@link PasteTagsConflictResolverDialog.StatisticsInfoTable} class.
+     */
+    @Test
+    public void testStatisticsInfoTable() {
+        StatisticsInfo info = new StatisticsInfo();
+        StatisticsTableModel model = new StatisticsTableModel();
+        assertFalse(model.isCellEditable(0, 0));
+        assertEquals(1, model.getRowCount());
+        model.append(info);
+        assertEquals(2, model.getRowCount());
+        assertEquals("Paste ...", model.getValueAt(0, 0));
+        assertEquals(info, model.getValueAt(1, 0));
+        assertNull(model.getValueAt(2, 0));
+        model.reset();
+        assertEquals(1, model.getRowCount());
+        assertEquals(new Insets(0, 0, 20, 0), new StatisticsInfoTable(model).getInsets());
+    }
+}