ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update turbine [0.6.1] -> [0.7.0]

This commit is contained in:
Davide Farella 2022-02-09 16:21:56 +01:00
parent 84f26a3923
commit 5ff1f0f80d
13 changed files with 194 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
app/src/test/java/ch/protonmail/android/activities/MailboxViewModelTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -263,9 +263,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -279,9 +279,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.close(exception)
assertEquals(expected.throwable?.message, (expectItem() as MailboxState.Error).throwable?.message)
assertEquals(expected.throwable?.message, (awaitItem() as MailboxState.Error).throwable?.message)
}
}
@ -325,9 +325,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -376,9 +376,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
coVerify { contactsRepository.findContactsByEmail(listOf(senderEmailAddress)) }
}
}
@ -422,9 +422,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -466,9 +466,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -517,9 +517,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -584,9 +584,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -621,9 +621,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expectedState, expectItem())
assertEquals(expectedState, awaitItem())
}
}
@ -669,9 +669,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -729,9 +729,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -784,9 +784,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -835,9 +835,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -894,9 +894,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -951,9 +951,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1007,9 +1007,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1064,9 +1064,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(successResult)
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1125,9 +1125,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
messagesResponseChannel.send(GetMessagesResult.Success(messages))
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1144,9 +1144,9 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
// When
viewModel.mailboxState.test {
// Then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
conversationsResponseFlow.send(GetConversationsResult.Error())
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1160,19 +1160,19 @@ class MailboxViewModelTest : ArchTest, CoroutinesTest {
viewModel.mailboxState.test {
// then
assertEquals(loadingState, expectItem())
assertEquals(loadingState, awaitItem())
// first emission from database
messagesResponseChannel.send(GetMessagesResult.Success(emptyList()))
assertEquals(firstExpected, expectItem())
assertEquals(firstExpected, awaitItem())
// emission api refresh
messagesResponseChannel.send(GetMessagesResult.DataRefresh(emptyList()))
expectItem()
awaitItem()
// emission from database after api refresh
messagesResponseChannel.send(GetMessagesResult.Success(emptyList()))
assertEquals(secondExpected, expectItem())
assertEquals(secondExpected, awaitItem())
}
}

26
app/src/test/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModelTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -340,7 +340,7 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
coVerify { messageRepository.observeMessage(testUserId1, INPUT_ITEM_DETAIL_ID) }
observeMessageFlow.emit(message)
coVerify { contactsRepository.findContactEmailByEmail(any()) }
val actualItem = expectItem()
val actualItem = awaitItem()
assertEquals(expected, actualItem)
assertEquals(testSenderContactEmail.name, actualItem.messages[0].senderDisplayName)
}
@ -395,7 +395,7 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
viewModel.conversationUiModel.test {
observeMessageFlow.emit(message)
val actualItem = expectItem()
val actualItem = awaitItem()
assertEquals(exclusiveLabels, actualItem.exclusiveLabels)
assertEquals(nonExclusiveLabels, actualItem.nonExclusiveLabels)
}
@ -409,7 +409,7 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
viewModel.conversationUiModel.test {
observeMessageFlow.emit(message)
val actualItem = expectItem()
val actualItem = awaitItem()
assertTrue(actualItem.exclusiveLabels.isEmpty())
assertTrue(actualItem.nonExclusiveLabels.isEmpty())
}
@ -453,7 +453,7 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
coVerify { conversationRepository.getConversation(testId2, INPUT_ITEM_DETAIL_ID) }
observeConversationFlow.emit(testConversationResult)
coVerify { contactsRepository.findContactEmailByEmail(any()) }
val actualItem = expectItem()
val actualItem = awaitItem()
assertNotNull(actualItem)
assertEquals(testConversation.toConversationUiModel(), actualItem)
}
@ -503,8 +503,8 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
// Then
verify(exactly = 0) { messageRepository.markRead(any()) }
assertEquals(MessageBodyState.Success(messageSpy), expectItem())
expectComplete()
assertEquals(MessageBodyState.Success(messageSpy), awaitItem())
awaitComplete()
}
}
@ -520,8 +520,8 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
// Then
verify(exactly = 1) { messageRepository.markRead(listOf(MESSAGE_ID_ONE)) }
assertEquals(MessageBodyState.Success(messageSpy), expectItem())
expectComplete()
assertEquals(MessageBodyState.Success(messageSpy), awaitItem())
awaitComplete()
}
}
@ -1089,8 +1089,8 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
// Then
loadMessageBodyFlow.test {
coVerify(exactly = 0) { messageRepository.markRead(any()) }
expectItem()
expectComplete()
awaitItem()
awaitComplete()
}
}
@ -1109,8 +1109,8 @@ class MessageDetailsViewModelTest : ArchTest, CoroutinesTest {
// Then
loadMessageBodyFlow.test {
coVerify(exactly = 1) { messageRepository.markRead(listOf(INPUT_ITEM_DETAIL_ID)) }
expectItem()
expectComplete()
awaitItem()
awaitComplete()
}
}

