sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Replace Maybe with Single in Message DAO (#710)

Browse Source
This commit is contained in:
Mikołaj Pich 2020-03-02 22:31:55 +01:00 committed by GitHub
parent 87107ec474
commit 79bd2fccdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 114 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
View File

@ -6,7 +6,6 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.SdkHelper
import io.github.wulkanowy.data.db.AppDatabase
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
@ -15,9 +14,6 @@ import io.github.wulkanowy.sdk.Sdk
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
import io.mockk.impl.annotations.SpyK
import io.mockk.just
import io.mockk.runs
import io.reactivex.Single
import org.junit.After
import org.junit.Before

3
app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
View File

@ -4,6 +4,7 @@ import androidx.room.Dao
import androidx.room.Query
import io.github.wulkanowy.data.db.entities.Message
import io.reactivex.Maybe
import io.reactivex.Single
@Dao
interface MessagesDao : BaseDao<Message> {
@ -12,7 +13,7 @@ interface MessagesDao : BaseDao<Message> {
fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
@Query("SELECT * FROM Messages WHERE id = :id")
fun load(id: Long): Maybe<Message>
fun load(id: Long): Single<Message>
@Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
fun loadDeleted(studentId: Int): Maybe<List<Message>>

3
app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
View File

@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
import io.reactivex.Maybe
import io.reactivex.Single
import javax.inject.Inject
import javax.inject.Singleton
@ -23,7 +24,7 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
messagesDb.deleteAll(messages)
}
fun getMessage(id: Long): Maybe<Message> {
fun getMessage(id: Long): Single<Message> {
return messagesDb.load(id)
}

14
app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
View File

@ -13,6 +13,7 @@ import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Completable
import io.reactivex.Maybe
import io.reactivex.Single
import timber.log.Timber
import java.net.UnknownHostException
import javax.inject.Inject
import javax.inject.Singleton
@ -51,21 +52,26 @@ class MessageRepository @Inject constructor(
return Single.just(sdkHelper.init(student))
.flatMap { _ ->
local.getMessage(messageDbId)
.filter { it.content.isNotEmpty() }
.filter {
it.content.isNotEmpty().also { status ->
Timber.d("Message content in db empty: ${!status}")
}
}
.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap {
if (it) local.getMessage(messageDbId).toSingle()
if (it) local.getMessage(messageDbId)
else Single.error(UnknownHostException())
}
.flatMap { dbMessage ->
remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
local.updateMessages(listOf(dbMessage.copy(unread = !markAsRead).apply {
id = dbMessage.id
content = content.ifBlank { it }
}))
Timber.d("Message $messageDbId with blank content: ${dbMessage.content.isBlank()}, marked as read")
}
}.flatMap {
local.getMessage(messageDbId).toSingle()
local.getMessage(messageDbId)
}
)
}

6
app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
View File

@ -5,14 +5,14 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error
import io.reactivex.Observable
import io.reactivex.Single
class UnitTestInternetObservingStrategy : InternetObservingStrategy {
class UnitTestInternetObservingStrategy(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
return Single.just(true)
return Single.just(isInternetConnection)
}
override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
return Observable.just(true)
return Observable.just(isInternetConnection)
}
override fun getDefaultPingHost() = "localhost"

97
app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt Normal file
View File

@ -0,0 +1,97 @@
package io.github.wulkanowy.data.repositories.message
import androidx.room.EmptyResultSetException
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.SdkHelper
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
import io.reactivex.Single
import io.reactivex.observers.TestObserver
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
import org.threeten.bp.LocalDateTime.now
import java.net.UnknownHostException
class MessageRepositoryTest {
@Mock
lateinit var sdk: SdkHelper
@Mock
lateinit var local: MessageLocal
@Mock
lateinit var remote: MessageRemote
@Mock
lateinit var student: Student
private val testObservingStrategy = UnitTestInternetObservingStrategy()
private lateinit var repo: MessageRepository
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
repo = MessageRepository(InternetObservingSettings.builder()
.strategy(testObservingStrategy)
.build(), local, remote, sdk)
}
@Test
fun `throw error when message is not in the db`() {
`when`(local.getMessage(123)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
val message = repo.getMessage(student, 123)
val messageObserver = TestObserver<Message>()
message.subscribe(messageObserver)
messageObserver.assertError(EmptyResultSetException::class.java)
}
@Test
fun `get message when content already in db`() {
`when`(local.getMessage(123)).thenReturn(Single.just(
Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false)
))
val message = repo.getMessage(student, 123).blockingGet()
assertEquals("Test", message.content)
}
@Test
fun `get message when content in db is empty`() {
val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false)
val testMessageWithContent = testMessage.copy(content = "Test")
`when`(local.getMessage(123))
.thenReturn(Single.just(testMessage))
.thenReturn(Single.just(testMessageWithContent))
`when`(remote.getMessagesContent(testMessageWithContent)).thenReturn(Single.just("Test"))
val message = repo.getMessage(student, 123).blockingGet()
assertEquals("Test", message.content)
verify(local).updateMessages(listOf(testMessageWithContent))
}
@Test
fun `get message when content in db is empty and there is no internet connection`() {
val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false)
testObservingStrategy.isInternetConnection = false
`when`(local.getMessage(123)).thenReturn(Single.just(testMessage))
val message = repo.getMessage(student, 123)
val messageObserver = TestObserver<Message>()
message.subscribe(messageObserver)
messageObserver.assertError(UnknownHostException::class.java)
}
}

3
app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
View File

@ -1,15 +1,12 @@
package io.github.wulkanowy.data.repositories.student
import io.github.wulkanowy.data.SdkHelper
import io.github.wulkanowy.sdk.Sdk
import io.github.wulkanowy.sdk.pojo.Student
import io.mockk.impl.annotations.SpyK
import io.reactivex.Single
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.mockito.Mock
import org.mockito.Mockito.anyBoolean
import org.mockito.Mockito.anyString
import org.mockito.Mockito.doReturn
import org.mockito.MockitoAnnotations