update ktlint plugin to 11.3.1, format code (#3442)
This commit is contained in:
Konrad Pozniak
GitHub
parent
774d79d666
commit
d839f18267
141 changed files with 589 additions and 428 deletions
|
|
@ -74,7 +74,6 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should return error when network call returns error code`() {
|
||||
|
||||
val remoteMediator = CachedTimelineRemoteMediator(
|
||||
accountManager = accountManager,
|
||||
api = mock {
|
||||
|
|
@ -94,7 +93,6 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should return error when network call fails`() {
|
||||
|
||||
val remoteMediator = CachedTimelineRemoteMediator(
|
||||
accountManager = accountManager,
|
||||
api = mock {
|
||||
|
|
@ -113,7 +111,6 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should not prepend statuses`() {
|
||||
|
||||
val remoteMediator = CachedTimelineRemoteMediator(
|
||||
accountManager = accountManager,
|
||||
api = mock(),
|
||||
|
|
@ -142,11 +139,10 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should refresh and insert placeholder when a whole page with no overlap to existing statuses is loaded`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -198,7 +194,7 @@ class CachedTimelineRemoteMediatorTest {
|
|||
),
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -206,11 +202,10 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should refresh and not insert placeholder when less than a whole page is loaded`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -259,7 +254,7 @@ class CachedTimelineRemoteMediatorTest {
|
|||
mockStatusEntityWithAccount("5"),
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -267,11 +262,10 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should refresh and not insert placeholders when there is overlap with existing statuses`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -320,7 +314,7 @@ class CachedTimelineRemoteMediatorTest {
|
|||
mockStatusEntityWithAccount("4"),
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -328,7 +322,6 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should not try to refresh already cached statuses when db is empty`() {
|
||||
|
||||
val remoteMediator = CachedTimelineRemoteMediator(
|
||||
accountManager = accountManager,
|
||||
api = mock {
|
||||
|
|
@ -371,11 +364,10 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should remove deleted status from db and keep state of other cached statuses`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("3", expanded = true),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1", expanded = false),
|
||||
mockStatusEntityWithAccount("1", expanded = false)
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -422,12 +414,11 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should not remove placeholder in timeline`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("8"),
|
||||
mockStatusEntityWithAccount("7"),
|
||||
mockPlaceholderEntityWithAccount("6"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -474,7 +465,7 @@ class CachedTimelineRemoteMediatorTest {
|
|||
mockStatusEntityWithAccount("8"),
|
||||
mockStatusEntityWithAccount("7"),
|
||||
mockPlaceholderEntityWithAccount("6"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -482,11 +473,10 @@ class CachedTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should append statuses`() {
|
||||
|
||||
val statusesAlreadyInDb = listOf(
|
||||
mockStatusEntityWithAccount("8"),
|
||||
mockStatusEntityWithAccount("7"),
|
||||
mockStatusEntityWithAccount("5"),
|
||||
mockStatusEntityWithAccount("5")
|
||||
)
|
||||
|
||||
db.insert(statusesAlreadyInDb)
|
||||
|
|
@ -527,7 +517,7 @@ class CachedTimelineRemoteMediatorTest {
|
|||
mockStatusEntityWithAccount("5"),
|
||||
mockStatusEntityWithAccount("3"),
|
||||
mockStatusEntityWithAccount("2"),
|
||||
mockStatusEntityWithAccount("1"),
|
||||
mockStatusEntityWithAccount("1")
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should return error when network call returns error code`() {
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
on { statusData } doReturn mutableListOf()
|
||||
onBlocking { fetchStatusesForKind(anyOrNull(), anyOrNull(), anyOrNull()) } doReturn Response.error(500, "".toResponseBody())
|
||||
|
|
@ -65,7 +64,6 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
@Test
|
||||
@ExperimentalPagingApi
|
||||
fun `should return error when network call fails`() {
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
on { statusData } doReturn mutableListOf()
|
||||
onBlocking { fetchStatusesForKind(anyOrNull(), anyOrNull(), anyOrNull()) } doThrow IOException()
|
||||
|
|
@ -94,7 +92,8 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
mockStatus("5")
|
||||
),
|
||||
Headers.headersOf(
|
||||
"Link", "<https://mastodon.example/api/v1/favourites?limit=20&max_id=4>; rel=\"next\", <https://mastodon.example/api/v1/favourites?limit=20&min_id=8>; rel=\"prev\""
|
||||
"Link",
|
||||
"<https://mastodon.example/api/v1/favourites?limit=20&max_id=4>; rel=\"next\", <https://mastodon.example/api/v1/favourites?limit=20&min_id=8>; rel=\"prev\""
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -116,7 +115,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val newStatusData = mutableListOf(
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("6"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
)
|
||||
|
||||
verify(timelineViewModel).nextKey = "4"
|
||||
|
|
@ -131,7 +130,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -154,7 +153,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
data = listOf(
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
),
|
||||
prevKey = null,
|
||||
nextKey = "0"
|
||||
|
|
@ -169,7 +168,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
mockStatusViewData("4"),
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
|
||||
assertTrue(result is RemoteMediator.MediatorResult.Success)
|
||||
|
|
@ -183,7 +182,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -206,7 +205,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
data = listOf(
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
),
|
||||
prevKey = null,
|
||||
nextKey = "0"
|
||||
|
|
@ -222,7 +221,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
StatusViewData.Placeholder("7", false),
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
|
||||
assertTrue(result is RemoteMediator.MediatorResult.Success)
|
||||
|
|
@ -236,7 +235,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -259,7 +258,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
data = listOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
),
|
||||
prevKey = null,
|
||||
nextKey = "3"
|
||||
|
|
@ -275,7 +274,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
mockStatusViewData("5"),
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
|
||||
assertTrue(result is RemoteMediator.MediatorResult.Success)
|
||||
|
|
@ -289,7 +288,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -302,7 +301,8 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
mockStatus("1")
|
||||
),
|
||||
Headers.headersOf(
|
||||
"Link", "<https://mastodon.example/api/v1/favourites?limit=20&max_id=0>; rel=\"next\", <https://mastodon.example/api/v1/favourites?limit=20&min_id=4>; rel=\"prev\""
|
||||
"Link",
|
||||
"<https://mastodon.example/api/v1/favourites?limit=20&max_id=0>; rel=\"next\", <https://mastodon.example/api/v1/favourites?limit=20&min_id=4>; rel=\"prev\""
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
@ -315,7 +315,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
data = listOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
),
|
||||
prevKey = null,
|
||||
nextKey = "3"
|
||||
|
|
@ -331,7 +331,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
mockStatusViewData("5"),
|
||||
mockStatusViewData("3"),
|
||||
mockStatusViewData("2"),
|
||||
mockStatusViewData("1"),
|
||||
mockStatusViewData("1")
|
||||
)
|
||||
verify(timelineViewModel).nextKey = "0"
|
||||
assertTrue(result is RemoteMediator.MediatorResult.Success)
|
||||
|
|
@ -345,7 +345,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
val statuses: MutableList<StatusViewData> = mutableListOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
)
|
||||
|
||||
val timelineViewModel: NetworkTimelineViewModel = mock {
|
||||
|
|
@ -361,7 +361,7 @@ class NetworkTimelineRemoteMediatorTest {
|
|||
data = listOf(
|
||||
mockStatusViewData("8"),
|
||||
mockStatusViewData("7"),
|
||||
mockStatusViewData("5"),
|
||||
mockStatusViewData("5")
|
||||
),
|
||||
prevKey = null,
|
||||
nextKey = null
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ fun mockStatus(
|
|||
poll = null,
|
||||
card = null,
|
||||
language = null,
|
||||
filtered = null,
|
||||
filtered = null
|
||||
)
|
||||
|
||||
fun mockStatusViewData(
|
||||
|
|
@ -110,7 +110,7 @@ fun mockStatusEntityWithAccount(
|
|||
|
||||
fun mockPlaceholderEntityWithAccount(
|
||||
id: String,
|
||||
userId: Long = 1,
|
||||
userId: Long = 1
|
||||
): TimelineStatusWithAccount {
|
||||
return TimelineStatusWithAccount(
|
||||
status = Placeholder(id, false).toEntity(userId)
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "2", inReplyToId = "1", inReplyToAccountId = "1", isDetailed = true)
|
||||
),
|
||||
detailedStatusPosition = 0,
|
||||
revealButton = RevealButtonState.NO_BUTTON,
|
||||
revealButton = RevealButtonState.NO_BUTTON
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -208,7 +208,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test", isExpanded = true)
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.HIDE,
|
||||
revealButton = RevealButtonState.HIDE
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -232,7 +232,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -256,7 +256,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -280,7 +280,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test", bookmarked = false)
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -303,7 +303,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "2", inReplyToId = "1", inReplyToAccountId = "1", isDetailed = true, spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -330,7 +330,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -357,7 +357,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
@ -384,7 +384,7 @@ class ViewThreadViewModelTest {
|
|||
mockStatusViewData(id = "3", inReplyToId = "2", inReplyToAccountId = "1", spoilerText = "Test")
|
||||
),
|
||||
detailedStatusPosition = 1,
|
||||
revealButton = RevealButtonState.REVEAL,
|
||||
revealButton = RevealButtonState.REVEAL
|
||||
),
|
||||
viewModel.uiState.first()
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue