This repository has been archived by the owner on Aug 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce ResolvedSubscriber and fix tests
- Loading branch information
Showing
7 changed files
with
129 additions
and
9 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
...java/pro/averin/anton/clean/android/cookbook/data/common/resolution/ResolvedSubscriber.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package pro.averin.anton.clean.android.cookbook.data.common.resolution | ||
|
|
||
| import pro.averin.anton.clean.android.cookbook.ui.common.resolution.Resolution | ||
| import retrofit2.adapter.rxjava.HttpException | ||
| import rx.Subscriber | ||
|
|
||
|
|
||
| class ResolvedSubscriber<T> constructor( | ||
| val resolution: Resolution, | ||
| val onNextFunc: (T) -> Unit, | ||
| val onCompletedFunc: () -> Unit = {}, | ||
| val onErrorFunc: (Throwable?) -> Unit = {}) : Subscriber<T>() { | ||
|
|
||
| override fun onNext(p0: T) { | ||
| if (!isUnsubscribed) { | ||
| onNextFunc(p0) | ||
| } | ||
| } | ||
|
|
||
| override fun onCompleted() { | ||
| onCompletedFunc() | ||
| } | ||
|
|
||
| override fun onError(throwable: Throwable?) { | ||
| when (throwable) { | ||
| is HttpException -> resolution.onHttpException(throwable) | ||
| // let your location implementation throw a custom exception on timeout, for example | ||
| // is NetworkLocationTimeoutException -> resolution.onNetworkLocationError() | ||
| else -> throwable?.apply { resolution.onGenericRxException(this) } | ||
| } | ||
|
|
||
| onErrorFunc(throwable) | ||
| } | ||
|
|
||
| } |
5 changes: 5 additions & 0 deletions
5
app/src/main/java/pro/averin/anton/clean/android/cookbook/ui/common/view/UIContracts.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...va/pro/averin/anton/clean/android/cookbook/ui/googlemaps/view/GoogleMapsScreenContract.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| package pro.averin.anton.clean.android.cookbook.ui.googlemaps.view | ||
|
|
||
| import pro.averin.anton.clean.android.cookbook.ui.common.view.ScreenContract | ||
| import pro.averin.anton.clean.android.cookbook.ui.common.view.ResolvedScreenContract | ||
|
|
||
|
|
||
| interface GoogleMapsScreenContract : ScreenContract { | ||
| interface GoogleMapsScreenContract : ResolvedScreenContract { | ||
| } |
66 changes: 66 additions & 0 deletions
66
.../pro/averin/anton/clean/android/cookbook/data/common/resolution/ResolvedSubscriberTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package pro.averin.anton.clean.android.cookbook.data.common.resolution | ||
|
|
||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.Mock | ||
| import org.powermock.core.classloader.annotations.PrepareForTest | ||
| import org.powermock.modules.junit4.PowerMockRunner | ||
| import pro.averin.anton.clean.android.cookbook.kotlin.test.verify | ||
| import pro.averin.anton.clean.android.cookbook.ui.common.resolution.Resolution | ||
| import pro.averin.anton.clean.android.cookbook.ui.common.resolution.UIResolver | ||
| import retrofit2.adapter.rxjava.HttpException | ||
|
|
||
| @RunWith(PowerMockRunner::class) | ||
| @PrepareForTest(HttpException::class, UIResolver::class) | ||
| class ResolvedSubscriberTest { | ||
|
|
||
| @Mock lateinit var resolution: Resolution | ||
| @Mock lateinit var obj: Throwable | ||
|
|
||
| @Mock lateinit var httpException: HttpException | ||
| @Mock lateinit var genericRxException: Throwable | ||
|
|
||
| var onNextFunc: (Throwable) -> Unit = { | ||
| it.printStackTrace() | ||
| } | ||
|
|
||
| var onCompletedFunc: () -> Unit = { | ||
|
|
||
| } | ||
|
|
||
| lateinit var classToTest: ResolvedSubscriber<Throwable> | ||
|
|
||
| @Before | ||
| fun setup() { | ||
| classToTest = ResolvedSubscriber(resolution, onNextFunc, onCompletedFunc) | ||
| } | ||
|
|
||
| @Test | ||
| fun onNextCallsOnNextFunc() { | ||
| // when | ||
| classToTest.onNext(obj) | ||
|
|
||
| // then | ||
| verify(obj).printStackTrace() | ||
| } | ||
|
|
||
| @Test | ||
| fun onErrorCallsHttpResolutionOnHttpException() { | ||
| // when | ||
| classToTest.onError(httpException) | ||
|
|
||
| // then | ||
| verify(resolution).onHttpException(httpException) | ||
| } | ||
|
|
||
| @Test | ||
| fun onErrorCallsGenericResolutionOnGenericRxException() { | ||
| // when | ||
| classToTest.onError(genericRxException) | ||
|
|
||
| // then | ||
| verify(resolution).onGenericRxException(genericRxException) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters