From 561d5f6bc27a64088b1bc2d52587508230337ab3 Mon Sep 17 00:00:00 2001 From: alpina0707 Date: Thu, 17 Feb 2022 00:10:33 +0100 Subject: [PATCH] added eighth test case for getInfoText() & and added productive code for RadioPlayer --- src/main/java/device/radioPlayer/RadioPlayer.java | 1 + src/test/java/device/radioPlayer/RadioPlayerTest.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/device/radioPlayer/RadioPlayer.java b/src/main/java/device/radioPlayer/RadioPlayer.java index 22f6c67..7dcc37a 100644 --- a/src/main/java/device/radioPlayer/RadioPlayer.java +++ b/src/main/java/device/radioPlayer/RadioPlayer.java @@ -149,6 +149,7 @@ public class RadioPlayer implements Device { @Override public String getInfoText() { + if(showStationInfo().equals("")) return buildInfoText(); return (buildInfoText() + "\n Now playing: " + showStationInfo()); } diff --git a/src/test/java/device/radioPlayer/RadioPlayerTest.java b/src/test/java/device/radioPlayer/RadioPlayerTest.java index 739a2ad..7e2f5d0 100644 --- a/src/test/java/device/radioPlayer/RadioPlayerTest.java +++ b/src/test/java/device/radioPlayer/RadioPlayerTest.java @@ -378,7 +378,7 @@ class RadioPlayerTest { @ParameterizedTest @MethodSource("getInfoTextOptions") void testGetInfoText(String testName, String testTyp, RadioPlayer testRp, boolean expectedResult) { - Boolean bool = null; + Boolean bool; if(testTyp.equals("null")) bool = Strings.isNullOrEmpty(testRp.getInfoText()); else if(testTyp.contains("station")) bool = testRp.getInfoText().contains(testRp.playedStation); else if(testTyp.contains("region")) bool = testRp.getInfoText().contains("Regional playlist"); @@ -386,6 +386,7 @@ class RadioPlayerTest { else if(testTyp.contains("savedNum")) bool = testRp.getInfoText().contains(("0") + testRp.savedPlaylist.indexOf(testRp.playedStation) + 1); else if(testTyp.contains("regionNum")) bool = testRp.getInfoText().contains(("0") + testRp.regionPlaylist.indexOf(testRp.playedStation) + 1); else if(testTyp.contains("stationInfo")) bool = testRp.getInfoText().contains("Now playing"); + else bool = testRp.getInfoText().contains("Now playing"); assertThat(bool).describedAs(testName).isEqualTo(expectedResult); } @@ -403,6 +404,8 @@ class RadioPlayerTest { rp5.next(); RadioPlayer rp6 = new RadioPlayer(); rp6.changeRegion("BY"); + RadioPlayer rp7 = new RadioPlayer(); + rp7.next(); return Stream.of( Arguments.of("Test for getInfoText is not empty or null", "null", rp, false), @@ -411,7 +414,8 @@ class RadioPlayerTest { Arguments.of("Test for getInfoText contains saved playlist if played station is in it", "saved", rp3, true), Arguments.of("Test for getInfoText contains station number in saved playlist", "savedNum", rp4, true), Arguments.of("Test for getInfoText contains station number in regional playlist", "regionNum", rp5, true), - Arguments.of("Test for getInfoText contains station info if station has one", "stationInfo", rp6, true) + Arguments.of("Test for getInfoText contains station info if station has one", "stationInfo", rp6, true), + Arguments.of("Test for getInfoText not contains station info if station not has one", "noStationInfo", rp7, false) ); } } \ No newline at end of file