From 50f349d1ea1b885c5f38dd11d025a4998fba2cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helge=20Stenstr=C3=B6m?= Date: Sat, 14 Sep 2019 14:20:48 +0200 Subject: [PATCH] Changed event source from Object to StreamPlayer. I felt that Object was too general, and therefore makes the intended usage less obvious. It doesn't make any difference i practice. --- .../goxr3plus/streamplayer/stream/StreamPlayerEvent.java | 4 ++-- .../streamplayer/stream/StreamPlayerEventLauncher.java | 2 +- .../streamplayer/stream/StreamPlayerEventTest.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEvent.java b/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEvent.java index ea17551..23cc13a 100644 --- a/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEvent.java +++ b/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEvent.java @@ -38,7 +38,7 @@ public class StreamPlayerEvent { private int encodedStreamPosition = -1; /** The source. */ - private Object source = null; + private StreamPlayer source = null; /** The description. */ private Object description = null; @@ -55,7 +55,7 @@ public class StreamPlayerEvent { * @param description * the description */ - public StreamPlayerEvent(Object source, Status status, int encodededStreamPosition, Object description) { + public StreamPlayerEvent(StreamPlayer source, Status status, int encodededStreamPosition, Object description) { this.source = source; this.playerStatus = status; this.encodedStreamPosition = encodededStreamPosition; diff --git a/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventLauncher.java b/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventLauncher.java index e89f064..34d32f0 100644 --- a/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventLauncher.java +++ b/src/main/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventLauncher.java @@ -50,7 +50,7 @@ public class StreamPlayerEventLauncher implements Callable { private List listeners = null; /** The source. */ - private Object source = null; + private StreamPlayer source = null; /** * Instantiates a new stream player event launcher. diff --git a/src/test/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventTest.java b/src/test/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventTest.java index 8b056c9..d8ed334 100644 --- a/src/test/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventTest.java +++ b/src/test/java/com/goxr3plus/streamplayer/stream/StreamPlayerEventTest.java @@ -3,12 +3,14 @@ import com.goxr3plus.streamplayer.enums.Status; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.configuration.IMockitoConfiguration; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; class StreamPlayerEventTest { - private Object source; + private StreamPlayer source; private Object description; private Status status; private int encodededStreamPosition; @@ -17,7 +19,7 @@ class StreamPlayerEventTest { @BeforeEach void setUp() { description = new Object(); - source = new Object(); + source = mock(StreamPlayer.class); status = Status.RESUMED; encodededStreamPosition = 12345; event = new StreamPlayerEvent(source, status, encodededStreamPosition, description);