Clean up some test code

Author: Isira-Seneviratne

app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt

@@ -21,7 +21,6 @@ import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.channel.ChannelInfo
 import org.schabi.newpipe.extractor.stream.StreamType
 import java.io.IOException
-import java.time.Instant
 import java.time.LocalDate
 import java.time.Month
 import java.time.ZoneOffset
@@ -34,16 +33,51 @@ class FeedDAOTest {
 
     private val serviceId = ServiceList.YouTube.serviceId
 
-    private val stream1 = StreamEntity(1, serviceId, "https://youtube.com/watch?v=1", "stream 1", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-01", Instant.parse("2023-01-01T00:00:00Z"))
-    private val stream2 = StreamEntity(2, serviceId, "https://youtube.com/watch?v=2", "stream 2", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-02", Instant.parse("2023-01-02T00:00:00Z"))
-    private val stream3 = StreamEntity(3, serviceId, "https://youtube.com/watch?v=3", "stream 3", StreamType.LIVE_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-03", Instant.parse("2023-01-03T00:00:00Z"))
-    private val stream4 = StreamEntity(4, serviceId, "https://youtube.com/watch?v=4", "stream 4", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", Instant.parse("2023-08-10T00:00:00Z"))
-    private val stream5 = StreamEntity(5, serviceId, "https://youtube.com/watch?v=5", "stream 5", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-20", Instant.parse("2023-08-20T00:00:00Z"))
-    private val stream6 = StreamEntity(6, serviceId, "https://youtube.com/watch?v=6", "stream 6", StreamType.VIDEO_STREAM, 1000, "channel-3", "https://youtube.com/channel/3", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-09-01", Instant.parse("2023-09-01T00:00:00Z"))
-    private val stream7 = StreamEntity(7, serviceId, "https://youtube.com/watch?v=7", "stream 7", StreamType.VIDEO_STREAM, 1000, "channel-4", "https://youtube.com/channel/4", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", Instant.parse("2023-08-10T00:00:00Z"))
+    private val stream1 =
+        createStreamEntity(
+            1, "https://youtube.com/watch?v=1", "stream 1", uploader = "channel-1",
+            uploaderUrl = "https://youtube.com/channel/1", date = LocalDate.of(2023, Month.JANUARY, 2),
+        )
+    private val stream2 =
+        createStreamEntity(
+            2, "https://youtube.com/watch?v=2", "stream 2", uploader = "channel-1",
+            uploaderUrl = "https://youtube.com/channel/1", date = LocalDate.of(2023, Month.JANUARY, 2),
+        )
+    private val stream3 =
+        createStreamEntity(
+            3, "https://youtube.com/watch?v=3", "stream 3", StreamType.LIVE_STREAM,
+            "channel-1", "https://youtube.com/channel/1", LocalDate.of(2023, Month.JANUARY, 3),
+        )
+    private val stream4 =
+        createStreamEntity(
+            4, "https://youtube.com/watch?v=4", "stream 4", uploader = "channel-2",
+            uploaderUrl = "https://youtube.com/channel/2", date = LocalDate.of(2023, Month.AUGUST, 10),
+        )
+    private val stream5 =
+        createStreamEntity(
+            5, "https://youtube.com/watch?v=5", "stream 5", uploader = "channel-2",
+            uploaderUrl = "https://youtube.com/channel/2", date = LocalDate.of(2023, Month.AUGUST, 20),
+        )
+    private val stream6 =
+        createStreamEntity(
+            6, "https://youtube.com/watch?v=6", "stream 6", uploader = "channel-3",
+            uploaderUrl = "https://youtube.com/channel/3", date = LocalDate.of(2023, Month.SEPTEMBER, 1),
+        )
+    private val stream7 =
+        createStreamEntity(
+            7, "https://youtube.com/watch?v=7", "stream 7", uploader = "channel-4",
+            uploaderUrl = "https://youtube.com/channel/4", date = LocalDate.of(2023, Month.AUGUST, 10),
+        )
+
+    private val allStreams = listOf(stream1, stream2, stream3, stream4, stream5, stream6, stream7)
 
-    private val allStreams = listOf(
-        stream1, stream2, stream3, stream4, stream5, stream6, stream7
+    private fun createStreamEntity(
+        uid: Long, url: String, title: String, type: StreamType = StreamType.VIDEO_STREAM,
+        uploader: String, uploaderUrl: String, date: LocalDate,
+    ) = StreamEntity(
+        uid, serviceId, url, title, type, duration = 1000, uploader, uploaderUrl,
+        thumbnailUrl = "https://i.ytimg.com/vi/1/hqdefault.jpg", viewCount = 100, textualUploadDate = date.toString(),
+        uploadInstant = date.atStartOfDay(ZoneOffset.UTC).toInstant(),
     )
 
     @Before