Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/test/java/device/usbPlayer/UsbPlayerTest.java

src/test/java/device/usbPlayer/UsbPlayerTest.java

@@ -5,7 +5,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.ArrayList;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -15,20 +14,25 @@ class UsbPlayerTest {
 
     UsbPlayer up = new UsbPlayer();
 
-
-    @Test
-    void louder_test() {
-        up.setLautstaerke(40);
-        up.louder();
-        assertThat(up.getLautstaerke()).isEqualTo(41);
+    @ParameterizedTest
+    @MethodSource("quieterOptions")
+    void quieterTest(String testName, UsbPlayer inputPlay, int expectedResult) {
+        int volumeNum = inputPlay.getLautstaerke();
+        assertThat(volumeNum).describedAs(testName).isEqualTo(expectedResult);
     }
 
-    @Test
-    void quieter_test() {
-        up.setLautstaerke(40);
-        up.quieter();
-        assertThat(up.getLautstaerke()).isEqualTo(39);
+    static Stream<Arguments> quieterOptions() {
+        UsbPlayer up1 = new UsbPlayer();
+        up1.quieter();
+        UsbPlayer up2 = new UsbPlayer();
+        up2.setLautstaerke(10);
+        up2.quieter();
+        return Stream.of(
+                Arguments.of("Volume must stay 0 ", up1, 0),
+                Arguments.of("Volume must be 9 ", up2, 9)
+        );
     }
+
 /*
     @Test
     void getVolume() {
@@ -52,41 +56,10 @@ class UsbPlayerTest {
 
     @Test
     void chooseOption() {
-    }*/
-
-    @ParameterizedTest
-    @MethodSource("PlayOptions")
-    void playTest(String testName, UsbPlayer inputPlay, String expectedResult) {
-        String playState = inputPlay.play();
-        assertThat(playState).describedAs(testName).isEqualTo(expectedResult);
     }
 
-    static Stream<Arguments> PlayOptions() {
-        UsbPlayer up1 = new UsbPlayer();
-        UsbPlayer up8 = new UsbPlayer();
-        up8.setPlayTrack("");
-        UsbPlayer up2 = new UsbPlayer();
-        ArrayList<String> l = new ArrayList<String>();
-        l.add("a.mp3");
-        l.add("b.mp3");
-        l.add("c.gif");
-        up2.setPlaylist(l);
-        UsbPlayer up3 = new UsbPlayer();
-        ArrayList<String> Pl = new ArrayList<String>();
-        up3.setPlaylist(Pl);
-        UsbPlayer up6 = new UsbPlayer();
-        up6.setDefect(true);
-        UsbPlayer up7 = new UsbPlayer();
-        up7.setConnected(false);
-
-
-        return Stream.of(
-                Arguments.of("All right : ", up1, "USB : connected,working,have a list,Audio,point to a track."),
-                Arguments.of("No first Track : ", up8, "USB : connected,working,have a list,Audio,doesn't point to a track."),
-                Arguments.of("No Audio Files : ", up2, "USB : connected,working,have a list,not Audio."),
-                Arguments.of("No list of tracks : ", up3, "USB : connected,working,have no list."),
-                Arguments.of("connected , not working : ", up6, "USB : connected,not working."),
-                Arguments.of("not connected : ", up7, "not connected.")
-        );
+    @Test
+    void play() {
     }
+ */
 }