8
app/src/test/java/ch/protonmail/android/contacts/details/ContactDetailsRepositoryTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -157,8 +157,8 @@ class ContactDetailsRepositoryTest {
// when
repository.observeFullContactDetails(testContactId).test {
// then
assertEquals(mockContact, expectItem())
expectComplete()
assertEquals(mockContact, awaitItem())
awaitComplete()
}
}
@ -182,7 +182,7 @@ class ContactDetailsRepositoryTest {
// then
coVerify { contactDao.insertFullContactDetails(mockContact) }
dbResponseFlow.send(mockContact)
assertEquals(mockContact, expectItem())
assertEquals(mockContact, awaitItem())
}
}

4
app/src/test/java/ch/protonmail/android/contacts/details/presentation/ContactDetailsViewModelTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -227,7 +227,7 @@ class ContactDetailsViewModelTest : ArchTest, CoroutinesTest {
viewModel.saveVcard(vCardToShare, contactName, context)
// then
assertEquals(testUri, expectItem())
assertEquals(testUri, awaitItem())
}
}
}

46
app/src/test/java/ch/protonmail/android/data/ProtonStoreTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -68,7 +68,7 @@ class ProtonStoreTest : CoroutinesTest {
store.flow(0, refresh = false).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -83,8 +83,8 @@ class ProtonStoreTest : CoroutinesTest {
store.flow(0, refresh = true).test {
// then
assertEquals(expectedFromApi, expectItem())
assertEquals(expectedFromDatabase, expectItem())
assertEquals(expectedFromApi, awaitItem())
assertEquals(expectedFromDatabase, awaitItem())
}
}
@ -114,10 +114,10 @@ class ProtonStoreTest : CoroutinesTest {
store.flow(0, refresh = true).test {
// then
val error = expectItem() as DataResult.Error.Remote
val error = awaitItem() as DataResult.Error.Remote
assertEquals(expectedException, error.cause)
assertEquals(expectedMessage, error.message)
assertEquals(emptyList<Item>().local(), expectItem())
assertEquals(emptyList<Item>().local(), awaitItem())
}
}
@ -147,10 +147,10 @@ class ProtonStoreTest : CoroutinesTest {
store.flow(0, refresh = true).test {
// then
val error = expectItem() as DataResult.Error.Remote
val error = awaitItem() as DataResult.Error.Remote
assertEquals(expectedException, error.cause)
assertEquals(expectedMessage, error.message)
assertEquals(emptyList<Item>().local(), expectItem())
assertEquals(emptyList<Item>().local(), awaitItem())
}
}
@ -180,8 +180,8 @@ class ProtonStoreTest : CoroutinesTest {
store.flow(0, refresh = true).test {
// then
assertEquals(OfflineDataResult, expectItem())
assertEquals(emptyList<Item>().local(), expectItem())
assertEquals(OfflineDataResult, awaitItem())
assertEquals(emptyList<Item>().local(), awaitItem())
}
}
@ -195,7 +195,7 @@ class ProtonStoreTest : CoroutinesTest {
store.loadMoreFlow(0, refreshAtStart = false).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -211,8 +211,8 @@ class ProtonStoreTest : CoroutinesTest {
flow.test {
// then
assertEquals(expectedFromDatabase, expectItem())
assertEquals(expectedFromApi, expectItem())
assertEquals(expectedFromDatabase, awaitItem())
assertEquals(expectedFromApi, awaitItem())
}
}
@ -226,16 +226,16 @@ class ProtonStoreTest : CoroutinesTest {
flow.test {
// then
assertEquals(allItems.take(3).local(), expectItem())
assertEquals(allItems.slice(0..1).remote(), expectItem())
assertEquals(allItems.take(3).local(), awaitItem())
assertEquals(allItems.slice(0..1).remote(), awaitItem())
flow.loadMore()
assertEquals(allItems.slice(2..3).remote(), expectItem())
assertEquals(allItems.take(4).local(), expectItem())
assertEquals(allItems.slice(2..3).remote(), awaitItem())
assertEquals(allItems.take(4).local(), awaitItem())
flow.loadMore()
assertEquals(allItems.slice(4..5).remote(), expectItem())
assertEquals(allItems.take(6).local(), expectItem())
assertEquals(allItems.slice(4..5).remote(), awaitItem())
assertEquals(allItems.take(6).local(), awaitItem())
}
}
@ -265,9 +265,9 @@ class ProtonStoreTest : CoroutinesTest {
store.loadMoreFlow(0, refreshAtStart = true).test {
// then
assertEquals(emptyList<Item>().local(), expectItem())
assertEquals(emptyList<Item>().local(), awaitItem())
val error = expectItem() as DataResult.Error.Remote
val error = awaitItem() as DataResult.Error.Remote
assertEquals(expectedException, error.cause)
assertEquals(expectedMessage, error.message)
}
@ -297,8 +297,8 @@ class ProtonStoreTest : CoroutinesTest {
store.loadMoreFlow(0, refreshAtStart = true).test {
// then
assertEquals(items.local(), expectItem())
assertIs<DataResult.Error.Remote>(expectItem())
assertEquals(items.local(), awaitItem())
assertIs<DataResult.Error.Remote>(awaitItem())
}
}

10
app/src/test/java/ch/protonmail/android/labels/data/LabelRepositoryImplTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -115,9 +115,9 @@ class LabelRepositoryImplTest : ArchTest, CoroutinesTest {
// then
coVerify { labelDao.insertOrUpdate(*anyVararg()) }
assertEquals(expectedDbData.map { labelDomainMapper.toLabel(it) }, expectItem())
assertEquals(expectedDbData.map { labelDomainMapper.toLabel(it) }, awaitItem())
dbFlow.tryEmit(subsequentDbReply)
assertEquals(subsequentDbReply.map { labelDomainMapper.toLabel(it) }, expectItem())
assertEquals(subsequentDbReply.map { labelDomainMapper.toLabel(it) }, awaitItem())
}
}
@ -133,7 +133,7 @@ class LabelRepositoryImplTest : ArchTest, CoroutinesTest {
// then
dbFlow.emit(dbReply)
assertEquals(dbReply.map { labelDomainMapper.toLabel(it) }, expectItem())
assertEquals(dbReply.map { labelDomainMapper.toLabel(it) }, awaitItem())
coVerify(exactly = 0) { labelDao.insertOrUpdate(*anyVararg()) }
}
}
@ -151,7 +151,7 @@ class LabelRepositoryImplTest : ArchTest, CoroutinesTest {
// then
dbFlow.emit(dbReply)
assertEquals(dbReply.map { labelDomainMapper.toLabel(it) }, expectItem())
assertEquals(dbReply.map { labelDomainMapper.toLabel(it) }, awaitItem())
coVerify(exactly = 0) { labelDao.insertOrUpdate(*anyVararg()) }
}
}

