Changeset 9782 in josm for trunk

Timestamp:

2016-02-10T23:41:26+01:00 (9 years ago)

Author:

Don-vip

Message:

attempt to fix unit test

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
 import java.net.MalformedURLException;
-import java.net.URL;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.Extensions;
@@ -15 +16 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.AudioPlayer;
 
 /**
@@ -38 +40 @@
                 LatLon.ZERO,
                 null,
-                new URL("file://something.wav"),
+                new File(TestUtils.getRegressionDataFile(6851, "20111003_121226.wav")).toURI().toURL(),
                 new MarkerLayer(new GpxData(), null, null, null),
                 1d, 2d);
-        marker.actionPerformed(null);
+        try {
+            marker.actionPerformed(null);
+        } finally {
+            AudioPlayer.reset();
+        }
         assertEquals("2", marker.getText());
         WayPoint wpt = marker.convertToWayPoint();