Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/src/test/java/org/openedx/AppViewModelTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import org.openedx.app.AppViewModel
import org.openedx.app.data.storage.PreferencesManager
import org.openedx.app.deeplink.DeepLinkRouter
import org.openedx.app.room.AppDatabase
import org.openedx.core.CoreMocks
import org.openedx.core.config.Config
import org.openedx.core.config.FirebaseConfig
import org.openedx.core.data.model.User
import org.openedx.core.system.notifier.DownloadNotifier
import org.openedx.core.system.notifier.app.AppNotifier
import org.openedx.core.system.notifier.app.LogoutEvent
Expand All @@ -52,8 +52,6 @@ class AppViewModelTest {
private val context = mockk<Context>()
private val downloadNotifier = mockk<DownloadNotifier>()

private val user = User(0, "", "", "")

@Before
fun before() {
Dispatchers.setMain(dispatcher)
Expand All @@ -68,7 +66,7 @@ class AppViewModelTest {
@Test
fun setIdSuccess() = runTest {
every { analytics.setUserIdForSession(any()) } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { notifier.notifier } returns flow { }
every { preferencesManager.canResetAppDirectory } returns false
every { preferencesManager.pushToken } returns ""
Expand Down Expand Up @@ -102,7 +100,7 @@ class AppViewModelTest {
}
every { preferencesManager.clearCorePreferences() } returns Unit
every { analytics.setUserIdForSession(any()) } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { room.clearAllTables() } returns Unit
every { analytics.logoutEvent(true) } returns Unit
every { preferencesManager.canResetAppDirectory } returns false
Expand Down Expand Up @@ -140,7 +138,7 @@ class AppViewModelTest {
}
every { preferencesManager.clearCorePreferences() } returns Unit
every { analytics.setUserIdForSession(any()) } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { room.clearAllTables() } returns Unit
every { analytics.logoutEvent(true) } returns Unit
every { preferencesManager.canResetAppDirectory } returns false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import org.openedx.auth.presentation.AuthAnalytics
import org.openedx.auth.presentation.AuthRouter
import org.openedx.auth.presentation.sso.BrowserAuthHelper
import org.openedx.auth.presentation.sso.OAuthHelper
import org.openedx.core.CoreMocks
import org.openedx.core.Validator
import org.openedx.core.config.Config
import org.openedx.core.config.FacebookConfig
import org.openedx.core.config.GoogleConfig
import org.openedx.core.config.MicrosoftConfig
import org.openedx.core.data.model.User
import org.openedx.core.data.storage.CalendarPreferences
import org.openedx.core.data.storage.CorePreferences
import org.openedx.core.domain.interactor.CalendarInteractor
Expand Down Expand Up @@ -75,8 +75,6 @@ class SignInViewModelTest {
private val invalidEmailOrUsername = "Invalid email or username"
private val invalidPassword = "Password too short"

private val user = User(0, "", "", "")

@Before
fun before() {
Dispatchers.setMain(dispatcher)
Expand Down Expand Up @@ -109,7 +107,7 @@ class SignInViewModelTest {
@Test
fun `login empty credentials validation error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns false
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down Expand Up @@ -147,7 +145,7 @@ class SignInViewModelTest {
@Test
fun `login invalid email validation error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns false
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down Expand Up @@ -184,7 +182,7 @@ class SignInViewModelTest {
fun `login empty password validation error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns false
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
coVerify(exactly = 0) { interactor.login(any(), any()) }
Expand Down Expand Up @@ -222,7 +220,7 @@ class SignInViewModelTest {
fun `login invalid password validation error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns false
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down Expand Up @@ -262,7 +260,7 @@ class SignInViewModelTest {
fun `login success`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns true
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
coEvery { appNotifier.send(any<SignInEvent>()) } returns Unit
Expand Down Expand Up @@ -304,7 +302,7 @@ class SignInViewModelTest {
fun `login network error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns true
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down Expand Up @@ -347,7 +345,7 @@ class SignInViewModelTest {
fun `login invalid grant error`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns true
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down Expand Up @@ -390,7 +388,7 @@ class SignInViewModelTest {
fun `login unknown exception`() = runTest {
every { validator.isEmailOrUserNameValid(any()) } returns true
every { validator.isPasswordValid(any()) } returns true
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
val viewModel = SignInViewModel(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ import org.openedx.auth.presentation.AuthAnalytics
import org.openedx.auth.presentation.AuthRouter
import org.openedx.auth.presentation.sso.OAuthHelper
import org.openedx.core.ApiConstants
import org.openedx.core.CoreMocks
import org.openedx.core.R
import org.openedx.core.config.Config
import org.openedx.core.config.FacebookConfig
import org.openedx.core.config.GoogleConfig
import org.openedx.core.config.MicrosoftConfig
import org.openedx.core.data.model.User
import org.openedx.core.data.storage.CorePreferences
import org.openedx.core.domain.model.AgreementUrls
import org.openedx.core.domain.model.RegistrationField
Expand Down Expand Up @@ -98,8 +98,6 @@ class SignUpViewModelTest {
)
)

private val user = User(0, "", "", "")

//endregion

private val noInternet = "Slow or no internet connection"
Expand Down Expand Up @@ -149,7 +147,7 @@ class SignUpViewModelTest {
every { analytics.logEvent(any(), any()) } returns Unit
coEvery { interactor.register(parametersMap) } returns Unit
coEvery { interactor.login("", "") } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
viewModel.getRegistrationFields()
advanceUntilIdle()
Expand Down Expand Up @@ -198,7 +196,7 @@ class SignUpViewModelTest {
)
} returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
viewModel.getRegistrationFields()
advanceUntilIdle()
Expand Down Expand Up @@ -242,7 +240,7 @@ class SignUpViewModelTest {
coEvery { interactor.register(parametersMap) } returns Unit
coEvery { interactor.login("", "") } returns Unit
every { analytics.logEvent(any(), any()) } returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
viewModel.register()
advanceUntilIdle()
Expand Down Expand Up @@ -288,7 +286,7 @@ class SignUpViewModelTest {
parametersMap.getValue(ApiConstants.PASSWORD)
)
} returns Unit
every { preferencesManager.user } returns user
every { preferencesManager.user } returns CoreMocks.mockUser
every { analytics.setUserIdForSession(any()) } returns Unit
viewModel.getRegistrationFields()
advanceUntilIdle()
Expand Down
Loading
Loading