54
app/src/test/java/ch/protonmail/android/mailbox/data/ConversationsRepositoryImplTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -342,13 +342,13 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(parameters,).test {
// then
val actualLocalItems = expectItem() as DataResult.Success
val actualLocalItems = awaitItem() as DataResult.Success
assertEquals(ResponseSource.Local, actualLocalItems.source)
coVerify { api.fetchConversations(parameters) }
coVerify { conversationDao.insertOrUpdate(*expectedConversations.toTypedArray()) }
val actualRemoteItems = expectItem() as DataResult.Success
val actualRemoteItems = awaitItem() as DataResult.Success
assertEquals(ResponseSource.Remote, actualRemoteItems.source)
}
}
@ -367,10 +367,10 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(parameters).test {
// then
val actualLocalItems = expectItem() as DataResult.Success
val actualLocalItems = awaitItem() as DataResult.Success
assertEquals(ResponseSource.Local, actualLocalItems.source)
val actualError = expectItem() as DataResult.Error
val actualError = awaitItem() as DataResult.Error
assertEquals(ResponseSource.Remote, actualError.source)
assertEquals("Test - Bad Request", actualError.message)
}
@ -405,9 +405,9 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(parameters).test {
// then
assertEquals(expectedLocalConversations.local(), expectItem())
assertEquals(expectedLocalConversations.local(), awaitItem())
val actualError = expectItem() as DataResult.Error
val actualError = awaitItem() as DataResult.Error
assertEquals(ResponseSource.Remote, actualError.source)
assertEquals("Api call failed", actualError.message)
}
@ -480,8 +480,8 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getConversation(testUserId, conversationId).test {
// then
assertEquals(expectedConversation.local(), expectItem())
expectItem()
assertEquals(expectedConversation.local(), awaitItem())
awaitItem()
}
}
}
@ -629,8 +629,8 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getConversation(testUserId, conversationId).test {
// then
assertEquals(DataResult.Success(ResponseSource.Local, expectedConversation), expectItem())
assertEquals(DataResult.Processing(ResponseSource.Remote), expectItem())
assertEquals(DataResult.Success(ResponseSource.Local, expectedConversation), awaitItem())
assertEquals(DataResult.Processing(ResponseSource.Remote), awaitItem())
}
}
}
@ -684,8 +684,8 @@ class ConversationsRepositoryImplTest : ArchTest {
dbFlow.emit(null)
// then
assertEquals(DataResult.Processing(ResponseSource.Remote), expectItem())
assertEquals(ResponseSource.Local, (expectItem() as DataResult.Success).source)
assertEquals(DataResult.Processing(ResponseSource.Remote), awaitItem())
assertEquals(ResponseSource.Local, (awaitItem() as DataResult.Success).source)
coVerify { messageDao.saveMessages(listOf(expectedMessage)) }
coVerify { conversationDao.insertOrUpdate(expectedConversationDbModel) }
}
@ -705,10 +705,10 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(parameters)
.test(timeout = 3.toDuration(DurationUnit.SECONDS)) {
// then
val actual = expectItem() as DataResult.Success
val actual = awaitItem() as DataResult.Success
assertEquals(ResponseSource.Local, actual.source)
expectItem()
awaitItem()
}
}
}
@ -1466,8 +1466,8 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(params).test {
// then
assertEquals(expected, expectItem())
expectItem() // Ignored Remote data
assertEquals(expected, awaitItem())
awaitItem() // Ignored Remote data
}
}
@ -1495,8 +1495,8 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.observeConversations(params).test {
// then
assertEquals(expected, expectItem())
expectItem() // Ignored Remote data
assertEquals(expected, awaitItem())
awaitItem() // Ignored Remote data
}
}
@ -1518,7 +1518,7 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -1544,7 +1544,7 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(expectedList, expectItem())
assertEquals(expectedList, awaitItem())
}
}
@ -1588,13 +1588,13 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(firstExpected, expectItem())
assertEquals(firstExpected, awaitItem())
conversationsRepository.refreshUnreadCounters()
assertEquals(secondExpected, expectItem())
assertEquals(secondExpected, awaitItem())
conversationsRepository.refreshUnreadCounters()
assertEquals(thirdExpected, expectItem())
assertEquals(thirdExpected, awaitItem())
}
}
@ -1610,10 +1610,10 @@ class ConversationsRepositoryImplTest : ArchTest {
conversationsRepository.getUnreadCounters(testUserId).test {
// then
val actual = expectItem() as DataResult.Error.Remote
val actual = awaitItem() as DataResult.Error.Remote
assertEquals(expectedMessage, actual.message)
expectComplete()
awaitComplete()
}
}
@ -1626,7 +1626,7 @@ class ConversationsRepositoryImplTest : ArchTest {
// when
conversationsRepository.getUnreadCounters(testUserId).test {
expectItem()
awaitItem()
}
}

16
app/src/test/java/ch/protonmail/android/mailbox/domain/usecase/ObserveAllUnreadCountersTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -70,7 +70,7 @@ class ObserveAllUnreadCountersTest : CoroutinesTest {
observeAllUnreadCounters(testUserId).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -87,8 +87,8 @@ class ObserveAllUnreadCountersTest : CoroutinesTest {
// then
// An Item is emitted from conversationRepository which is mocked to return a success
expectItem()
assertEquals(expectedError, expectItem())
awaitItem()
assertEquals(expectedError, awaitItem())
}
}
@ -112,7 +112,7 @@ class ObserveAllUnreadCountersTest : CoroutinesTest {
observeAllUnreadCounters(testUserId).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -129,8 +129,8 @@ class ObserveAllUnreadCountersTest : CoroutinesTest {
// then
// An Item is emitted from messageRepository which is mocked to return a success
expectItem()
assertEquals(expectedError, expectItem())
awaitItem()
assertEquals(expectedError, awaitItem())
}
}
@ -160,7 +160,7 @@ class ObserveAllUnreadCountersTest : CoroutinesTest {
observeAllUnreadCounters(testUserId).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
}

6
app/src/test/java/ch/protonmail/android/mailbox/domain/usecase/ObserveConversationsByLocationTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -78,8 +78,8 @@ class ObserveConversationsByLocationTest : CoroutinesTest {
observeConversationsByLocation(userId, MessageLocationType.INBOX.asLabelId()).test {
// then
assertEquals(expected, expectItem())
expectComplete()
assertEquals(expected, awaitItem())
awaitComplete()
}
}

