From 6776f0b75268862f4b0d47538b00801a7b1b76e2 Mon Sep 17 00:00:00 2001 From: alpina0707 Date: Tue, 15 Feb 2022 18:04:07 +0100 Subject: [PATCH] added second test case for changeOrderInSavedPlaylist() & and added productive code --- src/main/java/device/radioPlayer/RadioPlayer.java | 12 +++++++++--- .../java/device/radioPlayer/RadioPlayerTest.java | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/device/radioPlayer/RadioPlayer.java b/src/main/java/device/radioPlayer/RadioPlayer.java index b68c0c8..4d26867 100644 --- a/src/main/java/device/radioPlayer/RadioPlayer.java +++ b/src/main/java/device/radioPlayer/RadioPlayer.java @@ -213,8 +213,14 @@ public class RadioPlayer implements Device { public String changeOrderInSavedPlaylist(int nr) { String station = playedStation; - savedPlaylist.remove(playedStation); - savedPlaylist.add(nr-1,station); - return"Station " + playedStation + " is now on place 0" + nr + "in saved playlist"; + if((nr-1) > savedPlaylist.size()) { + savedPlaylist.remove(playedStation); + savedPlaylist.add(savedPlaylist.size(),station); + return"Station " + playedStation + " is now on place 0" + nr + "in saved playlist"; + } else { + savedPlaylist.remove(playedStation); + savedPlaylist.add(nr - 1, station); + return "Station " + playedStation + " is now on place 0" + (savedPlaylist.size()+1) + "in saved playlist"; + } } } diff --git a/src/test/java/device/radioPlayer/RadioPlayerTest.java b/src/test/java/device/radioPlayer/RadioPlayerTest.java index 782dfbd..db0ec4b 100644 --- a/src/test/java/device/radioPlayer/RadioPlayerTest.java +++ b/src/test/java/device/radioPlayer/RadioPlayerTest.java @@ -277,9 +277,12 @@ class RadioPlayerTest { RadioPlayer rp = new RadioPlayer(); rp.next(); rp.changeOrderInSavedPlaylist(1); + RadioPlayer rp1 = new RadioPlayer(); + rp1.changeOrderInSavedPlaylist(5); return Stream.of( - Arguments.of("Test for change order in saved playlist with nr isn`t than playlist size", rp, 0, "Teddy") + Arguments.of("Test for change order in saved playlist with nr isn`t bigger than playlist size", rp, 0, "Teddy"), + Arguments.of("Test for change order in saved playlist with nr is than bigger playlist size but at the end of playlist", rp1, 2, "YouFM") ); } } \ No newline at end of file