Changeset 9814 in josm for trunk


Ignore:
Timestamp:
2016-02-17T19:37:33+01:00 (9 years ago)
Author:
Don-vip
Message:

see #12229 - revert r9785 and r9803: problem with audio unit test was unrelated

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

    r9803 r9814  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import java.awt.GraphicsEnvironment;
    67import java.io.IOException;
    78import java.net.URL;
    … …  
    378379            msg = tr(msg);
    379380        Main.error(msg);
    380         //if (!GraphicsEnvironment.isHeadless()) {
     381        if (!GraphicsEnvironment.isHeadless()) {
    381382            JOptionPane.showMessageDialog(Main.parent,
    382383                    "<html><p>" + msg + "</p></html>",
    383384                    tr("Error playing sound"), JOptionPane.ERROR_MESSAGE);
    384         //}
     385        }
    385386    }
    386387}

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

    r9785 r9814  
    88
    99import org.junit.BeforeClass;
    10 import org.junit.Ignore;
    1110import org.junit.Test;
    1211import org.openstreetmap.josm.JOSMFixture;
    … …  
    3534     */
    3635    @Test
    37     @Ignore("looks like it makes AudioPlayerTest.testPlay fail")
    3836    public void testAudioMarker() throws MalformedURLException {
    3937        URL url = new URL("file://something.wav");

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

    r9785 r9814  
    66
    77import org.junit.BeforeClass;
    8 import org.junit.Ignore;
    98import org.junit.Test;
    109import org.openstreetmap.josm.JOSMFixture;
    … …  
    2928     */
    3029    @Test
    31     @Ignore("looks like it makes AudioPlayerTest.testPlay fail")
    3230    public void testPlayHeadMarker() {
    3331        PlayHeadMarker marker = PlayHeadMarker.create();
Note: See TracChangeset for help on using the changeset viewer.