Index: /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java	(revision 12327)
+++ /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioPlayerTest.java	(revision 12327)
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.audio;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Unit tests of {@link AudioPlayer} class.
+ */
+@Ignore("unresolved sporadic deadlock - see #13809")
+public class AudioPlayerTest {
+
+    // We play wav files of about 4 seconds + pause, so define timeout at 16 seconds
+    private static final long MAX_DURATION = 16000;
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Test method for {@code AudioPlayer#play(URL)}
+     * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
+     * @throws MalformedURLException wrong URL
+     */
+    @Test(timeout = 4*MAX_DURATION)
+    public void testPlay() throws MalformedURLException, Exception {
+        File wav1 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav"));
+        File wav2 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121557.wav"));
+
+        for (File w : new File[] {wav1, wav2}) {
+            System.out.println("Playing " + w.toPath());
+            URL url = w.toURI().toURL();
+            long start = System.currentTimeMillis();
+            AudioPlayer.play(url);
+            assertTrue(AudioPlayer.playing());
+            assertFalse(AudioPlayer.paused());
+            AudioPlayer.pause();
+            assertFalse(AudioPlayer.playing());
+            assertTrue(AudioPlayer.paused());
+            AudioPlayer.play(url, AudioPlayer.position());
+            while (AudioPlayer.playing() && (System.currentTimeMillis() - start) < MAX_DURATION) {
+                Thread.sleep(500);
+            }
+            long duration = System.currentTimeMillis() - start;
+            System.out.println("Play finished after " + Utils.getDurationString(duration));
+            assertTrue(duration < MAX_DURATION);
+            AudioPlayer.reset();
+            Thread.sleep(1000); // precaution, see #13809
+        }
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java	(revision 12327)
+++ /trunk/test/unit/org/openstreetmap/josm/io/audio/AudioUtilTest.java	(revision 12327)
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.audio;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+
+/**
+ * Unit tests of {@link AudioUtil} class.
+ */
+public class AudioUtilTest {
+
+    private static final double EPSILON = 1e-11;
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Test method for {@code AudioUtil#getCalibratedDuration(File)}
+     */
+    @Test
+    public void testGetCalibratedDuration() {
+        assertEquals(0.0, AudioUtil.getCalibratedDuration(new File("invalid_file")), EPSILON);
+        File wav1 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav"));
+        assertEquals(4.8317006802721085, AudioUtil.getCalibratedDuration(wav1), EPSILON);
+        File wav2 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121557.wav"));
+        assertEquals(4.924580498866213, AudioUtil.getCalibratedDuration(wav2), EPSILON);
+    }
+}
Index: unk/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/AudioPlayerTest.java	(revision 12326)
+++ 	(revision )
@@ -1,65 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.TestUtils;
-
-/**
- * Unit tests of {@link AudioPlayer} class.
- */
-@Ignore("unresolved sporadic deadlock - see #13809")
-public class AudioPlayerTest {
-
-    // We play wav files of about 4 seconds + pause, so define timeout at 16 seconds
-    private static final long MAX_DURATION = 16000;
-
-    /**
-     * Setup test.
-     */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
-
-    /**
-     * Test method for {@code AudioPlayer#play(URL)}
-     * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
-     * @throws MalformedURLException wrong URL
-     */
-    @Test(timeout = 4*MAX_DURATION)
-    public void testPlay() throws MalformedURLException, Exception {
-        File wav1 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav"));
-        File wav2 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121557.wav"));
-
-        for (File w : new File[] {wav1, wav2}) {
-            System.out.println("Playing " + w.toPath());
-            URL url = w.toURI().toURL();
-            long start = System.currentTimeMillis();
-            AudioPlayer.play(url);
-            assertTrue(AudioPlayer.playing());
-            assertFalse(AudioPlayer.paused());
-            AudioPlayer.pause();
-            assertFalse(AudioPlayer.playing());
-            assertTrue(AudioPlayer.paused());
-            AudioPlayer.play(url, AudioPlayer.position());
-            while (AudioPlayer.playing() && (System.currentTimeMillis() - start) < MAX_DURATION) {
-                Thread.sleep(500);
-            }
-            long duration = System.currentTimeMillis() - start;
-            System.out.println("Play finished after " + Utils.getDurationString(duration));
-            assertTrue(duration < MAX_DURATION);
-            AudioPlayer.reset();
-            Thread.sleep(1000); // precaution, see #13809
-        }
-    }
-}
Index: unk/test/unit/org/openstreetmap/josm/tools/AudioUtilTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/AudioUtilTest.java	(revision 12326)
+++ 	(revision )
@@ -1,39 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.TestUtils;
-
-/**
- * Unit tests of {@link AudioUtil} class.
- */
-public class AudioUtilTest {
-
-    private static final double EPSILON = 1e-11;
-
-    /**
-     * Setup test.
-     */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
-
-    /**
-     * Test method for {@code AudioUtil#getCalibratedDuration(File)}
-     */
-    @Test
-    public void testGetCalibratedDuration() {
-        assertEquals(0.0, AudioUtil.getCalibratedDuration(new File("invalid_file")), EPSILON);
-        File wav1 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav"));
-        assertEquals(4.8317006802721085, AudioUtil.getCalibratedDuration(wav1), EPSILON);
-        File wav2 = new File(TestUtils.getRegressionDataFile(6851, "20111003_121557.wav"));
-        assertEquals(4.924580498866213, AudioUtil.getCalibratedDuration(wav2), EPSILON);
-    }
-}