Index: trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/JpgImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/JpgImporterTest.java	(revision 12671)
+++ trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/JpgImporterTest.java	(revision 12671)
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io.importexport;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link JpgImporter} class.
+ */
+public class JpgImporterTest {
+
+    /**
+     * Setup test
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14868">Bug #14868</a>.
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testTicket14868() throws IOException {
+        List<File> files = new ArrayList<>();
+        JpgImporter.addRecursiveFiles(files, new HashSet<>(), Arrays.asList(
+                new File("foo.jpg"), new File("foo.jpeg")
+                ), NullProgressMonitor.INSTANCE);
+        assertEquals(2, files.size());
+        assertEquals("foo.jpg", files.get(0).getName());
+        assertEquals("foo.jpeg", files.get(1).getName());
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java	(revision 12671)
+++ trunk/test/unit/org/openstreetmap/josm/gui/io/importexport/NoteImporterTest.java	(revision 12671)
@@ -0,0 +1,36 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io.importexport;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+/**
+ * Unit tests of {@link NoteImporter} class.
+ */
+public class NoteImporterTest {
+
+    /**
+     * Use the test rules to remove any layers and reset state.
+     */
+    @Rule
+    public final JOSMTestRules rules = new JOSMTestRules();
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>.
+     */
+    @Test
+    public void testTicket12531() {
+        MainApplication.getLayerManager().resetState();
+        assertNull(MainApplication.getMap());
+        assertTrue(new NoteImporter().importDataHandleExceptions(
+                new File(TestUtils.getRegressionDataFile(12531, "notes.osn")), null));
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/io/JpgImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/JpgImporterTest.java	(revision 12670)
+++ 	(revision )
@@ -1,46 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Unit tests of {@link JpgImporter} class.
- */
-public class JpgImporterTest {
-
-    /**
-     * Setup test
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
-    /**
-     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14868">Bug #14868</a>.
-     * @throws IOException if an error occurs
-     */
-    @Test
-    public void testTicket14868() throws IOException {
-        List<File> files = new ArrayList<>();
-        JpgImporter.addRecursiveFiles(files, new HashSet<>(), Arrays.asList(
-                new File("foo.jpg"), new File("foo.jpeg")
-                ), NullProgressMonitor.INSTANCE);
-        assertEquals(2, files.size());
-        assertEquals("foo.jpg", files.get(0).getName());
-        assertEquals("foo.jpeg", files.get(1).getName());
-    }
-}
Index: trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java	(revision 12670)
+++ 	(revision )
@@ -1,36 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-/**
- * Unit tests of {@link NoteImporter} class.
- */
-public class NoteImporterTest {
-
-    /**
-     * Use the test rules to remove any layers and reset state.
-     */
-    @Rule
-    public final JOSMTestRules rules = new JOSMTestRules();
-
-    /**
-     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>.
-     */
-    @Test
-    public void testTicket12531() {
-        MainApplication.getLayerManager().resetState();
-        assertNull(MainApplication.getMap());
-        assertTrue(new NoteImporter().importDataHandleExceptions(
-                new File(TestUtils.getRegressionDataFile(12531, "notes.osn")), null));
-    }
-}