File tree Expand file tree Collapse file tree
owncloudApp/src/androidTest/java/com/owncloud/android/settings Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -87,8 +87,9 @@ class SettingsFragmentTest {
8787
8888 startKoin {
8989 context
90+ allowOverride(true )
9091 modules(
91- module( override = true ) {
92+ module{
9293 viewModel {
9394 settingsViewModel
9495 }
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import android.content.Context
2323import androidx.fragment.app.testing.FragmentScenario
2424import androidx.fragment.app.testing.launchFragmentInContainer
2525import androidx.preference.SwitchPreferenceCompat
26- import androidx.test.core.app.ApplicationProvider
2726import androidx.test.espresso.Espresso.onView
2827import androidx.test.espresso.action.ViewActions.click
2928import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -41,7 +40,6 @@ import org.junit.Assert.assertFalse
4140import org.junit.Assert.assertNotNull
4241import org.junit.Before
4342import org.junit.Test
44- import org.koin.android.ext.koin.androidContext
4543import org.koin.androidx.viewmodel.dsl.viewModel
4644import org.koin.core.context.startKoin
4745import org.koin.core.context.stopKoin
Original file line number Diff line number Diff line change @@ -68,15 +68,16 @@ class SettingsLogsFragmentTest {
6868 @Before
6969 fun setUp () {
7070 context = InstrumentationRegistry .getInstrumentation().targetContext
71- logsViewModel = mockk(relaxUnitFun = true )
71+ logsViewModel = mockk(relaxed = true )
7272 logListViewModel = mockk(relaxed = true )
7373
7474 stopKoin()
7575
7676 startKoin {
7777 context
78+ allowOverride(override = true )
7879 modules(
79- module( override = true ) {
80+ module {
8081 viewModel {
8182 logsViewModel
8283 }
Original file line number Diff line number Diff line change @@ -42,8 +42,8 @@ import com.owncloud.android.R
4242import com.owncloud.android.presentation.ui.security.BiometricActivity
4343import com.owncloud.android.presentation.ui.security.BiometricManager
4444import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT
45- import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
4645import com.owncloud.android.presentation.ui.security.PatternActivity
46+ import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
4747import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment
4848import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER
4949import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel
@@ -84,16 +84,17 @@ class SettingsSecurityFragmentTest {
8484 @Before
8585 fun setUp () {
8686 context = InstrumentationRegistry .getInstrumentation().targetContext
87- securityViewModel = mockk(relaxUnitFun = true )
88- biometricViewModel = mockk(relaxUnitFun = true )
87+ securityViewModel = mockk(relaxed = true )
88+ biometricViewModel = mockk(relaxed = true )
8989 mockkObject(BiometricManager )
9090
9191 stopKoin()
9292
9393 startKoin {
9494 context
95+ allowOverride(true )
9596 modules(
96- module( override = true ) {
97+ module {
9798 viewModel {
9899 securityViewModel
99100 }
You can’t perform that action at this time.
0 commit comments