Browse Source

Merge commit '0e9662561a8188138ec8e83fbac713782c5d980b' into HEAD

feature-pr-RadioPlayer-getItemList
Jenkins 3 years ago
parent
commit
ec66817f43
  1. 7
      src/main/java/device/Device.java
  2. 10
      src/main/java/device/cdPlayer/CDPlayer.java
  3. 10
      src/main/java/device/radioPlayer/RadioPlayer.java
  4. 10
      src/main/java/device/usbPlayer/UsbPlayer.java
  5. 15
      src/test/java/device/cdPlayer/CDPlayerTest.java

7
src/main/java/device/Device.java

@ -7,6 +7,7 @@ public interface Device {
int getVolume();
void next();
void prev();
String play();
//get deviceName, Album and current Item
String getInfoText();
//get a list of public methods
@ -15,6 +16,8 @@ public interface Device {
String chooseItem(int itemNr);
// get the actual album
String[] getItemList();
String play();
//mute the Volume and returns an Info.
String mute();
//unmute the Volume and returns an Info.
String unmute();
}

10
src/main/java/device/cdPlayer/CDPlayer.java

@ -90,6 +90,16 @@ public class CDPlayer implements Device {
return loadedCD.getPlayList();
}
@Override
public String mute() {
return null;
}
@Override
public String unmute() {
return null;
}
@Override
public String play() {
if(isCdFlapOpen()){

10
src/main/java/device/radioPlayer/RadioPlayer.java

@ -166,6 +166,16 @@ public class RadioPlayer implements Device {
return null;
}
@Override
public String mute() {
return null;
}
@Override
public String unmute() {
return null;
}
@Override
public String play() {

10
src/main/java/device/usbPlayer/UsbPlayer.java

@ -160,6 +160,16 @@ public class UsbPlayer implements Device {
return null;
}
@Override
public String mute() {
return null;
}
@Override
public String unmute() {
return null;
}
@Override
public String play() {

15
src/test/java/device/cdPlayer/CDPlayerTest.java

@ -2,6 +2,7 @@ package device.cdPlayer;
import device.Device;
import device.cdPlayer.exceptions.*;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@ -249,10 +250,7 @@ class CDPlayerTest {
for (int i = 0; i < interfaceMethods.length; i++) {
assertThat(deviceMethods.contains(interfaceMethods[i].getName())).describedAs(testName).isEqualTo(true);
}
}
}
static Stream<Arguments> getOptionsTestData () {
CDPlayer cdPlayer1 = new CDPlayer();
@ -263,6 +261,15 @@ class CDPlayerTest {
);
}
@Test
void getVolumeReturnValueBetween0And100(){
CDPlayer cdPlayer1 = new CDPlayer();
boolean volumeIstInValueRange=false;
int volume=cdPlayer1.getVolume();
if(volume>=0 && volume <=100){
volumeIstInValueRange=true;
}
assertThat(volumeIstInValueRange).isEqualTo(true);
}
}
Loading…
Cancel
Save