From 21a6231493a3a1e5f52ed3deb9dc41d3f68518d6 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 29 Jan 2022 08:54:24 +0100 Subject: [PATCH 1/4] Bump Koin 3.1 --- build.gradle | 2 +- owncloudApp/build.gradle | 4 ++-- .../main/java/com/owncloud/android/extensions/ViewModelExt.kt | 4 ++-- .../com/owncloud/android/operations/SyncProfileOperation.kt | 4 ++-- .../owncloud/android/presentation/manager/AvatarManager.kt | 4 ++-- .../src/main/java/com/owncloud/android/utils/AvatarUtils.kt | 4 ++-- .../java/com/owncloud/android/workers/CameraUploadsWorker.kt | 4 ++-- .../com/owncloud/android/workers/OldLogsCollectorWorker.kt | 4 ++-- .../android/workers/UploadFileFromContentUriWorker.kt | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 6f30a7b4e57..ba902a489be 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { coroutinesVersion = "1.6.1" // Koin - koinVersion = '2.1.6' + koinVersion = '3.1.5' // Testing mockkVersion = '1.12.3' diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 34325d02de9..d4f57842f63 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -14,7 +14,7 @@ dependencies { // Dependencies for app building implementation "androidx.legacy:legacy-support-v4:$androidX" implementation "androidx.annotation:annotation:1.3.0" - implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.android.material:material:1.5.0' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'com.google.android.exoplayer:exoplayer:2.16.1' implementation 'com.github.aritraroy.PatternLockView:patternlockview:a90b0d4bf0' @@ -46,7 +46,7 @@ dependencies { // Koin dependency injector implementation "io.insert-koin:koin-core:$koinVersion" - implementation "io.insert-koin:koin-androidx-viewmodel:$koinVersion" + implementation "io.insert-koin:koin-androidx-workmanager:$koinVersion" // WorkManager implementation "androidx.work:work-runtime-ktx:2.7.1" diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt index 261d4bb1eff..1bf84895dfb 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt @@ -29,8 +29,8 @@ import com.owncloud.android.presentation.UIResult import com.owncloud.android.providers.ContextProvider import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.launch -import org.koin.core.KoinComponent -import org.koin.core.inject +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject import timber.log.Timber object ViewModelExt : KoinComponent { diff --git a/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt b/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt index 4863a495f11..048b8df2aa2 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt @@ -31,8 +31,8 @@ import com.owncloud.android.presentation.manager.AvatarManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.koin.core.KoinComponent -import org.koin.core.inject +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject import timber.log.Timber /** diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt index f6bc34539a6..bed4d39770f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt @@ -33,9 +33,9 @@ import com.owncloud.android.domain.user.model.UserAvatar import com.owncloud.android.domain.user.usecases.GetUserAvatarAsyncUseCase import com.owncloud.android.ui.DefaultAvatarTextDrawable import com.owncloud.android.utils.BitmapUtils -import org.koin.core.KoinComponent +import org.koin.core.component.KoinComponent import org.koin.core.error.InstanceCreationException -import org.koin.core.inject +import org.koin.core.component.inject import timber.log.Timber import kotlin.math.roundToInt diff --git a/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt b/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt index fa574710886..5d4dd961bf8 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt @@ -28,8 +28,8 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.koin.core.KoinComponent -import org.koin.core.inject +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject class AvatarUtils : KoinComponent { diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt index c1fff9bfc05..97f02387486 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt @@ -42,8 +42,8 @@ import com.owncloud.android.usecases.UploadFileFromContentUriUseCase import com.owncloud.android.utils.MimetypeIconUtil import com.owncloud.android.utils.NotificationUtils import com.owncloud.android.utils.UPLOAD_NOTIFICATION_CHANNEL_ID -import org.koin.core.KoinComponent -import org.koin.core.inject +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject import timber.log.Timber import java.io.File diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt index f31a6aea3bd..ef4b2c09895 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt @@ -22,8 +22,8 @@ import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import com.owncloud.android.data.storage.LocalStorageProvider -import org.koin.core.KoinComponent -import org.koin.core.inject +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject import timber.log.Timber import java.io.File import java.io.IOException diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt index b3dc301c826..3f5b4b3e6f9 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt @@ -54,7 +54,7 @@ import com.owncloud.android.lib.resources.files.UploadFileFromContentUriOperatio import com.owncloud.android.utils.NotificationUtils import com.owncloud.android.utils.RemoteFileUtils.Companion.getAvailableRemotePath import com.owncloud.android.utils.UPLOAD_NOTIFICATION_CHANNEL_ID -import org.koin.core.KoinComponent +import org.koin.core.component.KoinComponent import timber.log.Timber import java.io.File From 7865761400c40c418f9bc4ee684ee8c6d2859930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Mon, 25 Apr 2022 15:21:26 +0200 Subject: [PATCH 2/4] Fixing some tests and updating them removing some new deprecations --- build.gradle | 2 +- .../advanced/SettingsAdvancedFragmentTest.kt | 7 +++-- .../settings/security/PassCodeActivityTest.kt | 9 +++--- .../PublicShareEditionDialogFragmentTest.kt | 29 ++++++++++--------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index ba902a489be..40fbc75963c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { coroutinesVersion = "1.6.1" // Koin - koinVersion = '3.1.5' + koinVersion = '3.1.6' // Testing mockkVersion = '1.12.3' diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt index 46a01801aac..9c368fe5fd3 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt @@ -23,6 +23,7 @@ import android.content.Context import androidx.fragment.app.testing.FragmentScenario import androidx.fragment.app.testing.launchFragmentInContainer import androidx.preference.SwitchPreferenceCompat +import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers.withText @@ -40,6 +41,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Before import org.junit.Test +import org.koin.android.ext.koin.androidContext import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.core.context.startKoin import org.koin.core.context.stopKoin @@ -57,14 +59,15 @@ class SettingsAdvancedFragmentTest { @Before fun setUp() { context = InstrumentationRegistry.getInstrumentation().targetContext - advancedViewModel = mockk(relaxUnitFun = true) + advancedViewModel = mockk(relaxed = true) stopKoin() startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { advancedViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt index a7cc99297cf..b6c05fb06c7 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt @@ -75,21 +75,21 @@ class PassCodeActivityTest { @Before fun setUp() { context = ApplicationProvider.getApplicationContext() - passCodeViewModel = mockk(relaxUnitFun = true) - biometricViewModel = mockk(relaxUnitFun = true) + passCodeViewModel = mockk(relaxed = true) + biometricViewModel = mockk(relaxed = true) timeToUnlockLiveData = MutableLiveData() finishTimeToUnlockLiveData = MutableLiveData() statusLiveData = MutableLiveData() passcodeLiveData = MutableLiveData() - stopKoin() startKoin { + allowOverride(override = true) context modules( - module(override = true) { + module { viewModel { passCodeViewModel } @@ -107,7 +107,6 @@ class PassCodeActivityTest { every { passCodeViewModel.getFinishedTimeToUnlockLiveData } returns finishTimeToUnlockLiveData every { passCodeViewModel.status } returns statusLiveData every { passCodeViewModel.passcode } returns passcodeLiveData - } @After diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt index 19aaed59a3f..85d1f2cd1d7 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt @@ -68,25 +68,13 @@ class PublicShareEditionDialogFragmentTest { fun setUp() { every { ocCapabilityViewModel.capabilities } returns capabilitiesLiveData - val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToUpdate( - OC_FILE, - OC_ACCOUNT, - OC_SHARE.copy( - shareType = ShareType.PUBLIC_LINK, - shareWith = "user", - name = "Docs link", - permissions = RemoteShare.CREATE_PERMISSION_FLAG, - expirationDate = expirationDate, - isFolder = true - ) - ) - stopKoin() startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocCapabilityViewModel } @@ -97,6 +85,19 @@ class PublicShareEditionDialogFragmentTest { ) } + val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToUpdate( + OC_FILE, + OC_ACCOUNT, + OC_SHARE.copy( + shareType = ShareType.PUBLIC_LINK, + shareWith = "user", + name = "Docs link", + permissions = RemoteShare.CREATE_PERMISSION_FLAG, + expirationDate = expirationDate, + isFolder = true + ) + ) + ActivityScenario.launch(TestShareFileActivity::class.java).onActivity { it.startFragment(publicShareDialogFragment) } From 354fff0efe90f8c43eb57f638ee26fbcfa3fd666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Tue, 26 Apr 2022 09:02:22 +0200 Subject: [PATCH 3/4] Fix some more tests after bumping koin version --- .../owncloud/android/settings/SettingsFragmentTest.kt | 3 ++- .../settings/advanced/SettingsAdvancedFragmentTest.kt | 2 -- .../android/settings/logs/SettingsLogsFragmentTest.kt | 5 +++-- .../settings/security/SettingsSecurityFragmentTest.kt | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt index 2ba450e1ea1..1563123b778 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt @@ -87,8 +87,9 @@ class SettingsFragmentTest { startKoin { context + allowOverride(true) modules( - module(override = true) { + module{ viewModel { settingsViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt index 9c368fe5fd3..c28798b00f8 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt @@ -23,7 +23,6 @@ import android.content.Context import androidx.fragment.app.testing.FragmentScenario import androidx.fragment.app.testing.launchFragmentInContainer import androidx.preference.SwitchPreferenceCompat -import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.matcher.ViewMatchers.withText @@ -41,7 +40,6 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Before import org.junit.Test -import org.koin.android.ext.koin.androidContext import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.core.context.startKoin import org.koin.core.context.stopKoin diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt index 219dc39dc3b..da8d8015b27 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt @@ -68,15 +68,16 @@ class SettingsLogsFragmentTest { @Before fun setUp() { context = InstrumentationRegistry.getInstrumentation().targetContext - logsViewModel = mockk(relaxUnitFun = true) + logsViewModel = mockk(relaxed = true) logListViewModel = mockk(relaxed = true) stopKoin() startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { logsViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt index 08b0f55d262..db88db10fbd 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt @@ -42,8 +42,8 @@ import com.owncloud.android.R import com.owncloud.android.presentation.ui.security.BiometricActivity import com.owncloud.android.presentation.ui.security.BiometricManager import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT -import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity import com.owncloud.android.presentation.ui.security.PatternActivity +import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel @@ -84,16 +84,17 @@ class SettingsSecurityFragmentTest { @Before fun setUp() { context = InstrumentationRegistry.getInstrumentation().targetContext - securityViewModel = mockk(relaxUnitFun = true) - biometricViewModel = mockk(relaxUnitFun = true) + securityViewModel = mockk(relaxed = true) + biometricViewModel = mockk(relaxed = true) mockkObject(BiometricManager) stopKoin() startKoin { context + allowOverride(true) modules( - module(override = true) { + module { viewModel { securityViewModel } From efb282b4662cc481ab2aa3fe09a68bfaa70e7ff7 Mon Sep 17 00:00:00 2001 From: Fernando Sanz Date: Tue, 26 Apr 2022 09:30:21 +0200 Subject: [PATCH 4/4] Fixing some tests and updating them removing some new deprecations --- .../android/authentication/LoginActivityTest.kt | 3 ++- .../owncloud/android/logging/LogsListActivityTest.kt | 3 ++- .../owncloud/android/settings/SettingsFragmentTest.kt | 10 +++++----- .../settings/advanced/SettingsAdvancedFragmentTest.kt | 2 +- .../android/settings/more/SettingsMoreFragmentTest.kt | 5 +++-- .../android/settings/security/PatternActivityTest.kt | 3 ++- .../settings/security/SettingsSecurityFragmentTest.kt | 2 +- .../sharing/sharees/ui/SearchShareesFragmentTest.kt | 3 ++- .../sharing/shares/ui/EditPrivateShareFragmentTest.kt | 3 ++- .../shares/ui/PublicShareCreationDialogFragmentTest.kt | 3 ++- .../android/sharing/shares/ui/ShareFileFragmentTest.kt | 3 ++- .../sharing/shares/ui/ShareFolderFragmentTest.kt | 3 ++- .../android/ui/activity/ReleaseNotesActivityTest.kt | 7 ++++--- .../presentation/viewmodels/DrawerViewModelTest.kt | 3 ++- .../viewmodels/authentication/OAuthViewModelTest.kt | 3 ++- .../authentication/OCAuthenticationViewModelTest.kt | 3 ++- .../capabilities/OCCapabilityViewModelTest.kt | 3 ++- .../viewmodels/sharing/OCShareViewModelTest.kt | 3 ++- 18 files changed, 40 insertions(+), 25 deletions(-) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt index a64dfe55f09..fcecae0e4f3 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt @@ -129,8 +129,9 @@ class LoginActivityTest { startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocAuthenticationViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt index 2688745f0bd..5a9403d45b0 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt @@ -59,8 +59,9 @@ class LogsListActivityTest { stopKoin() startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { logListViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt index 1563123b778..1471082b76a 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt @@ -79,17 +79,17 @@ class SettingsFragmentTest { @Before fun setUp() { context = InstrumentationRegistry.getInstrumentation().targetContext - settingsViewModel = mockk(relaxUnitFun = true) - moreViewModel = mockk(relaxUnitFun = true) - releaseNotesViewModel = mockk(relaxUnitFun = true) + settingsViewModel = mockk(relaxed = true) + moreViewModel = mockk(relaxed = true) + releaseNotesViewModel = mockk(relaxed = true) stopKoin() startKoin { context - allowOverride(true) + allowOverride(override = true) modules( - module{ + module { viewModel { settingsViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt index c28798b00f8..5901466b85e 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt @@ -106,4 +106,4 @@ class SettingsAdvancedFragmentTest { prefShowHiddenFiles?.isChecked?.let { assertFalse(it) } } -} \ No newline at end of file +} diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt index 5ed515a5512..f1d3b056f29 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt @@ -74,14 +74,15 @@ class SettingsMoreFragmentTest { @Before fun setUp() { context = InstrumentationRegistry.getInstrumentation().targetContext - moreViewModel = mockk(relaxUnitFun = true) + moreViewModel = mockk(relaxed = true) stopKoin() startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { moreViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt index 17816d083d0..fa35caf206a 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt @@ -58,8 +58,9 @@ class PatternActivityTest { startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { patternViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt index db88db10fbd..e17acc0d2f9 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt @@ -92,7 +92,7 @@ class SettingsSecurityFragmentTest { startKoin { context - allowOverride(true) + allowOverride(override = true) modules( module { viewModel { diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt index 676a0ac8a38..ca18da3d4d3 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt @@ -61,8 +61,9 @@ class SearchShareesFragmentTest { startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocShareViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt index 59a5629efff..b8e21776802 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt @@ -70,8 +70,9 @@ class EditPrivateShareFragmentTest { startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocShareViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt index 73fd9618c33..b449a83a891 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt @@ -77,8 +77,9 @@ class PublicShareCreationDialogFragmentTest { startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocCapabilityViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt index bf774ce9369..fb389633a31 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt @@ -71,8 +71,9 @@ class ShareFileFragmentTest { startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocCapabilityViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt index f223ac2f02e..2d188523ef5 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt @@ -65,8 +65,9 @@ class ShareFolderFragmentTest { startKoin { androidContext(ApplicationProvider.getApplicationContext()) + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { ocCapabilityViewModel } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt index e279025e576..369c5e161a3 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt @@ -26,12 +26,12 @@ import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider import com.owncloud.android.R import com.owncloud.android.presentation.ui.releasenotes.ReleaseNotesActivity -import com.owncloud.android.utils.releaseNotesList import com.owncloud.android.presentation.viewmodels.releasenotes.ReleaseNotesViewModel import com.owncloud.android.utils.click import com.owncloud.android.utils.matchers.assertChildCount import com.owncloud.android.utils.matchers.isDisplayed import com.owncloud.android.utils.matchers.withText +import com.owncloud.android.utils.releaseNotesList import io.mockk.every import io.mockk.mockk import org.junit.Assert.assertEquals @@ -51,14 +51,15 @@ class ReleaseNotesActivityTest { @Before fun setUp() { context = ApplicationProvider.getApplicationContext() - releaseNotesViewModel = mockk(relaxUnitFun = true) + releaseNotesViewModel = mockk(relaxed = true) stopKoin() startKoin { context + allowOverride(override = true) modules( - module(override = true) { + module { viewModel { releaseNotesViewModel } diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt index 573bf6c7766..d1d4ccb568e 100644 --- a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt +++ b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt @@ -56,8 +56,9 @@ class DrawerViewModelTest : ViewModelTest() { Dispatchers.setMain(testCoroutineDispatcher) startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { factory { contextProvider } diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt index 1608670695c..55a9e818389 100644 --- a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt +++ b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt @@ -69,8 +69,9 @@ class OAuthViewModelTest : ViewModelTest() { Dispatchers.setMain(testCoroutineDispatcher) startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { factory { contextProvider } diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt index 013e44b5b40..e71f29af931 100644 --- a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt +++ b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt @@ -74,8 +74,9 @@ class OCAuthenticationViewModelTest : ViewModelTest() { Dispatchers.setMain(testCoroutineDispatcher) startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { factory { contextProvider } diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt index de3b767c94f..7b8d1359734 100644 --- a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt +++ b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt @@ -88,8 +88,9 @@ class OCCapabilityViewModelTest { Dispatchers.setMain(testCoroutineDispatcher) startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { factory { ocContextProvider } diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt index c93c0c5d0bf..e07663ad702 100644 --- a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt +++ b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt @@ -101,8 +101,9 @@ class OCShareViewModelTest { Dispatchers.setMain(testCoroutineDispatcher) startKoin { + allowOverride(override = true) modules( - module(override = true) { + module { factory { ocContextProvider }