Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java	(revision 9609)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java	(revision 9611)
@@ -52,5 +52,5 @@
     @Override
     public Point2D getPoint2D(EastNorth p) {
-        return new Point2D.Double(p.getX(), p.getY());
+        return p != null ? new Point2D.Double(p.getX(), p.getY()) : null;
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 9609)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 9611)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -54,5 +55,7 @@
         ConflictPainter cp = new ConflictPainter(Main.map.mapView, new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics());
         Node n1 = new Node(1, 1);
+        n1.setCoor(new LatLon(1, 1));
         Node n2 = new Node(2, 1);
+        n2.setCoor(new LatLon(2, 2));
         Way w = new Way(1, 1);
         w.addNode(n1);
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java	(revision 9609)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java	(revision 9611)
@@ -2,9 +2,20 @@
 package org.openstreetmap.josm.gui.preferences.plugin;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.plugins.PluginDownloadTask;
+import org.openstreetmap.josm.plugins.PluginInformation;
 
 /**
@@ -28,3 +39,49 @@
         assertNotNull(new PluginPreference.Factory().createPreferenceSetting());
     }
+
+    /**
+     * Unit test of {@link PluginPreference#buildDownloadSummary}.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testBuildDownloadSummary() throws Exception  {
+        final PluginInformation dummy = new PluginInformation(
+                new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+        assertEquals("", PluginPreference.buildDownloadSummary(
+                new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.<PluginInformation>emptyList(), "")));
+        assertEquals("", PluginPreference.buildDownloadSummary(
+                new PluginDownloadTask(NullProgressMonitor.INSTANCE, Arrays.asList(dummy), "")));
+        assertEquals("The following plugin has been downloaded <strong>successfully</strong>:<ul><li>dummy_plugin (31772)</li></ul>"+
+                     "Downloading the following plugin has <strong>failed</strong>:<ul><li>dummy_plugin</li></ul>",
+                PluginPreference.buildDownloadSummary(
+                        new PluginDownloadTask(NullProgressMonitor.INSTANCE, Arrays.asList(dummy), "") {
+                    @Override
+                    public Collection<PluginInformation> getFailedPlugins() {
+                        return Collections.singleton(dummy);
+                    }
+
+                    @Override
+                    public Collection<PluginInformation> getDownloadedPlugins() {
+                        return Collections.singleton(dummy);
+                    }
+                }));
+    }
+
+    /**
+     * Unit test of {@link PluginPreference#notifyDownloadResults}.
+     */
+    @Test
+    public void testNotifyDownloadResults() {
+        PluginDownloadTask task = new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.<PluginInformation>emptyList(), "");
+        PluginPreference.notifyDownloadResults(null, task, false);
+        PluginPreference.notifyDownloadResults(null, task, true);
+    }
+
+    /**
+     * Unit test of {@link PluginPreference#addGui}.
+     */
+    @Test
+    public void testAddGui() {
+        new PluginPreference.Factory().createPreferenceSetting().addGui(new PreferenceTabbedPane());
+    }
 }