From e6541cf2b9ab86082246378827a9c37ce4efa04d Mon Sep 17 00:00:00 2001 From: alpina0707 Date: Wed, 16 Feb 2022 22:50:40 +0100 Subject: [PATCH] added six test case for getInfoText() & and added productive code for RadioPlayer --- src/main/java/device/radioPlayer/RadioPlayer.java | 4 ++-- src/test/java/device/radioPlayer/RadioPlayerTest.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/device/radioPlayer/RadioPlayer.java b/src/main/java/device/radioPlayer/RadioPlayer.java index c576db2..badaa85 100644 --- a/src/main/java/device/radioPlayer/RadioPlayer.java +++ b/src/main/java/device/radioPlayer/RadioPlayer.java @@ -150,8 +150,8 @@ public class RadioPlayer implements Device { @Override public String getInfoText() { String infoText = playedStation; - if(regionPlaylist.contains(playedStation)) return ("Regional playlist: " + infoText); - else return ("Saved playlist: "+ (savedPlaylist.indexOf(playedStation) + 1) + infoText); + if(regionPlaylist.contains(playedStation)) return ("Regional playlist: " + (regionPlaylist.indexOf(playedStation) + 1) + infoText); + else return ("Saved playlist: " + (savedPlaylist.indexOf(playedStation) + 1) + infoText); } @Override diff --git a/src/test/java/device/radioPlayer/RadioPlayerTest.java b/src/test/java/device/radioPlayer/RadioPlayerTest.java index fe6b776..9552318 100644 --- a/src/test/java/device/radioPlayer/RadioPlayerTest.java +++ b/src/test/java/device/radioPlayer/RadioPlayerTest.java @@ -384,6 +384,7 @@ class RadioPlayerTest { else if(testTyp.contains("region")) bool = testRp.getInfoText().contains("Regional playlist"); else if(testTyp.contains("saved")) bool = testRp.getInfoText().contains("Saved playlist"); 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); assertThat(bool).describedAs(testName).isEqualTo(expectedResult); } @@ -396,13 +397,17 @@ class RadioPlayerTest { RadioPlayer rp3 = new RadioPlayer(); RadioPlayer rp4 = new RadioPlayer(); rp4.next(); + RadioPlayer rp5 = new RadioPlayer(); + rp5.changeRegion("HE"); + rp5.next(); return Stream.of( Arguments.of("Test for getInfoText is not empty or null", "null", rp, false), Arguments.of("Test for getInfoText contains played station", "station", rp1, true), Arguments.of("Test for getInfoText contains regional playlist if played station is in it", "region", rp2, true), 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 saved playlist", "savedNum", rp4, true), + Arguments.of("Test for getInfoText contains station number in regional playlist", "regionNum", rp5, true) ); } } \ No newline at end of file