clean up AudioManager at end

JMRI · Nov 11, 2019 · e21e5ca · e21e5ca
1 parent ff1479e
commit e21e5ca
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/java/test/jmri/jmrit/vsdecoder/EngineSoundTest.java b/java/test/jmri/jmrit/vsdecoder/EngineSoundTest.java
@@ -26,6 +26,9 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        // this created an audio manager, clean that up
+        jmri.InstanceManager.getDefault(jmri.AudioManager.class).cleanup();
+
         jmri.util.JUnitAppender.suppressWarnMessage("Initialised Null audio system - no sounds will be available.");
         JUnitUtil.tearDown();
     }

diff --git a/java/test/jmri/jmrit/vsdecoder/NotchSoundTest.java b/java/test/jmri/jmrit/vsdecoder/NotchSoundTest.java
@@ -43,6 +43,10 @@ public void setUp() {
     @After
     public void tearDown() {
         uut = null;
+
+        // this created an audio manager, clean that up
+        jmri.InstanceManager.getDefault(jmri.AudioManager.class).cleanup();
+
         jmri.util.JUnitAppender.suppressErrorMessage("Unhandled audio format type 0");
         jmri.util.JUnitAppender.suppressWarnMessage("Initialised Null audio system - no sounds will be available.");
         JUnitUtil.tearDown();

diff --git a/java/test/jmri/jmrit/vsdecoder/NotchTransitionTest.java b/java/test/jmri/jmrit/vsdecoder/NotchTransitionTest.java
@@ -43,6 +43,10 @@ public void setUp() {
     @After
     public void tearDown() {
         uut = null;
+
+        // this created an audio manager, clean that up
+        jmri.InstanceManager.getDefault(jmri.AudioManager.class).cleanup();
+
         jmri.util.JUnitAppender.suppressErrorMessage("Unhandled audio format type 0");
         jmri.util.JUnitAppender.suppressWarnMessage("Initialised Null audio system - no sounds will be available.");
         JUnitUtil.tearDown();

diff --git a/java/test/jmri/jmrit/vsdecoder/VSDConfigPanelTest.java b/java/test/jmri/jmrit/vsdecoder/VSDConfigPanelTest.java
@@ -28,6 +28,9 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        // this created an audio manager, clean that up
+        jmri.InstanceManager.getDefault(jmri.AudioManager.class).cleanup();
+
         jmri.util.JUnitAppender.suppressWarnMessage("Initialised Null audio system - no sounds will be available.");
         JUnitUtil.tearDown();
     }