diff --git a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt index 2095dfa..9a8d7db 100644 --- a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt +++ b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt @@ -25,18 +25,24 @@ class LoginServiceTest { @Test fun login() { - val result = finishLoginService.login() - verify(blockstackLoginMock).login() + finishLoginService.login() + verify(blockstackLoginMock).login() } @Test fun finishLogin() { - whenever(blockstackLoginMock.handlePendingSignIn(any())).thenReturn( - Single.just(Operation(UserData(JSONObject().put("username", "JohnDoe.blockstack.id")))) - ) + val jsonObject = JSONObject().apply { + put("username", "JohnDoe.blockstack.id") + put("decentralizedID", "") + put("hubUrl", "") + } - val result = finishLoginService.finishLogin("/token1/token2/token3/token4").blockingGet() - assert(result.isSuccessful) + whenever(blockstackLoginMock.handlePendingSignIn(any())).thenReturn( + Single.just(Operation(UserData(jsonObject))) + ) + + val result = finishLoginService.finishLogin("/token1/token2/token3/token4").blockingGet() + assert(result.isSuccessful) } @Test diff --git a/app/src/main/java/app/envelop/data/repositories/UserRepository.kt b/app/src/main/java/app/envelop/data/repositories/UserRepository.kt index 7c7b6b5..24ff269 100644 --- a/app/src/main/java/app/envelop/data/repositories/UserRepository.kt +++ b/app/src/main/java/app/envelop/data/repositories/UserRepository.kt @@ -26,7 +26,7 @@ open class UserRepository } fun user() = userPreference.asObservable().subscribeOn(Schedulers.io())!! - fun setUser(user: User?) = userPreference.set(Optional.create(user)) + open fun setUser(user: User?) = userPreference.set(Optional.create(user)) companion object { private const val KEY_USER = "user"