From 7c01f96f2b572e8957f92cce1d7a365078f4e93f Mon Sep 17 00:00:00 2001 From: FilipeA Date: Thu, 18 Feb 2021 13:17:59 +0000 Subject: [PATCH 1/2] fixed: Testing --- .../java/app/envelop/domain/LoginServiceTest.kt | 10 ++++++++-- .../app/envelop/data/repositories/UserRepository.kt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt index 2095dfa..2dba4a9 100644 --- a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt +++ b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt @@ -25,14 +25,20 @@ class LoginServiceTest { @Test fun login() { - val result = finishLoginService.login() + finishLoginService.login() verify(blockstackLoginMock).login() } @Test fun finishLogin() { + val jsonObject = JSONObject().apply { + put("username", "JohnDoe.blockstack.id") + put("decentralizedID", "") + put("hubUrl", "") + } + whenever(blockstackLoginMock.handlePendingSignIn(any())).thenReturn( - Single.just(Operation(UserData(JSONObject().put("username", "JohnDoe.blockstack.id")))) + Single.just(Operation(UserData(jsonObject))) ) val result = finishLoginService.finishLogin("/token1/token2/token3/token4").blockingGet() 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" From debcddb6512774da32508a1608a0550e8cbb64cb Mon Sep 17 00:00:00 2001 From: FilipeA Date: Thu, 18 Feb 2021 13:19:19 +0000 Subject: [PATCH 2/2] fixed: Testing --- .../app/envelop/domain/LoginServiceTest.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt index 2dba4a9..9a8d7db 100644 --- a/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt +++ b/app/src/androidTest/java/app/envelop/domain/LoginServiceTest.kt @@ -26,23 +26,23 @@ class LoginServiceTest { @Test fun login() { finishLoginService.login() - verify(blockstackLoginMock).login() + verify(blockstackLoginMock).login() } @Test fun finishLogin() { val jsonObject = JSONObject().apply { - put("username", "JohnDoe.blockstack.id") - put("decentralizedID", "") - put("hubUrl", "") - } + put("username", "JohnDoe.blockstack.id") + put("decentralizedID", "") + put("hubUrl", "") + } - whenever(blockstackLoginMock.handlePendingSignIn(any())).thenReturn( - Single.just(Operation(UserData(jsonObject))) - ) + whenever(blockstackLoginMock.handlePendingSignIn(any())).thenReturn( + Single.just(Operation(UserData(jsonObject))) + ) - val result = finishLoginService.finishLogin("/token1/token2/token3/token4").blockingGet() - assert(result.isSuccessful) + val result = finishLoginService.finishLogin("/token1/token2/token3/token4").blockingGet() + assert(result.isSuccessful) } @Test