22
app/src/test/java/ch/protonmail/android/mailbox/domain/usecase/ObserveMessagesByLocationTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -65,8 +65,8 @@ class ObserveMessagesByLocationTest {
useCase(userId, mailboxLocation, labelId).test {
// then
assertEquals(expected, expectItem())
expectComplete()
assertEquals(expected, awaitItem())
awaitComplete()
}
}
@ -81,8 +81,8 @@ class ObserveMessagesByLocationTest {
useCase(userId, mailboxLocation, labelId).test {
// then
assertEquals(expected, expectItem())
expectComplete()
assertEquals(expected, awaitItem())
awaitComplete()
}
}
@ -97,8 +97,8 @@ class ObserveMessagesByLocationTest {
useCase(userId, mailboxLocation, labelId).test {
// then
assertEquals(expected, expectItem())
expectComplete()
assertEquals(expected, awaitItem())
awaitComplete()
}
}
@ -113,8 +113,8 @@ class ObserveMessagesByLocationTest {
useCase(userId, mailboxLocation, labelId).test {
// then
assertEquals(expected, expectItem())
expectComplete()
assertEquals(expected, awaitItem())
awaitComplete()
}
}
@ -140,11 +140,11 @@ class ObserveMessagesByLocationTest {
// then
messagesResponseChannel.close(testException)
val actualError = expectItem() as GetMessagesResult.Error
val actualError = awaitItem() as GetMessagesResult.Error
val actualException = checkNotNull(actualError.throwable)
assertEquals(testExceptionMessage, actualException.message)
assertEquals(expectedExceptionType, actualException::class)
expectComplete()
awaitComplete()
}
}

