Fix tests

Author: Isira-Seneviratne

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

@@ -21,8 +21,10 @@ 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.OffsetDateTime
-import kotlin.streams.toList
+import java.time.Instant
+import java.time.LocalDate
+import java.time.Month
+import java.time.ZoneOffset
 
 class FeedDAOTest {
     private lateinit var db: AppDatabase
@@ -32,13 +34,13 @@ 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", OffsetDateTime.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", OffsetDateTime.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", OffsetDateTime.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", OffsetDateTime.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", OffsetDateTime.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", OffsetDateTime.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", OffsetDateTime.parse("2023-08-10T00:00:00Z"))
+    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 allStreams = listOf(
         stream1, stream2, stream3, stream4, stream5, stream6, stream7
@@ -63,7 +65,7 @@ class FeedDAOTest {
 
     @Test
     fun testUnlinkStreamsOlderThan_KeepOne() {
-        setupUnlinkDelete("2023-08-15T00:00:00Z")
+        setupUnlinkDelete(LocalDate.of(2023, Month.AUGUST, 15))
         val streams = feedDAO.getStreams(
             FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
         )
@@ -74,7 +76,7 @@ class FeedDAOTest {
 
     @Test
     fun testUnlinkStreamsOlderThan_KeepMultiple() {
-        setupUnlinkDelete("2023-08-01T00:00:00Z")
+        setupUnlinkDelete(LocalDate.of(2023, Month.AUGUST, 1))
         val streams = feedDAO.getStreams(
             FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
         )
@@ -94,10 +96,10 @@ class FeedDAOTest {
         )
     }
 
-    private fun setupUnlinkDelete(time: String) {
+    private fun setupUnlinkDelete(localDate: LocalDate) {
         clearAndFillTables()
         Single.fromCallable {
-            feedDAO.unlinkStreamsOlderThan(OffsetDateTime.parse(time))
+            feedDAO.unlinkStreamsOlderThan(localDate.atStartOfDay(ZoneOffset.UTC).toInstant())
         }.blockingSubscribe()
         Single.fromCallable {
             streamDAO.deleteOrphans()

app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt

@@ -12,7 +12,6 @@ import org.schabi.newpipe.database.history.model.SearchHistoryEntry
 import org.schabi.newpipe.testUtil.TestDatabase
 import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
 import java.time.LocalDateTime
-import java.time.OffsetDateTime
 import java.time.ZoneOffset
 
 class HistoryRecordManagerTest {
@@ -163,7 +162,8 @@ class HistoryRecordManagerTest {
     }
 
     companion object {
-        private val time = OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 1, 1), ZoneOffset.UTC)
+        private val time = LocalDateTime.of(2000, 1, 1, 1, 1)
+            .toInstant(ZoneOffset.UTC)
 
         private val RELATED_SEARCHES_ENTRIES = listOf(
             SearchHistoryEntry(time.minusSeconds(7), 2, "AC"),

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -366,6 +366,10 @@ public static void initPrettyTime(@NonNull final PrettyTime time) {
         prettyTime.removeUnit(Decade.class);
     }
 
+    static void resetPrettyTime() {
+        prettyTime = null;
+    }
+
     public static PrettyTime resolvePrettyTime() {
         return new PrettyTime(getAppLocale());
     }

app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt

@@ -12,8 +12,8 @@ import java.util.Locale
 class LocalizationTest {
     @Test(expected = NullPointerException::class)
     fun `formatRelativeTime() must fail without initializing pretty time`() {
-        val instant = Instant.now()
-        Localization.formatRelativeTime(instant)
+        Localization.resetPrettyTime()
+        Localization.formatRelativeTime(Instant.now())
     }
 
     @Test