trying to have a better coverage for PlaySound action

libetl · Oct 6, 2016 · 8f65efc · 8f65efc
1 parent 174e580
commit 8f65efc
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 115 deletions.
diff --git a/...main/java/org/toilelibre/libe/soundtransform/actions/notes/ImportAPackIntoTheLibrary.java b/...main/java/org/toilelibre/libe/soundtransform/actions/notes/ImportAPackIntoTheLibrary.java
@@ -4,19 +4,11 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
 import org.toilelibre.libe.soundtransform.model.library.Library;
 import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.library.pack.Pack;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public class ImportAPackIntoTheLibrary {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/play/PlaySound.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/play/PlaySound.java
@@ -5,25 +5,15 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
 import org.toilelibre.libe.soundtransform.model.converted.spectrum.Spectrum;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
-import org.toilelibre.libe.soundtransform.model.logging.Observer;
 import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public class PlaySound {
 
-    private final PlayObjectService playSound;
+    private final PlayObjectService<?> playSound;
 
     public PlaySound () {
         this.playSound = ApplicationInjector.$.select (PlayObjectService.class);

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/record/RecordSound.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/record/RecordSound.java
@@ -4,26 +4,16 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
-import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
 import org.toilelibre.libe.soundtransform.model.record.AmplitudeObserver;
 import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public class RecordSound {
 
-    private final RecordSoundService recordSound;
+    private final RecordSoundService<?> recordSound;
 
     public RecordSound () {
         this.recordSound = ApplicationInjector.$.select (RecordSoundService.class);

diff --git a/...java/org/toilelibre/libe/soundtransform/actions/transform/AddStreamInfoToInputStream.java b/...java/org/toilelibre/libe/soundtransform/actions/transform/AddStreamInfoToInputStream.java
@@ -4,24 +4,15 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
 import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class AddStreamInfoToInputStream {
 
-    private AudioFileService audioFile;
+    private AudioFileService<?> audioFile;
 
     public AddStreamInfoToInputStream (final Observer... observers) {
         this.audioFile = (AudioFileService<?>) ApplicationInjector.$.select (AudioFileService.class).setObservers (observers);

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/AppendSound.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/AppendSound.java
@@ -2,19 +2,9 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
-import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class AppendSound {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ApplySoundTransform.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ApplySoundTransform.java
@@ -3,18 +3,9 @@
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
 import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.transform.SoundTransform;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class ApplySoundTransform {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ChangeLoudestFreqs.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ChangeLoudestFreqs.java
@@ -4,18 +4,9 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
 import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class ChangeLoudestFreqs {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ChangeSoundFormat.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ChangeSoundFormat.java
@@ -3,18 +3,8 @@
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
 import org.toilelibre.libe.soundtransform.model.converted.FormatInfo;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
-import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public class ChangeSoundFormat {

diff --git a/...ain/java/org/toilelibre/libe/soundtransform/actions/transform/ConvertFromInputStream.java b/...ain/java/org/toilelibre/libe/soundtransform/actions/transform/ConvertFromInputStream.java
@@ -4,20 +4,11 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
 import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class ConvertFromInputStream {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ConvertToInputStream.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ConvertToInputStream.java
@@ -5,20 +5,12 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
 import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
 import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class ConvertToInputStream {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ExportAFile.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/ExportAFile.java
@@ -5,18 +5,9 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
 import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
-import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public final class ExportAFile {

diff --git a/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/GetStreamInfo.java b/src/main/java/org/toilelibre/libe/soundtransform/actions/transform/GetStreamInfo.java
@@ -4,19 +4,10 @@
 
 import org.toilelibre.libe.soundtransform.actions.Action;
 import org.toilelibre.libe.soundtransform.ioc.ApplicationInjector;
-import org.toilelibre.libe.soundtransform.model.converted.sound.CallTransformService;
-import org.toilelibre.libe.soundtransform.model.converted.sound.ModifySoundService;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
-import org.toilelibre.libe.soundtransform.model.freqs.LoudestFreqsService;
-import org.toilelibre.libe.soundtransform.model.inputstream.AudioFileService;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
-import org.toilelibre.libe.soundtransform.model.inputstream.fromsound.SoundToInputStreamService;
 import org.toilelibre.libe.soundtransform.model.inputstream.readsound.InputStreamToSoundService;
-import org.toilelibre.libe.soundtransform.model.library.Library;
-import org.toilelibre.libe.soundtransform.model.library.pack.ImportPackService;
 import org.toilelibre.libe.soundtransform.model.logging.Observer;
-import org.toilelibre.libe.soundtransform.model.play.PlayObjectService;
-import org.toilelibre.libe.soundtransform.model.record.RecordSoundService;
 
 @Action
 public class GetStreamInfo {

diff --git a/src/test/java/org/toilelibre/libe/soundtransform/BlackBoxTest.java b/src/test/java/org/toilelibre/libe/soundtransform/BlackBoxTest.java
@@ -11,9 +11,9 @@
 import org.toilelibre.libe.soundtransform.actions.play.PlaySound;
 import org.toilelibre.libe.soundtransform.actions.transform.ApplySoundTransform;
 import org.toilelibre.libe.soundtransform.actions.transform.ConvertFromInputStream;
+import org.toilelibre.libe.soundtransform.actions.transform.ConvertToInputStream;
 import org.toilelibre.libe.soundtransform.actions.transform.ExportAFile;
 import org.toilelibre.libe.soundtransform.actions.transform.GetStreamInfo;
-import org.toilelibre.libe.soundtransform.actions.transform.ConvertToInputStream;
 import org.toilelibre.libe.soundtransform.infrastructure.service.observer.Slf4jObserver;
 import org.toilelibre.libe.soundtransform.ioc.SoundTransformTest;
 import org.toilelibre.libe.soundtransform.model.converted.sound.Sound;
@@ -22,6 +22,7 @@
 import org.toilelibre.libe.soundtransform.model.converted.spectrum.Spectrum;
 import org.toilelibre.libe.soundtransform.model.exception.SoundTransformException;
 import org.toilelibre.libe.soundtransform.model.inputstream.StreamInfo;
+import org.toilelibre.libe.soundtransform.model.play.PlayObjectException;
 
 public class BlackBoxTest extends SoundTransformTest {
     private final ClassLoader classLoader = Thread.currentThread ().getContextClassLoader ();
@@ -37,7 +38,11 @@ public void callPlaySoundFromOutside () throws SoundTransformException {
         Sound sound = new ConvertFromInputStream ().fromInputStream (is);
         final SoundToSpectrumsSoundTransform sound2Spectrums = new SoundToSpectrumsSoundTransform ();
         final Spectrum<Serializable> [][] spectrums = new ApplySoundTransform ().apply (sound.getChannels (), sound2Spectrums);
-        new PlaySound ().play (spectrums [0] [0], new Object (), 0);
+        try {
+            new PlaySound ().play (spectrums [0] [0], new Object (), 0);
+        } catch (PlayObjectException poe) {
+
+        }
     }
 
     @Test