chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Respect filter expiration date when applying filters (#2661)

Browse source 
* Respect filter expiration date when applying filters. #2578

* Fix typing for filter `expires_in` api points
This commit is contained in:
Levi Bard 2022-08-15 11:01:04 +02:00 • committed by GitHub
commit b21def5041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
View file

@ -14,6 +14,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.mock
import org.robolectric.annotation.Config
import java.time.Instant
import java.util.ArrayList
import java.util.Date
@ -50,7 +51,23 @@ class FilterTest {
expiresAt = null,
irreversible = false,
wholeWord = true
)
),
Filter(
id = "123",
phrase = "expired",
context = listOf(Filter.HOME),
expiresAt = Date.from(Instant.now().minusSeconds(10)),
irreversible = false,
wholeWord = true
),
Filter(
id = "123",
phrase = "unexpired",
context = listOf(Filter.HOME),
expiresAt = Date.from(Instant.now().plusSeconds(3600)),
irreversible = false,
wholeWord = true
),
)
filterModel.initWithFilters(filters)
@ -148,6 +165,23 @@ class FilterTest {
)
}
@Test
fun shouldNotFilter_whenFilterIsExpired() {
assertFalse(
filterModel.shouldFilterStatus(
mockStatus(content = "content matching expired filter should not be filtered")
)
)
}
@Test
fun shouldFilter_whenFilterIsUnexpired() {
assertTrue(
filterModel.shouldFilterStatus(
mockStatus(content = "content matching unexpired filter should be filtered")
)
)
}
private fun mockStatus(
content: String = "",
spoilerText: String = "",