Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Commit

Permalink
chore(access): change name from StorageUser to UserStorage, update in…
Browse files Browse the repository at this point in the history
… dependency
  • Loading branch information
AndreaBrighi committed Apr 28, 2023
1 parent 2f9cac9 commit 82d2111
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.intelligentbackpack.accessdata.datasource.AccessDomainRepositoryImpl
import com.intelligentbackpack.accessdata.datasource.AccessLocalDataStorageImpl
import com.intelligentbackpack.accessdata.datasource.AccessRemoteDataStorage
import com.intelligentbackpack.accessdata.exception.MissingUserException
import com.intelligentbackpack.accessdata.storage.StorageUserImpl
import com.intelligentbackpack.accessdata.storage.UserStorageImpl
import com.intelligentbackpack.accessdomain.entities.User
import org.junit.Assert.assertTrue
import org.junit.Assert.assertFalse
Expand Down Expand Up @@ -47,7 +47,7 @@ class AccessDomainRepositoryInstrumentedTest {
ArgumentMatchers.anyString()
)
).thenReturn(expectedUser)
val localAccessDataStorage = AccessLocalDataStorageImpl(StorageUserImpl(appContext))
val localAccessDataStorage = AccessLocalDataStorageImpl(UserStorageImpl(appContext))
val accessLocalDataStorage = AccessDomainRepositoryImpl(localAccessDataStorage, accessRemoteDataStorage)
assertFalse(localAccessDataStorage.isUserSaved())
val user = accessLocalDataStorage.loginWithData("test@gmail.com", "Test#1234")
Expand All @@ -64,7 +64,7 @@ class AccessDomainRepositoryInstrumentedTest {
.getInstrumentation()
.targetContext
val accessRemoteDataStorage = mock(AccessRemoteDataStorage::class.java)
val accessLocalDataStorage = AccessLocalDataStorageImpl(StorageUserImpl(appContext))
val accessLocalDataStorage = AccessLocalDataStorageImpl(UserStorageImpl(appContext))
accessLocalDataStorage.saveUser(expectedUser)
val accessDomainRepository = AccessDomainRepositoryImpl(accessLocalDataStorage, accessRemoteDataStorage)
assertTrue(accessLocalDataStorage.isUserSaved())
Expand All @@ -81,7 +81,7 @@ class AccessDomainRepositoryInstrumentedTest {
.getInstrumentation()
.targetContext
val accessRemoteDataStorage = mock(AccessRemoteDataStorage::class.java)
val accessLocalDataStorage = AccessLocalDataStorageImpl(StorageUserImpl(appContext))
val accessLocalDataStorage = AccessLocalDataStorageImpl(UserStorageImpl(appContext))
val accessDomainRepository = AccessDomainRepositoryImpl(accessLocalDataStorage, accessRemoteDataStorage)
assertFalse(accessLocalDataStorage.isUserSaved())
assertThrows(MissingUserException::class.java) {
Expand All @@ -96,7 +96,7 @@ class AccessDomainRepositoryInstrumentedTest {
.getInstrumentation()
.targetContext
val accessRemoteDataStorage = mock(AccessRemoteDataStorage::class.java)
val accessLocalDataStorage = AccessLocalDataStorageImpl(StorageUserImpl(appContext))
val accessLocalDataStorage = AccessLocalDataStorageImpl(UserStorageImpl(appContext))
accessLocalDataStorage.saveUser(expectedUser)
val accessDomainRepository = AccessDomainRepositoryImpl(accessLocalDataStorage, accessRemoteDataStorage)
assertTrue(accessDomainRepository.isUserLogged())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package com.intelligentbackpack.accessdata
import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.intelligentbackpack.accessdata.storage.StorageUser
import com.intelligentbackpack.accessdata.storage.StorageUserImpl
import com.intelligentbackpack.accessdata.storage.UserStorage
import com.intelligentbackpack.accessdata.storage.UserStorageImpl
import com.intelligentbackpack.accessdomain.entities.User
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
Expand All @@ -15,18 +15,18 @@ import org.junit.runner.RunWith

/**
* Instrumented test, which will execute on an Android device.
* Tests for [StorageUser]
* Tests for [UserStorage]
*/
@RunWith(AndroidJUnit4::class)
class StorageUserInstrumentedTest {
class UserStorageInstrumentedTest {

@Test
fun initiallyAUserIsntLogged() {
val appContext =
InstrumentationRegistry
.getInstrumentation()
.targetContext
val storage: StorageUser = StorageUserImpl(appContext)
val storage: UserStorage = UserStorageImpl(appContext)
assertFalse(storage.isUserSaved())
}

Expand All @@ -36,7 +36,7 @@ class StorageUserInstrumentedTest {
InstrumentationRegistry
.getInstrumentation()
.targetContext
val storage: StorageUser = StorageUserImpl(appContext)
val storage: UserStorage = UserStorageImpl(appContext)
val expectedUser = User.build {
email = "test@gmail.com"
password = "Test#1234"
Expand All @@ -55,7 +55,7 @@ class StorageUserInstrumentedTest {
InstrumentationRegistry
.getInstrumentation()
.targetContext
val storage: StorageUser = StorageUserImpl(appContext)
val storage: UserStorage = UserStorageImpl(appContext)
assertFalse(storage.isUserSaved())
assertThrows(IllegalStateException::class.java) {
storage.getUser()
Expand All @@ -65,7 +65,7 @@ class StorageUserInstrumentedTest {
@Test
fun deleteUser() {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
val storage: StorageUser = StorageUserImpl(appContext)
val storage: UserStorage = UserStorageImpl(appContext)
val expectedUser = User.build {
email = "test@gmail.com"
password = "Test#1234"
Expand All @@ -81,7 +81,7 @@ class StorageUserInstrumentedTest {
@Test
fun passwordIsEncrypted() {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
val storage: StorageUser = StorageUserImpl(appContext)
val storage: UserStorage = UserStorageImpl(appContext)
val expectedUser = User.build {
email = "test@gmail.com"
password = "Test#1234"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.intelligentbackpack.accessdata.datasource

import com.intelligentbackpack.accessdata.exception.MissingUserException
import com.intelligentbackpack.accessdata.exception.SavingUserException
import com.intelligentbackpack.accessdata.storage.StorageUser
import com.intelligentbackpack.accessdata.storage.UserStorage
import com.intelligentbackpack.accessdomain.entities.User

class AccessLocalDataStorageImpl(private val storage: StorageUser) : AccessLocalDataStorage {
class AccessLocalDataStorageImpl(private val storage: UserStorage) : AccessLocalDataStorage {

override fun isUserSaved(): Boolean {
return storage.isUserSaved()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.intelligentbackpack.accessdata.storage

import com.intelligentbackpack.accessdomain.entities.User

interface StorageUser {
interface UserStorage {

fun isUserSaved(): Boolean

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import androidx.security.crypto.MasterKey
import com.intelligentbackpack.accessdomain.entities.Role
import com.intelligentbackpack.accessdomain.entities.User

class StorageUserImpl(private val context: Context) : StorageUser {
class UserStorageImpl(private val context: Context) : UserStorage {

private val name = "IntelligentBackpackSharedPref"

Expand Down

0 comments on commit 82d2111

Please sign in to comment.