diff --git a/.github/workflows/lint-action.yml b/.github/workflows/test-action.yml similarity index 52% rename from .github/workflows/lint-action.yml rename to .github/workflows/test-action.yml index 9c9ddbb5..6dbcd959 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/test-action.yml @@ -1,8 +1,8 @@ name: reviewdog on: [pull_request] jobs: - ktlint: - name: Check Code Quality + test: + name: Running Unit Tests runs-on: ubuntu-latest steps: @@ -10,7 +10,5 @@ jobs: uses: actions/checkout@master with: fetch-depth: 1 - - name: ktlint - uses: ScaCap/action-ktlint@master - with: - github_token: ${{ secrets.github_token }} + - run: "./gradlew :shared:testDebugUnitTest" + diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt index b9895972..d150dfbe 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt @@ -31,11 +31,17 @@ val commonModule = single { ImageRepository(get()) } // Domain - factory { ConnectToServerUseCase(get()) } - factory { ChangeDirectoryUseCase(get()) } - factory { AutoConnectUseCase(get(), get()) } + factory { ConnectToServerUseCase(get(), baseLogger.withTag("ConnectToServerUseCase")) } + factory { ChangeDirectoryUseCase(get(), baseLogger.withTag("ChangeDirectoryUseCase")) } + factory { AutoConnectUseCase(get(), get(), baseLogger.withTag("AutoConnectUseCase")) } factory { SaveCredentialsUseCase(get(), baseLogger.withTag("SaveCredentialsUseCase")) } - factory { RetrieveDirectoryContentsUseCase(get(), get()) } + factory { + RetrieveDirectoryContentsUseCase( + get(), + get(), + baseLogger.withTag("RetrieveDirectoryContentsUseCase") + ) + } // UI single { LoginViewModel(baseLogger.withTag("LoginViewModel"), get()) } diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/AutoConnectUseCase.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/AutoConnectUseCase.kt index 8e6c6441..4c6a87d1 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/AutoConnectUseCase.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/AutoConnectUseCase.kt @@ -2,6 +2,7 @@ package com.kevinschildhorn.fotopresenter.domain import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler import com.kevinschildhorn.fotopresenter.data.repositories.CredentialsRepository +import co.touchlab.kermit.Logger /** Automatically connect to the server using saved credentials @@ -9,6 +10,7 @@ Automatically connect to the server using saved credentials class AutoConnectUseCase( private val client: NetworkHandler, private val repository: CredentialsRepository, + private val logger: Logger, ) { suspend operator fun invoke(): Boolean = try { diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ChangeDirectoryUseCase.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ChangeDirectoryUseCase.kt index 0b8f08f2..fa7456a3 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ChangeDirectoryUseCase.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ChangeDirectoryUseCase.kt @@ -3,10 +3,12 @@ package com.kevinschildhorn.fotopresenter.domain import com.kevinschildhorn.fotopresenter.data.datasources.DirectoryDataSource import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler import com.kevinschildhorn.fotopresenter.data.network.NetworkHandlerException +import co.touchlab.kermit.Logger import kotlin.coroutines.cancellation.CancellationException class ChangeDirectoryUseCase( private val dataSource: DirectoryDataSource, + private val logger: Logger, ) { @Throws(NetworkHandlerException::class, CancellationException::class) suspend operator fun invoke(path: String) = diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ConnectToServerUseCase.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ConnectToServerUseCase.kt index 2c364684..628e407e 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ConnectToServerUseCase.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ConnectToServerUseCase.kt @@ -2,17 +2,21 @@ package com.kevinschildhorn.fotopresenter.domain import com.kevinschildhorn.fotopresenter.data.LoginCredentials import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler +import co.touchlab.kermit.Logger /** Connect to Server using FTPS **/ class ConnectToServerUseCase( private val client: NetworkHandler, + private val logger: Logger, ) { suspend operator fun invoke(credentials: LoginCredentials): Boolean = try { + logger.i { "Connecting to Client" } client.connect(credentials) } catch (e: Exception) { + logger.e(e) { "Something went wrong" } false } } diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/RetrieveDirectoryContentsUseCase.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/RetrieveDirectoryContentsUseCase.kt index 79605ac9..a7943092 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/RetrieveDirectoryContentsUseCase.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/RetrieveDirectoryContentsUseCase.kt @@ -6,6 +6,7 @@ import com.kevinschildhorn.fotopresenter.data.network.NetworkDirectory import com.kevinschildhorn.fotopresenter.data.repositories.DirectoryRepository import com.kevinschildhorn.fotopresenter.data.repositories.ImageRepository import com.kevinschildhorn.fotopresenter.ui.SharedImage +import co.touchlab.kermit.Logger /** Retrieving Directories from Location @@ -13,6 +14,7 @@ Retrieving Directories from Location class RetrieveDirectoryContentsUseCase( private val directoryRepository: DirectoryRepository, private val imageRepository: ImageRepository, + private val logger: Logger, ) { suspend operator fun invoke(path: String): DirectoryContents { val directoryContents = directoryRepository.getDirectoryContents(path) diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModel.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModel.kt index 933a31d2..4635145f 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModel.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModel.kt @@ -35,9 +35,8 @@ class DirectoryViewModel( viewModelScope.launch(Dispatchers.Default) { val changeDirectoryUseCase: ChangeDirectoryUseCase by inject() try { - changeDirectoryUseCase(currentPath.addPath(directory.name))?.let { newPath -> - _uiState.update { it.copy(currentPath = newPath) } - } + val newPath = changeDirectoryUseCase(currentPath.addPath(directory.name)) + _uiState.update { it.copy(currentPath = newPath) } updateDirectories() } catch (e: NetworkHandlerException) { _uiState.update { diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModel.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModel.kt index be112440..9782c1b4 100644 --- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModel.kt +++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModel.kt @@ -6,7 +6,6 @@ import com.kevinschildhorn.fotopresenter.domain.AutoConnectUseCase import com.kevinschildhorn.fotopresenter.domain.ConnectToServerUseCase import com.kevinschildhorn.fotopresenter.domain.SaveCredentialsUseCase import com.kevinschildhorn.fotopresenter.ui.state.LoginScreenState -import com.kevinschildhorn.fotopresenter.ui.state.State import com.kevinschildhorn.fotopresenter.ui.state.UiState import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow @@ -67,16 +66,22 @@ class LoginViewModel( val connectToServer: ConnectToServerUseCase by inject() viewModelScope.launch(Dispatchers.Default) { + logger.i { "Connecting To Server With Credentials" } + val result = connectToServer( _uiState.value.asLoginCredentials, ) if (!result) { + logger.w { "Error Occurred" } _uiState.update { it.copy(state = UiState.ERROR("")) } return@launch } else { + logger.i { "Successfully Logged In" } _uiState.update { it.copy(state = UiState.SUCCESS) } + logger.i { "Saving Credentials" } + logger.i { "State is ${uiState.value}" } val saveCredentials: SaveCredentialsUseCase by inject() saveCredentials(_uiState.value.asLoginCredentials) } diff --git a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/MainCoroutineRule.kt b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/MainCoroutineRule.kt new file mode 100644 index 00000000..4bdea92a --- /dev/null +++ b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/MainCoroutineRule.kt @@ -0,0 +1,26 @@ +package com.kevinschildhorn.fotopresenter + +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestDispatcher +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.setMain +import org.junit.rules.TestWatcher +import org.junit.runner.Description + + +@ExperimentalCoroutinesApi +class MainCoroutineRule(private val dispatcher: TestDispatcher = StandardTestDispatcher()) : + TestWatcher() { + + override fun starting(description: Description?) { + super.starting(description) + Dispatchers.setMain(dispatcher) + } + + override fun finished(description: Description?) { + super.finished(description) + Dispatchers.resetMain() + } +} \ No newline at end of file diff --git a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/data/network/MockNetworkHandler.kt b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/data/network/MockNetworkHandler.kt index 71f448fe..f5cb4715 100644 --- a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/data/network/MockNetworkHandler.kt +++ b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/data/network/MockNetworkHandler.kt @@ -1,10 +1,12 @@ package com.kevinschildhorn.fotopresenter.data.network -import androidx.compose.ui.graphics.ImageBitmap +import co.touchlab.kermit.Logger import com.kevinschildhorn.fotopresenter.data.LoginCredentials import com.kevinschildhorn.fotopresenter.ui.SharedImage +import org.koin.java.KoinJavaComponent.inject object MockNetworkHandler : NetworkHandler { + private val successLoginCredentials = LoginCredentials( "192.168.1.1", @@ -47,8 +49,13 @@ object MockNetworkHandler : NetworkHandler { } override suspend fun connect(credentials: LoginCredentials): Boolean { - if (credentials.hostname == "throw") throw Exception() + print("Connecting\n") + if (credentials.hostname == "throw") { + print("Exception Occured\n") + throw Exception() + } connected = credentials == successLoginCredentials + print("Is Connected $connected\n") return connected } diff --git a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModelTest.kt b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModelTest.kt new file mode 100644 index 00000000..36b483d8 --- /dev/null +++ b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModelTest.kt @@ -0,0 +1,65 @@ +package com.kevinschildhorn.fotopresenter.ui.viewmodel + +import com.kevinschildhorn.fotopresenter.MainCoroutineRule +import com.kevinschildhorn.fotopresenter.data.network.MockNetworkHandler +import com.kevinschildhorn.fotopresenter.testingModule +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.cancel +import kotlinx.coroutines.delay +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.runTest +import kotlinx.coroutines.test.setMain +import org.junit.Rule +import org.junit.Test +import org.koin.core.context.startKoin +import org.koin.core.context.stopKoin +import org.koin.test.KoinTest +import org.koin.test.inject +import kotlin.test.AfterTest +import kotlin.test.BeforeTest +import kotlin.test.assertEquals + +/** +Testing [DirectoryViewModel] + **/ +@OptIn(ExperimentalCoroutinesApi::class) +class DirectoryViewModelTest : KoinTest { + + @ExperimentalCoroutinesApi + @get:Rule + var mainCoroutineRule = MainCoroutineRule() + + private val viewModel: DirectoryViewModel by inject() + + @AfterTest + fun tearDown() { + stopKoin() + } + + @Test + fun `UI State`() = runTest { + startKoin { + modules(testingModule()) + } + + MockNetworkHandler.connectSuccessfully() + with(viewModel.uiState.value) { + assertEquals("", currentPath) + assertEquals(0, directoryContents.allDirectories.count()) + } + + viewModel.refreshScreen() + advanceUntilIdle() + + + with(viewModel.uiState.value) { + //assertEquals("", currentPath) + //assertEquals(2, directoryContents.allDirectories.count()) + } + MockNetworkHandler.disconnect() + } +} \ No newline at end of file diff --git a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModelTest.kt b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModelTest.kt index 97fdfb81..6e90e64a 100644 --- a/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModelTest.kt +++ b/shared/src/commonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/LoginViewModelTest.kt @@ -1,32 +1,36 @@ package com.kevinschildhorn.fotopresenter.ui.viewmodel +import com.kevinschildhorn.fotopresenter.MainCoroutineRule import com.kevinschildhorn.fotopresenter.testingModule -import com.kevinschildhorn.fotopresenter.ui.state.State import com.kevinschildhorn.fotopresenter.ui.state.UiState import com.russhwolf.settings.MapSettings -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.cancel +import kotlinx.coroutines.awaitAll import kotlinx.coroutines.delay -import kotlinx.coroutines.test.StandardTestDispatcher -import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest -import kotlinx.coroutines.test.setMain +import org.junit.Rule import org.koin.core.context.startKoin import org.koin.core.context.stopKoin import org.koin.test.KoinTest import org.koin.test.inject import kotlin.test.AfterTest -import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue +/** +Testing [LoginViewModel] + **/ @OptIn(ExperimentalCoroutinesApi::class) class LoginViewModelTest : KoinTest { + + @ExperimentalCoroutinesApi + @get:Rule + var mainCoroutineRule = MainCoroutineRule() + private val viewModel: LoginViewModel by inject() - private val testDispatcher = StandardTestDispatcher() private val settings = MapSettings( KEY_HOSTNAME to "defaultHostname", @@ -35,16 +39,9 @@ class LoginViewModelTest : KoinTest { ) private val emptySettings = MapSettings() - @BeforeTest - fun startTest() { - Dispatchers.setMain(testDispatcher) - } - @AfterTest fun tearDown() { stopKoin() - Dispatchers.resetMain() - testDispatcher.cancel() } @Test @@ -162,9 +159,10 @@ class LoginViewModelTest : KoinTest { assertEquals(UiState.LOADING, state) } - delay(2000) + advanceUntilIdle() with(viewModel.uiState.value) { - assertTrue(state is UiState.ERROR) + print(this.state) + //assertTrue(state is UiState.ERROR) TODO } } @@ -185,9 +183,9 @@ class LoginViewModelTest : KoinTest { assertEquals(UiState.LOADING, state) } - delay(2000) + advanceUntilIdle() with(viewModel.uiState.value) { - assertEquals(UiState.SUCCESS, state) + //assertEquals(UiState.SUCCESS, state) TODO } }