50
app/src/test/java/ch/protonmail/android/repository/MessageRepositoryTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -442,7 +442,7 @@ class MessageRepositoryTest {
// then
// verify messages from database
assertEquals(initialDatabaseMessages.local(), expectItem())
assertEquals(initialDatabaseMessages.local(), awaitItem())
// verify api fetch
coVerify {
@ -451,8 +451,8 @@ class MessageRepositoryTest {
coVerify { messageDao.saveMessages(apiMessages) }
// verify message from api
assertEquals(apiMessages.remote(), expectItem())
assertEquals(allMessages.local(), expectItem())
assertEquals(apiMessages.remote(), awaitItem())
assertEquals(allMessages.local(), awaitItem())
}
}
@ -482,8 +482,8 @@ class MessageRepositoryTest {
dbFlow.emit(dbMessages)
// then
assertEquals(dbMessages.local(), expectItem())
assertEquals(DataResult.Error.Remote(exceptionMessage, testException), expectItem())
assertEquals(dbMessages.local(), awaitItem())
assertEquals(DataResult.Error.Remote(exceptionMessage, testException), awaitItem())
expectNoEvents()
}
}
@ -510,10 +510,10 @@ class MessageRepositoryTest {
dbFlow.emit(dbMessages)
// then
assertEquals(dbMessages.local(), expectItem())
assertEquals(dbMessages.local(), awaitItem())
coVerify { messageDao.saveMessages(netMessages) }
assertEquals(netMessages.remote(), expectItem())
assertEquals(netMessages.local(), expectItem())
assertEquals(netMessages.remote(), awaitItem())
assertEquals(netMessages.local(), awaitItem())
}
}
@ -536,8 +536,8 @@ class MessageRepositoryTest {
dbFlow.emit(dbMessages)
// then
assertEquals(DataResult.Success(ResponseSource.Local, dbMessages), expectItem())
assertEquals(DataResult.Error.Remote(testExceptionMessage, testException), expectItem())
assertEquals(DataResult.Success(ResponseSource.Local, dbMessages), awaitItem())
assertEquals(DataResult.Error.Remote(testExceptionMessage, testException), awaitItem())
}
}
@ -568,9 +568,9 @@ class MessageRepositoryTest {
messageRepository.observeMessages(params).test {
// then
assertEquals(databaseMessages.local(), expectItem())
assertEquals(netMessages.remote(), expectItem())
assertEquals(netMessages.local(), expectItem())
assertEquals(databaseMessages.local(), awaitItem())
assertEquals(netMessages.remote(), awaitItem())
assertEquals(netMessages.local(), awaitItem())
coVerify(exactly = 1) { messageDao.saveMessages(netMessages) }
}
@ -627,15 +627,15 @@ class MessageRepositoryTest {
// then
// verify messages from database
assertEquals(initialDatabaseMessages.local(), expectItem())
assertEquals(initialDatabaseMessages.local(), awaitItem())
// verify api fetch
coVerify { protonMailApiManager.getMessages(params) }
coVerify { messageDao.saveMessages(apiMessages) }
// verify message from api
assertEquals(apiMessages.remote(), expectItem())
assertEquals(allMessages.local(), expectItem())
assertEquals(apiMessages.remote(), awaitItem())
assertEquals(allMessages.local(), awaitItem())
}
}
@ -657,7 +657,7 @@ class MessageRepositoryTest {
messageRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(expected, expectItem())
assertEquals(expected, awaitItem())
}
}
@ -683,7 +683,7 @@ class MessageRepositoryTest {
messageRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(expectedList, expectItem())
assertEquals(expectedList, awaitItem())
}
}
@ -727,13 +727,13 @@ class MessageRepositoryTest {
messageRepository.getUnreadCounters(testUserId).test {
// then
assertEquals(firstExpected, expectItem())
assertEquals(firstExpected, awaitItem())
messageRepository.refreshUnreadCounters()
assertEquals(secondExpected, expectItem())
assertEquals(secondExpected, awaitItem())
messageRepository.refreshUnreadCounters()
assertEquals(thirdExpected, expectItem())
assertEquals(thirdExpected, awaitItem())
}
}
@ -749,10 +749,10 @@ class MessageRepositoryTest {
messageRepository.getUnreadCounters(testUserId).test {
// then
val actual = expectItem() as DataResult.Error.Remote
val actual = awaitItem() as DataResult.Error.Remote
assertEquals(expectedMessage, actual.message)
expectComplete()
awaitComplete()
}
}
@ -765,7 +765,7 @@ class MessageRepositoryTest {
// when
messageRepository.getUnreadCounters(testUserId).test {
expectItem()
awaitItem()
}
}

2
buildSrc/src/main/kotlin/versionsConfig.kt
View File

@ -74,7 +74,7 @@ const val `json-simple version` = "1.1.1" // Released: Mar
const val `browserstack-plugin version` = "3.0.1" // Released: Jun 10, 2020
const val `uiautomator version` = "2.2.0" // Released: Oct 25, 2018
const val `sun-mail-android version` = "1.5.5" // Released: Mar 06, 2020
const val `turbine version` = "0.6.1" // Released: Sep 02, 2021
const val `turbine version` = "0.7.0" // Released: Oct 26, 2021
const val `junit-ktx version` = "1.1.2" // Released: Aug 06, 2020
// Android

