Skip to content

Commit a8ddde8

Browse files
PavloNetrebchukPavloNetrebchuk
authored
chore: reusing mocks (#469)
1 parent c0fe884 commit a8ddde8

File tree

58 files changed

+1172
-2685
lines changed

Some content is hidden

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

58 files changed

+1172
-2685
lines changed

‎app/src/test/java/org/openedx/AppViewModelTest.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import org.openedx.app.AppViewModel
2626
import org.openedx.app.data.storage.PreferencesManager
2727
import org.openedx.app.deeplink.DeepLinkRouter
2828
import org.openedx.app.room.AppDatabase
29+
import org.openedx.core.CoreMocks
2930
import org.openedx.core.config.Config
3031
import org.openedx.core.config.FirebaseConfig
31-
import org.openedx.core.data.model.User
3232
import org.openedx.core.system.notifier.DownloadNotifier
3333
import org.openedx.core.system.notifier.app.AppNotifier
3434
import org.openedx.core.system.notifier.app.LogoutEvent
@@ -52,8 +52,6 @@ class AppViewModelTest {
5252
private val context = mockk<Context>()
5353
private val downloadNotifier = mockk<DownloadNotifier>()
5454

55-
private val user = User(0, "", "", "")
56-
5755
@Before
5856
fun before() {
5957
Dispatchers.setMain(dispatcher)
@@ -68,7 +66,7 @@ class AppViewModelTest {
6866
@Test
6967
fun setIdSuccess() = runTest {
7068
every { analytics.setUserIdForSession(any()) } returns Unit
71-
every { preferencesManager.user } returns user
69+
every { preferencesManager.user } returns CoreMocks.mockUser
7270
every { notifier.notifier } returns flow { }
7371
every { preferencesManager.canResetAppDirectory } returns false
7472
every { preferencesManager.pushToken } returns ""
@@ -102,7 +100,7 @@ class AppViewModelTest {
102100
}
103101
every { preferencesManager.clearCorePreferences() } returns Unit
104102
every { analytics.setUserIdForSession(any()) } returns Unit
105-
every { preferencesManager.user } returns user
103+
every { preferencesManager.user } returns CoreMocks.mockUser
106104
every { room.clearAllTables() } returns Unit
107105
every { analytics.logoutEvent(true) } returns Unit
108106
every { preferencesManager.canResetAppDirectory } returns false
@@ -140,7 +138,7 @@ class AppViewModelTest {
140138
}
141139
every { preferencesManager.clearCorePreferences() } returns Unit
142140
every { analytics.setUserIdForSession(any()) } returns Unit
143-
every { preferencesManager.user } returns user
141+
every { preferencesManager.user } returns CoreMocks.mockUser
144142
every { room.clearAllTables() } returns Unit
145143
every { analytics.logoutEvent(true) } returns Unit
146144
every { preferencesManager.canResetAppDirectory } returns false

‎auth/src/test/java/org/openedx/auth/presentation/signin/SignInViewModelTest.kt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import org.openedx.auth.presentation.AuthAnalytics
2828
import org.openedx.auth.presentation.AuthRouter
2929
import org.openedx.auth.presentation.sso.BrowserAuthHelper
3030
import org.openedx.auth.presentation.sso.OAuthHelper
31+
import org.openedx.core.CoreMocks
3132
import org.openedx.core.Validator
3233
import org.openedx.core.config.Config
3334
import org.openedx.core.config.FacebookConfig
3435
import org.openedx.core.config.GoogleConfig
3536
import org.openedx.core.config.MicrosoftConfig
36-
import org.openedx.core.data.model.User
3737
import org.openedx.core.data.storage.CalendarPreferences
3838
import org.openedx.core.data.storage.CorePreferences
3939
import org.openedx.core.domain.interactor.CalendarInteractor
@@ -75,8 +75,6 @@ class SignInViewModelTest {
7575
private val invalidEmailOrUsername = "Invalid email or username"
7676
private val invalidPassword = "Password too short"
7777

78-
private val user = User(0, "", "", "")
79-
8078
@Before
8179
fun before() {
8280
Dispatchers.setMain(dispatcher)
@@ -109,7 +107,7 @@ class SignInViewModelTest {
109107
@Test
110108
fun `login empty credentials validation error`() = runTest {
111109
every { validator.isEmailOrUserNameValid(any()) } returns false
112-
every { preferencesManager.user } returns user
110+
every { preferencesManager.user } returns CoreMocks.mockUser
113111
every { analytics.setUserIdForSession(any()) } returns Unit
114112
every { analytics.logEvent(any(), any()) } returns Unit
115113
val viewModel = SignInViewModel(
@@ -147,7 +145,7 @@ class SignInViewModelTest {
147145
@Test
148146
fun `login invalid email validation error`() = runTest {
149147
every { validator.isEmailOrUserNameValid(any()) } returns false
150-
every { preferencesManager.user } returns user
148+
every { preferencesManager.user } returns CoreMocks.mockUser
151149
every { analytics.setUserIdForSession(any()) } returns Unit
152150
every { analytics.logEvent(any(), any()) } returns Unit
153151
val viewModel = SignInViewModel(
@@ -184,7 +182,7 @@ class SignInViewModelTest {
184182
fun `login empty password validation error`() = runTest {
185183
every { validator.isEmailOrUserNameValid(any()) } returns true
186184
every { validator.isPasswordValid(any()) } returns false
187-
every { preferencesManager.user } returns user
185+
every { preferencesManager.user } returns CoreMocks.mockUser
188186
every { analytics.setUserIdForSession(any()) } returns Unit
189187
every { analytics.logEvent(any(), any()) } returns Unit
190188
coVerify(exactly = 0) { interactor.login(any(), any()) }
@@ -222,7 +220,7 @@ class SignInViewModelTest {
222220
fun `login invalid password validation error`() = runTest {
223221
every { validator.isEmailOrUserNameValid(any()) } returns true
224222
every { validator.isPasswordValid(any()) } returns false
225-
every { preferencesManager.user } returns user
223+
every { preferencesManager.user } returns CoreMocks.mockUser
226224
every { analytics.setUserIdForSession(any()) } returns Unit
227225
every { analytics.logEvent(any(), any()) } returns Unit
228226
val viewModel = SignInViewModel(
@@ -262,7 +260,7 @@ class SignInViewModelTest {
262260
fun `login success`() = runTest {
263261
every { validator.isEmailOrUserNameValid(any()) } returns true
264262
every { validator.isPasswordValid(any()) } returns true
265-
every { preferencesManager.user } returns user
263+
every { preferencesManager.user } returns CoreMocks.mockUser
266264
every { analytics.setUserIdForSession(any()) } returns Unit
267265
every { analytics.logEvent(any(), any()) } returns Unit
268266
coEvery { appNotifier.send(any<SignInEvent>()) } returns Unit
@@ -304,7 +302,7 @@ class SignInViewModelTest {
304302
fun `login network error`() = runTest {
305303
every { validator.isEmailOrUserNameValid(any()) } returns true
306304
every { validator.isPasswordValid(any()) } returns true
307-
every { preferencesManager.user } returns user
305+
every { preferencesManager.user } returns CoreMocks.mockUser
308306
every { analytics.setUserIdForSession(any()) } returns Unit
309307
every { analytics.logEvent(any(), any()) } returns Unit
310308
val viewModel = SignInViewModel(
@@ -347,7 +345,7 @@ class SignInViewModelTest {
347345
fun `login invalid grant error`() = runTest {
348346
every { validator.isEmailOrUserNameValid(any()) } returns true
349347
every { validator.isPasswordValid(any()) } returns true
350-
every { preferencesManager.user } returns user
348+
every { preferencesManager.user } returns CoreMocks.mockUser
351349
every { analytics.setUserIdForSession(any()) } returns Unit
352350
every { analytics.logEvent(any(), any()) } returns Unit
353351
val viewModel = SignInViewModel(
@@ -390,7 +388,7 @@ class SignInViewModelTest {
390388
fun `login unknown exception`() = runTest {
391389
every { validator.isEmailOrUserNameValid(any()) } returns true
392390
every { validator.isPasswordValid(any()) } returns true
393-
every { preferencesManager.user } returns user
391+
every { preferencesManager.user } returns CoreMocks.mockUser
394392
every { analytics.setUserIdForSession(any()) } returns Unit
395393
every { analytics.logEvent(any(), any()) } returns Unit
396394
val viewModel = SignInViewModel(

‎auth/src/test/java/org/openedx/auth/presentation/signup/SignUpViewModelTest.kt‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ import org.openedx.auth.presentation.AuthAnalytics
3232
import org.openedx.auth.presentation.AuthRouter
3333
import org.openedx.auth.presentation.sso.OAuthHelper
3434
import org.openedx.core.ApiConstants
35+
import org.openedx.core.CoreMocks
3536
import org.openedx.core.R
3637
import org.openedx.core.config.Config
3738
import org.openedx.core.config.FacebookConfig
3839
import org.openedx.core.config.GoogleConfig
3940
import org.openedx.core.config.MicrosoftConfig
40-
import org.openedx.core.data.model.User
4141
import org.openedx.core.data.storage.CorePreferences
4242
import org.openedx.core.domain.model.AgreementUrls
4343
import org.openedx.core.domain.model.RegistrationField
@@ -98,8 +98,6 @@ class SignUpViewModelTest {
9898
)
9999
)
100100

101-
private val user = User(0, "", "", "")
102-
103101
//endregion
104102

105103
private val noInternet = "Slow or no internet connection"
@@ -149,7 +147,7 @@ class SignUpViewModelTest {
149147
every { analytics.logEvent(any(), any()) } returns Unit
150148
coEvery { interactor.register(parametersMap) } returns Unit
151149
coEvery { interactor.login("", "") } returns Unit
152-
every { preferencesManager.user } returns user
150+
every { preferencesManager.user } returns CoreMocks.mockUser
153151
every { analytics.setUserIdForSession(any()) } returns Unit
154152
viewModel.getRegistrationFields()
155153
advanceUntilIdle()
@@ -198,7 +196,7 @@ class SignUpViewModelTest {
198196
)
199197
} returns Unit
200198
every { analytics.logEvent(any(), any()) } returns Unit
201-
every { preferencesManager.user } returns user
199+
every { preferencesManager.user } returns CoreMocks.mockUser
202200
every { analytics.setUserIdForSession(any()) } returns Unit
203201
viewModel.getRegistrationFields()
204202
advanceUntilIdle()
@@ -242,7 +240,7 @@ class SignUpViewModelTest {
242240
coEvery { interactor.register(parametersMap) } returns Unit
243241
coEvery { interactor.login("", "") } returns Unit
244242
every { analytics.logEvent(any(), any()) } returns Unit
245-
every { preferencesManager.user } returns user
243+
every { preferencesManager.user } returns CoreMocks.mockUser
246244
every { analytics.setUserIdForSession(any()) } returns Unit
247245
viewModel.register()
248246
advanceUntilIdle()
@@ -288,7 +286,7 @@ class SignUpViewModelTest {
288286
parametersMap.getValue(ApiConstants.PASSWORD)
289287
)
290288
} returns Unit
291-
every { preferencesManager.user } returns user
289+
every { preferencesManager.user } returns CoreMocks.mockUser
292290
every { analytics.setUserIdForSession(any()) } returns Unit
293291
viewModel.getRegistrationFields()
294292
advanceUntilIdle()

0 commit comments

Comments
 (0)