Skip to content

Commit eee9f27

Browse files
JuancaG05JuancaG05
authored
Merge pull request #3815 from owncloud/technical/some_refactoring
[TECHNICAL] Renamings and removing unnecessary stuff
2 parents 2af9859 + e29fce9 commit eee9f27

File tree

299 files changed

+1434
-2273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+1434
-2273
lines changed

‎owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt

+31-31
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ import com.owncloud.android.domain.server.model.AuthenticationMethod
4646
import com.owncloud.android.domain.server.model.ServerInfo
4747
import com.owncloud.android.domain.utils.Event
4848
import com.owncloud.android.extensions.parseError
49-
import com.owncloud.android.presentation.UIResult
50-
import com.owncloud.android.presentation.ui.authentication.ACTION_UPDATE_EXPIRED_TOKEN
51-
import com.owncloud.android.presentation.ui.authentication.ACTION_UPDATE_TOKEN
52-
import com.owncloud.android.presentation.ui.authentication.BASIC_TOKEN_TYPE
53-
import com.owncloud.android.presentation.ui.authentication.EXTRA_ACCOUNT
54-
import com.owncloud.android.presentation.ui.authentication.EXTRA_ACTION
55-
import com.owncloud.android.presentation.ui.authentication.KEY_AUTH_TOKEN_TYPE
56-
import com.owncloud.android.presentation.ui.authentication.LoginActivity
57-
import com.owncloud.android.presentation.ui.authentication.OAUTH_TOKEN_TYPE
58-
import com.owncloud.android.presentation.ui.settings.SettingsActivity
59-
import com.owncloud.android.presentation.viewmodels.authentication.OCAuthenticationViewModel
60-
import com.owncloud.android.presentation.viewmodels.oauth.OAuthViewModel
61-
import com.owncloud.android.presentation.viewmodels.settings.SettingsViewModel
49+
import com.owncloud.android.presentation.common.UIResult
50+
import com.owncloud.android.presentation.authentication.ACTION_UPDATE_EXPIRED_TOKEN
51+
import com.owncloud.android.presentation.authentication.ACTION_UPDATE_TOKEN
52+
import com.owncloud.android.presentation.authentication.BASIC_TOKEN_TYPE
53+
import com.owncloud.android.presentation.authentication.EXTRA_ACCOUNT
54+
import com.owncloud.android.presentation.authentication.EXTRA_ACTION
55+
import com.owncloud.android.presentation.authentication.KEY_AUTH_TOKEN_TYPE
56+
import com.owncloud.android.presentation.authentication.LoginActivity
57+
import com.owncloud.android.presentation.authentication.OAUTH_TOKEN_TYPE
58+
import com.owncloud.android.presentation.settings.SettingsActivity
59+
import com.owncloud.android.presentation.authentication.AuthenticationViewModel
60+
import com.owncloud.android.presentation.authentication.oauth.OAuthViewModel
61+
import com.owncloud.android.presentation.settings.SettingsViewModel
6262
import com.owncloud.android.providers.ContextProvider
6363
import com.owncloud.android.providers.MdmProvider
6464
import com.owncloud.android.testutil.OC_ACCOUNT
@@ -95,7 +95,7 @@ class LoginActivityTest {
9595

9696
private lateinit var activityScenario: ActivityScenario<LoginActivity>
9797

98-
private lateinit var ocAuthenticationViewModel: OCAuthenticationViewModel
98+
private lateinit var authenticationViewModel: AuthenticationViewModel
9999
private lateinit var oauthViewModel: OAuthViewModel
100100
private lateinit var settingsViewModel: SettingsViewModel
101101
private lateinit var ocContextProvider: ContextProvider
@@ -111,7 +111,7 @@ class LoginActivityTest {
111111
fun setUp() {
112112
context = ApplicationProvider.getApplicationContext()
113113

114-
ocAuthenticationViewModel = mockk(relaxed = true)
114+
authenticationViewModel = mockk(relaxed = true)
115115
oauthViewModel = mockk(relaxed = true)
116116
settingsViewModel = mockk(relaxUnitFun = true)
117117
ocContextProvider = mockk(relaxed = true)
@@ -122,10 +122,10 @@ class LoginActivityTest {
122122
supportsOauth2LiveData = MutableLiveData()
123123
baseUrlLiveData = MutableLiveData()
124124

125-
every { ocAuthenticationViewModel.loginResult } returns loginResultLiveData
126-
every { ocAuthenticationViewModel.serverInfo } returns serverInfoLiveData
127-
every { ocAuthenticationViewModel.supportsOAuth2 } returns supportsOauth2LiveData
128-
every { ocAuthenticationViewModel.baseUrl } returns baseUrlLiveData
125+
every { authenticationViewModel.loginResult } returns loginResultLiveData
126+
every { authenticationViewModel.serverInfo } returns serverInfoLiveData
127+
every { authenticationViewModel.supportsOAuth2 } returns supportsOauth2LiveData
128+
every { authenticationViewModel.baseUrl } returns baseUrlLiveData
129129
every { settingsViewModel.isThereAttachedAccount() } returns false
130130

131131
stopKoin()
@@ -136,7 +136,7 @@ class LoginActivityTest {
136136
modules(
137137
module {
138138
viewModel {
139-
ocAuthenticationViewModel
139+
authenticationViewModel
140140
}
141141
viewModel {
142142
oauthViewModel
@@ -212,7 +212,7 @@ class LoginActivityTest {
212212
showEmbeddedCheckServerButton = false
213213
)
214214

215-
verify(exactly = 1) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
215+
verify(exactly = 1) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
216216
}
217217

218218
@Test
@@ -225,7 +225,7 @@ class LoginActivityTest {
225225
R.id.centeredRefreshButton.isDisplayed(true)
226226
R.id.centeredRefreshButton.scrollAndClick()
227227

228-
verify(exactly = 2) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
228+
verify(exactly = 2) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
229229
serverInfoLiveData.postValue(Event(UIResult.Success(SERVER_INFO_BASIC.copy(isSecureConnection = true))))
230230

231231
R.id.centeredRefreshButton.isDisplayed(false)
@@ -271,7 +271,7 @@ class LoginActivityTest {
271271

272272
R.id.embeddedCheckServerButton.scrollAndClick()
273273

274-
verify(exactly = 1) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
274+
verify(exactly = 1) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
275275
}
276276

277277
@Test
@@ -281,7 +281,7 @@ class LoginActivityTest {
281281

282282
R.id.thumbnail.scrollAndClick()
283283

284-
verify(exactly = 1) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
284+
verify(exactly = 1) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
285285
}
286286

287287
@Test
@@ -410,7 +410,7 @@ class LoginActivityTest {
410410
withText(R.string.auth_can_not_auth_against_server)
411411
}
412412

413-
verify(exactly = 0) { ocAuthenticationViewModel.getServerInfo(any()) }
413+
verify(exactly = 0) { authenticationViewModel.getServerInfo(any()) }
414414
}
415415

416416
@Test
@@ -467,7 +467,7 @@ class LoginActivityTest {
467467
scrollAndClick()
468468
}
469469

470-
verify(exactly = 1) { ocAuthenticationViewModel.loginBasic(OC_BASIC_USERNAME, OC_BASIC_PASSWORD, null) }
470+
verify(exactly = 1) { authenticationViewModel.loginBasic(OC_BASIC_USERNAME, OC_BASIC_PASSWORD, null) }
471471
}
472472

473473
@Test
@@ -485,7 +485,7 @@ class LoginActivityTest {
485485
scrollAndClick()
486486
}
487487

488-
verify(exactly = 1) { ocAuthenticationViewModel.loginBasic(OC_BASIC_USERNAME, OC_BASIC_PASSWORD, null) }
488+
verify(exactly = 1) { authenticationViewModel.loginBasic(OC_BASIC_USERNAME, OC_BASIC_PASSWORD, null) }
489489
}
490490

491491
@Test
@@ -594,8 +594,8 @@ class LoginActivityTest {
594594

595595
launchTest(intent = intentWithAccount)
596596

597-
verify(exactly = 1) { ocAuthenticationViewModel.supportsOAuth2(OC_ACCOUNT.name) }
598-
verify(exactly = 1) { ocAuthenticationViewModel.getBaseUrl(OC_ACCOUNT.name) }
597+
verify(exactly = 1) { authenticationViewModel.supportsOAuth2(OC_ACCOUNT.name) }
598+
verify(exactly = 1) { authenticationViewModel.getBaseUrl(OC_ACCOUNT.name) }
599599
}
600600

601601
@Test
@@ -669,7 +669,7 @@ class LoginActivityTest {
669669
isFocusable(false)
670670
}
671671

672-
verify(exactly = 0) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
672+
verify(exactly = 0) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
673673
}
674674

675675
@Test
@@ -691,7 +691,7 @@ class LoginActivityTest {
691691
isFocusable(false)
692692
}
693693

694-
verify(exactly = 1) { ocAuthenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
694+
verify(exactly = 1) { authenticationViewModel.getServerInfo(OC_SERVER_INFO.baseUrl) }
695695
}
696696

697697
@Test

‎owncloudApp/src/androidTest/java/com/owncloud/android/files/SortBottomSheetFragmentTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import androidx.test.espresso.matcher.RootMatchers
2929
import androidx.test.espresso.matcher.ViewMatchers
3030
import androidx.test.espresso.matcher.ViewMatchers.withId
3131
import com.owncloud.android.R
32-
import com.owncloud.android.presentation.ui.files.SortBottomSheetFragment
33-
import com.owncloud.android.presentation.ui.files.SortOrder
34-
import com.owncloud.android.presentation.ui.files.SortType
32+
import com.owncloud.android.presentation.files.SortBottomSheetFragment
33+
import com.owncloud.android.presentation.files.SortOrder
34+
import com.owncloud.android.presentation.files.SortType
3535
import com.owncloud.android.utils.matchers.bsfItemWithIcon
3636
import com.owncloud.android.utils.matchers.bsfItemWithTitle
3737
import io.mockk.every

‎owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ package com.owncloud.android.logging
2222

2323
import androidx.test.core.app.ActivityScenario
2424
import com.owncloud.android.R
25-
import com.owncloud.android.presentation.ui.logging.LogsListActivity
26-
import com.owncloud.android.presentation.viewmodels.logging.LogListViewModel
25+
import com.owncloud.android.presentation.logging.LogsListActivity
26+
import com.owncloud.android.presentation.logging.LogListViewModel
2727
import com.owncloud.android.utils.matchers.assertChildCount
2828
import com.owncloud.android.utils.matchers.isDisplayed
2929
import com.owncloud.android.utils.matchers.withText

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
3535
import androidx.test.platform.app.InstrumentationRegistry
3636
import com.owncloud.android.BuildConfig
3737
import com.owncloud.android.R
38-
import com.owncloud.android.presentation.ui.releasenotes.ReleaseNotesActivity
39-
import com.owncloud.android.presentation.ui.settings.PrivacyPolicyActivity
40-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsFragment
41-
import com.owncloud.android.presentation.viewmodels.releasenotes.ReleaseNotesViewModel
42-
import com.owncloud.android.presentation.viewmodels.settings.SettingsMoreViewModel
43-
import com.owncloud.android.presentation.viewmodels.settings.SettingsViewModel
38+
import com.owncloud.android.presentation.releasenotes.ReleaseNotesActivity
39+
import com.owncloud.android.presentation.settings.privacypolicy.PrivacyPolicyActivity
40+
import com.owncloud.android.presentation.settings.SettingsFragment
41+
import com.owncloud.android.presentation.releasenotes.ReleaseNotesViewModel
42+
import com.owncloud.android.presentation.settings.more.SettingsMoreViewModel
43+
import com.owncloud.android.presentation.settings.SettingsViewModel
4444
import com.owncloud.android.utils.matchers.verifyPreference
4545
import com.owncloud.android.utils.releaseNotesList
4646
import io.mockk.every

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import androidx.test.espresso.action.ViewActions.click
2828
import androidx.test.espresso.matcher.ViewMatchers.withText
2929
import androidx.test.platform.app.InstrumentationRegistry
3030
import com.owncloud.android.R
31-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsAdvancedFragment
32-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsAdvancedFragment.Companion.PREF_SHOW_HIDDEN_FILES
33-
import com.owncloud.android.presentation.viewmodels.settings.SettingsAdvancedViewModel
31+
import com.owncloud.android.presentation.settings.advanced.SettingsAdvancedFragment
32+
import com.owncloud.android.presentation.settings.advanced.SettingsAdvancedFragment.Companion.PREF_SHOW_HIDDEN_FILES
33+
import com.owncloud.android.presentation.settings.advanced.SettingsAdvancedViewModel
3434
import com.owncloud.android.utils.matchers.verifyPreference
3535
import io.mockk.every
3636
import io.mockk.mockk

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
3535
import androidx.test.espresso.matcher.ViewMatchers.withText
3636
import androidx.test.platform.app.InstrumentationRegistry
3737
import com.owncloud.android.R
38-
import com.owncloud.android.presentation.ui.logging.LogsListActivity
39-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsLogsFragment
40-
import com.owncloud.android.presentation.viewmodels.logging.LogListViewModel
41-
import com.owncloud.android.presentation.viewmodels.settings.SettingsLogsViewModel
38+
import com.owncloud.android.presentation.logging.LogsListActivity
39+
import com.owncloud.android.presentation.settings.logging.SettingsLogsFragment
40+
import com.owncloud.android.presentation.logging.LogListViewModel
41+
import com.owncloud.android.presentation.settings.logging.SettingsLogsViewModel
4242
import com.owncloud.android.utils.matchers.verifyPreference
4343
import io.mockk.every
4444
import io.mockk.mockk

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
4040
import androidx.test.platform.app.InstrumentationRegistry
4141
import com.owncloud.android.BuildConfig
4242
import com.owncloud.android.R
43-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsMoreFragment
44-
import com.owncloud.android.presentation.viewmodels.settings.SettingsMoreViewModel
43+
import com.owncloud.android.presentation.settings.more.SettingsMoreFragment
44+
import com.owncloud.android.presentation.settings.more.SettingsMoreViewModel
4545
import com.owncloud.android.utils.matchers.verifyPreference
4646
import com.owncloud.android.utils.mockIntent
4747
import io.mockk.every

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
3838
import com.owncloud.android.R
3939
import com.owncloud.android.db.PreferenceManager
4040
import com.owncloud.android.domain.utils.Event
41-
import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
42-
import com.owncloud.android.presentation.ui.security.passcode.PasscodeAction
43-
import com.owncloud.android.presentation.ui.security.passcode.PasscodeType
44-
import com.owncloud.android.presentation.ui.security.passcode.Status
45-
import com.owncloud.android.presentation.viewmodels.security.BiometricViewModel
46-
import com.owncloud.android.presentation.viewmodels.security.PassCodeViewModel
41+
import com.owncloud.android.presentation.security.passcode.PassCodeActivity
42+
import com.owncloud.android.presentation.security.passcode.PasscodeAction
43+
import com.owncloud.android.presentation.security.passcode.PasscodeType
44+
import com.owncloud.android.presentation.security.passcode.Status
45+
import com.owncloud.android.presentation.security.biometric.BiometricViewModel
46+
import com.owncloud.android.presentation.security.passcode.PassCodeViewModel
4747
import com.owncloud.android.testutil.security.OC_PASSCODE_4_DIGITS
4848
import com.owncloud.android.utils.matchers.isDisplayed
4949
import com.owncloud.android.utils.matchers.withChildCountAndId
@@ -354,4 +354,4 @@ class PassCodeActivityTest {
354354
}
355355
activityScenario = ActivityScenario.launch(intent)
356356
}
357-
}
357+
}

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import androidx.test.core.app.ActivityScenario
2727
import androidx.test.core.app.ApplicationProvider
2828
import com.owncloud.android.R
2929
import com.owncloud.android.db.PreferenceManager
30-
import com.owncloud.android.presentation.ui.security.PatternActivity
31-
import com.owncloud.android.presentation.viewmodels.security.PatternViewModel
30+
import com.owncloud.android.presentation.security.pattern.PatternActivity
31+
import com.owncloud.android.presentation.security.pattern.PatternViewModel
3232
import com.owncloud.android.testutil.security.OC_PATTERN
3333
import com.owncloud.android.utils.matchers.isDisplayed
3434
import com.owncloud.android.utils.matchers.withText

‎owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ import androidx.test.espresso.matcher.ViewMatchers.isEnabled
3939
import androidx.test.espresso.matcher.ViewMatchers.withText
4040
import androidx.test.platform.app.InstrumentationRegistry
4141
import com.owncloud.android.R
42-
import com.owncloud.android.presentation.ui.security.BiometricActivity
43-
import com.owncloud.android.presentation.ui.security.BiometricManager
44-
import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT
45-
import com.owncloud.android.presentation.ui.security.PatternActivity
46-
import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
47-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment
48-
import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER
49-
import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel
42+
import com.owncloud.android.presentation.security.biometric.BiometricActivity
43+
import com.owncloud.android.presentation.security.biometric.BiometricManager
44+
import com.owncloud.android.presentation.security.PREFERENCE_LOCK_TIMEOUT
45+
import com.owncloud.android.presentation.security.pattern.PatternActivity
46+
import com.owncloud.android.presentation.security.passcode.PassCodeActivity
47+
import com.owncloud.android.presentation.settings.security.SettingsSecurityFragment
48+
import com.owncloud.android.presentation.settings.security.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER
49+
import com.owncloud.android.presentation.settings.security.SettingsSecurityViewModel
5050
import com.owncloud.android.testutil.security.OC_PATTERN
5151
import com.owncloud.android.utils.matchers.verifyPreference
5252
import com.owncloud.android.utils.mockIntent

‎owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import com.owncloud.android.R
3333
import com.owncloud.android.domain.sharing.shares.model.OCShare
3434
import com.owncloud.android.domain.sharing.shares.model.ShareType
3535
import com.owncloud.android.domain.utils.Event
36-
import com.owncloud.android.presentation.UIResult
37-
import com.owncloud.android.presentation.ui.sharing.fragments.SearchShareesFragment
38-
import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
36+
import com.owncloud.android.presentation.common.UIResult
37+
import com.owncloud.android.presentation.sharing.sharees.SearchShareesFragment
38+
import com.owncloud.android.presentation.sharing.ShareViewModel
3939
import com.owncloud.android.sharing.shares.ui.TestShareFileActivity
4040
import com.owncloud.android.testutil.OC_SHARE
4141
import io.mockk.every
@@ -50,12 +50,12 @@ import org.koin.core.context.stopKoin
5050
import org.koin.dsl.module
5151

5252
class SearchShareesFragmentTest {
53-
private val ocShareViewModel = mockkClass(OCShareViewModel::class, relaxed = true)
53+
private val shareViewModel = mockkClass(ShareViewModel::class, relaxed = true)
5454
private val sharesLiveData = MutableLiveData<Event<UIResult<List<OCShare>>>>()
5555

5656
@Before
5757
fun init() {
58-
every { ocShareViewModel.shares } returns sharesLiveData
58+
every { shareViewModel.shares } returns sharesLiveData
5959

6060
stopKoin()
6161

@@ -65,7 +65,7 @@ class SearchShareesFragmentTest {
6565
modules(
6666
module {
6767
viewModel {
68-
ocShareViewModel
68+
shareViewModel
6969
}
7070
}
7171
)

0 commit comments

Comments
 (0)