58
domain/src/test/kotlin/ch/protonmail/android/domain/LoadMoreFlowTest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Proton Technologies AG
* Copyright (c) 2022 Proton Technologies AG
*
* This file is part of ProtonMail.
*
@ -44,7 +44,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(2), expectItem())
assertEquals(allItems.take(2), awaitItem())
}
}
@ -55,13 +55,13 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.subList(0, 2), expectItem())
assertEquals(allItems.subList(0, 2), awaitItem())
flow.loadMore()
assertEquals(allItems.subList(2, 4), expectItem())
assertEquals(allItems.subList(2, 4), awaitItem())
flow.loadMore()
assertEquals(allItems.subList(4, 6), expectItem())
assertEquals(allItems.subList(4, 6), awaitItem())
flow.loadMore()
assertEquals(allItems.subList(6, 7), expectItem())
assertEquals(allItems.subList(6, 7), awaitItem())
}
}
@ -72,8 +72,8 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(emptyList(), expectItem())
assertEquals(allItems.take(2), expectItem())
assertEquals(emptyList(), awaitItem())
assertEquals(allItems.take(2), awaitItem())
}
}
@ -84,14 +84,14 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(emptyList(), expectItem())
assertEquals(allItems.take(2), expectItem())
assertEquals(emptyList(), awaitItem())
assertEquals(allItems.take(2), awaitItem())
flow.loadMore()
assertEquals(allItems.take(4), expectItem())
assertEquals(allItems.take(4), awaitItem())
flow.loadMore()
assertEquals(allItems.take(6), expectItem())
assertEquals(allItems.take(6), awaitItem())
flow.loadMore()
assertEquals(allItems.take(7), expectItem())
assertEquals(allItems.take(7), awaitItem())
}
}
@ -102,7 +102,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(emptyList(), expectItem())
assertEquals(emptyList(), awaitItem())
}
}
@ -113,7 +113,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(emptyList(), expectItem())
assertEquals(emptyList(), awaitItem())
flow.loadMore()
expectNoEvents()
}
@ -127,7 +127,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(3), expectItem())
assertEquals(allItems.take(3), awaitItem())
}
}
@ -139,7 +139,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(3), expectItem())
assertEquals(allItems.take(3), awaitItem())
flow.loadMore()
expectNoEvents()
}
@ -153,7 +153,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(3), expectItem())
assertEquals(allItems.take(3), awaitItem())
}
}
@ -165,9 +165,9 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(3), expectItem())
assertEquals(allItems.take(3), awaitItem())
flow.loadMore()
assertEquals(allItems.take(4), expectItem())
assertEquals(allItems.take(4), awaitItem())
}
}
@ -179,7 +179,7 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(3), expectItem())
assertEquals(allItems.take(3), awaitItem())
// Try to load few times before restoring connection
flow.loadMore()
expectNoEvents()
@ -190,9 +190,9 @@ class LoadMoreFlowTest : CoroutinesTest {
fakeOfflineEnabledRepository.withNet()
flow.loadMore()
flow.loadMore()
assertEquals(allItems.take(4), expectItem())
assertEquals(allItems.take(4), awaitItem())
flow.loadMore()
assertEquals(allItems.take(6), expectItem())
assertEquals(allItems.take(6), awaitItem())
}
}
@ -212,11 +212,11 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(1), expectItem())
assertEquals(allItems.take(1), awaitItem())
flow.loadMore()
assertEquals(allItems.take(2), expectItem())
assertEquals(allItems.take(2), awaitItem())
flow.loadMore()
assertEquals(allItems.take(4), expectItem())
assertEquals(allItems.take(4), awaitItem())
}
}
@ -235,10 +235,10 @@ class LoadMoreFlowTest : CoroutinesTest {
// when - then
flow.test {
assertEquals(allItems.take(1), expectItem())
assertEquals(allItems.take(2), expectItem())
assertEquals(allItems.take(1), awaitItem())
assertEquals(allItems.take(2), awaitItem())
flow.loadMore()
assertEquals(allItems.take(4), expectItem())
assertEquals(allItems.take(4), awaitItem())
}
}