Fixing some tests and updating them removing some new deprecations

fesave · abelgardep · commit efb282b4662c · 2022-05-04T16:01:52.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -106,4 +106,4 @@ class SettingsAdvancedFragmentTest {
 
         prefShowHiddenFiles?.isChecked?.let { assertFalse(it) }
     }
-}
+}
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -101,8 +101,9 @@ class OCShareViewModelTest {
 
         Dispatchers.setMain(testCoroutineDispatcher)
         startKoin {
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     factory {
                         ocContextProvider
                     }

Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,4 @@ class SettingsAdvancedFragmentTest {`
`106`	`106`
`107`	`107`	`prefShowHiddenFiles?.isChecked?.let { assertFalse(it) }`
`108`	`108`	`}`
`109`		`-}`
	`109`	`+}`