From 386c7d7793b69c67ea2e38da64b86cbec37108de Mon Sep 17 00:00:00 2001 From: Honza Rychnovsky Date: Thu, 30 Jun 2022 15:02:26 +0200 Subject: [PATCH] [#485] Test Failure For UpdateViewModel --- ui-integration-test-lib/build.gradle.kts | 2 ++ .../update/viewmodel}/AppUpdateCheckerMock.kt | 2 +- .../update/viewmodel}/UpdateViewModelTest.kt | 16 ++++++++-------- .../ui/screen/update/util/PlayStoreUtilTest.kt | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-) rename {ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view => ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel}/AppUpdateCheckerMock.kt (97%) rename {ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration => ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel}/UpdateViewModelTest.kt (89%) diff --git a/ui-integration-test-lib/build.gradle.kts b/ui-integration-test-lib/build.gradle.kts index 5b67a702..97f2d969 100644 --- a/ui-integration-test-lib/build.gradle.kts +++ b/ui-integration-test-lib/build.gradle.kts @@ -37,9 +37,11 @@ dependencies { androidTestImplementation(projects.uiLib) androidTestImplementation(projects.uiDesignLib) androidTestImplementation(projects.testLib) + androidTestImplementation(projects.spackleAndroidLib) androidTestImplementation(libs.bundles.androidx.test) androidTestImplementation(libs.bundles.androidx.compose.core) + androidTestImplementation(libs.bundles.play.core) androidTestImplementation(libs.androidx.compose.test.junit) androidTestImplementation(libs.androidx.navigation.compose) diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerMock.kt b/ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/AppUpdateCheckerMock.kt similarity index 97% rename from ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerMock.kt rename to ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/AppUpdateCheckerMock.kt index fa2abfd3..230705a4 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/view/AppUpdateCheckerMock.kt +++ b/ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/AppUpdateCheckerMock.kt @@ -1,4 +1,4 @@ -package co.electriccoin.zcash.ui.screen.update.view +package co.electriccoin.zcash.ui.integration.test.screen.update.viewmodel import android.app.Activity import android.content.Context diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewModelTest.kt b/ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/UpdateViewModelTest.kt similarity index 89% rename from ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewModelTest.kt rename to ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/UpdateViewModelTest.kt index b9794f90..306da6e6 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/integration/UpdateViewModelTest.kt +++ b/ui-integration-test-lib/src/androidTest/java/co/electriccoin/zcash/ui/integration/test/screen/update/viewmodel/UpdateViewModelTest.kt @@ -1,14 +1,14 @@ -package co.electriccoin.zcash.ui.screen.update.integration +package co.electriccoin.zcash.ui.integration.test.screen.update.viewmodel import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.lifecycle.viewModelScope import androidx.test.filters.MediumTest -import co.electriccoin.zcash.ui.common.UiTestingActivity +import co.electriccoin.zcash.test.UiTestPrerequisites +import co.electriccoin.zcash.ui.integration.test.common.IntegrationTestingActivity import co.electriccoin.zcash.ui.screen.update.AppUpdateChecker import co.electriccoin.zcash.ui.screen.update.fixture.UpdateInfoFixture import co.electriccoin.zcash.ui.screen.update.model.UpdateInfo import co.electriccoin.zcash.ui.screen.update.model.UpdateState -import co.electriccoin.zcash.ui.screen.update.view.AppUpdateCheckerMock import co.electriccoin.zcash.ui.screen.update.viewmodel.UpdateViewModel import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.cancel @@ -16,17 +16,17 @@ import kotlinx.coroutines.flow.collectIndexed import kotlinx.coroutines.flow.take import kotlinx.coroutines.test.runTest import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Before import org.junit.Rule import org.junit.Test -import kotlin.test.assertEquals -import kotlin.test.assertNotNull -import kotlin.test.assertNull @ExperimentalCoroutinesApi -class UpdateViewModelTest { +class UpdateViewModelTest : UiTestPrerequisites() { @get:Rule - val composeTestRule = createAndroidComposeRule() + val composeTestRule = createAndroidComposeRule() private lateinit var viewModel: UpdateViewModel private lateinit var checker: AppUpdateCheckerMock diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/util/PlayStoreUtilTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/util/PlayStoreUtilTest.kt index dda8f9f2..9cceb157 100644 --- a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/util/PlayStoreUtilTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/update/util/PlayStoreUtilTest.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.Intent import androidx.test.core.app.ApplicationProvider import androidx.test.filters.SmallTest -import kotlin.test.Test +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Test import kotlin.test.assertContains -import kotlin.test.assertEquals -import kotlin.test.assertNotNull class PlayStoreUtilTest {