Index: /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java	(revision 11020)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java	(revision 11020)
@@ -0,0 +1,36 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link MinimapDialog} class.
+ */
+public class MinimapDialogTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().commands();
+
+    /**
+     * Unit test of {@link MinimapDialog} class.
+     */
+    @Test
+    public void testMinimapDialog() {
+        MinimapDialog dlg = new MinimapDialog();
+        dlg.showDialog();
+        assertTrue(dlg.isVisible());
+        dlg.hideDialog();
+        assertFalse(dlg.isVisible());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java	(revision 11020)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModelTest.java	(revision 11020)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link ChangesetCacheTableColumnModel} class.
+ */
+public class ChangesetCacheTableColumnModelTest {
+
+    /**
+     * Setup tests
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Unit test of {@link ChangesetCacheTableColumnModel}.
+     */
+    @Test
+    public void testChangesetCacheTableColumnModel() {
+        assertNotNull(new ChangesetCacheTableColumnModel());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java	(revision 11020)
+++ /trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetParserTest.java	(revision 11020)
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link OsmChangesetParser} class.
+ */
+public class OsmChangesetParserTest {
+
+    private static final String BEGIN =
+        "<osm version=\"0.6\" generator=\"OpenStreetMap server\" copyright=\"OpenStreetMap and contributors\" " +
+                "attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">" +
+            "<changeset id=\"36749147\" user=\"kesler\" uid=\"13908\" created_at=\"2016-01-22T21:55:37Z\" "+
+                "closed_at=\"2016-01-22T21:56:39Z\"  open=\"false\" min_lat=\"36.6649211\" min_lon=\"55.377015\" max_lat=\"38.1490357\" " +
+                "max_lon=\"60.3766983\" comments_count=\"2\">" +
+            "<tag k=\"created_by\" v=\"JOSM/1.5 (9329 en)\"/>" +
+            "<tag k=\"comment\" v=\"Fixing errors in North Khorasan\"/>";
+
+    private static final String DISCUSSION =
+        "<discussion>" +
+        "<comment date=\"2016-09-13T13:28:20Z\" uid=\"1733149\" user=\"Jean Passepartout\">" +
+            "<text>" +
+                "Hi keeler, Thank you for contributing to OpenStreetMap. " +
+                "I noticed you added this way: http://www.openstreetmap.org/way/363580576, " +
+                "but it is a duplicate of another way, with a different name. "+
+                "Could you review and fix this? Please let me know if you need any help. " +
+                "Thank you and Happy Mapping! Jean Passepartout" +
+            "</text>" +
+        "</comment>" +
+        "<comment date=\"2016-09-17T21:58:57Z\" uid=\"13908\" user=\"kesler\">" +
+            "<text>" +
+                "Hi Jean, Thanks for your attempts to fix Iran map errors and please excuse me for delayed reply. "+
+                "I fixed my mistake and developed Esfarayen town map more in changeset https://www.openstreetmap.org/changeset/42234849. " +
+                "Please feel free and don't hesitate to tell me every big or even minor mis-mapped area in Iran. Thaks." +
+            "</text>" +
+        "</comment>" +
+        "</discussion>";
+
+    private static final String END =
+        "</changeset>" +
+        "</osm>";
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
+    private static List<Changeset> parse(String cs) throws IllegalDataException {
+        return OsmChangesetParser.parse(new ByteArrayInputStream(cs.getBytes(StandardCharsets.UTF_8)), NullProgressMonitor.INSTANCE);
+    }
+
+    /**
+     * Parse single changeset - without discussion
+     * @throws IllegalDataException in case of error
+     */
+    @Test
+    public void testParseWithoutDiscussion() throws IllegalDataException {
+        // http://api.openstreetmap.org/api/0.6/changeset/36749147
+        Changeset cs = parse(BEGIN + END).iterator().next();
+        assertEquals(2, cs.getCommentsCount());
+        assertTrue(cs.getDiscussion().isEmpty());
+    }
+
+    /**
+     * Parse single changeset - with discussion
+     * @throws IllegalDataException in case of error
+     */
+    @Test
+    public void testParseWithDiscussion() throws IllegalDataException {
+        // http://api.openstreetmap.org/api/0.6/changeset/36749147?include_discussion=true
+        Changeset cs = parse(BEGIN + DISCUSSION + END).iterator().next();
+        assertEquals(2, cs.getCommentsCount());
+        assertEquals(2, cs.getDiscussion().size());
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java	(revision 11020)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSettingsPanelTest.java	(revision 11020)
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests the {@link BugReportSettingsPanel} class.
+ */
+public class BugReportSettingsPanelTest {
+
+    /**
+     * Setup test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Test {@link BugReportSettingsPanel}
+     */
+    @Test
+    public void testBugReportSettingsPanel() {
+        assertNotNull(new BugReportSettingsPanel(new BugReport(BugReport.intercept(new Exception()))));
+    }
+}