Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.x: Update marbles of onErrorResume(Next|With) + cleanup #7051

Merged

Conversation

akarnokd
Copy link
Member

@akarnokd akarnokd commented Aug 6, 2020

  • onErrorResumeNext marble now indicates the error and function-callback nature:

image

  • onErrorResumeWith marble now has the correct name (and retains the original onErrorResumeNext style):

image

  • Address now deprecated API usage of Mockito.
  • Few other style corrections.

Fixes #7050

@codecov
Copy link

codecov bot commented Aug 6, 2020

Codecov Report

Merging #7051 into 3.x will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##                3.x    #7051   +/-   ##
=========================================
  Coverage     99.51%   99.51%           
- Complexity     6668     6669    +1     
=========================================
  Files           742      742           
  Lines         47275    47275           
  Branches       6374     6374           
=========================================
+ Hits          47045    47048    +3     
  Misses          106      106           
+ Partials        124      121    -3     
Impacted Files Coverage Δ Complexity Δ
.../main/java/io/reactivex/rxjava3/core/Flowable.java 100.00% <ø> (ø) 595.00 <0.00> (ø)
...ain/java/io/reactivex/rxjava3/core/Observable.java 100.00% <ø> (ø) 565.00 <0.00> (ø)
...l/operators/observable/ObservableFlatMapMaybe.java 90.14% <0.00%> (-4.93%) 2.00% <0.00%> (ø%)
.../operators/flowable/FlowableBlockingSubscribe.java 93.02% <0.00%> (-4.66%) 10.00% <0.00%> (-1.00%)
...tivex/rxjava3/internal/jdk8/ParallelCollector.java 93.57% <0.00%> (-4.59%) 2.00% <0.00%> (ø%)
...a3/internal/subscribers/InnerQueuedSubscriber.java 97.72% <0.00%> (-2.28%) 16.00% <0.00%> (-1.00%)
...ernal/operators/flowable/FlowableFlatMapMaybe.java 93.78% <0.00%> (-1.56%) 2.00% <0.00%> (ø%)
...ava3/internal/operators/maybe/MaybeMergeArray.java 98.87% <0.00%> (-1.13%) 6.00% <0.00%> (ø%)
...ternal/operators/observable/ObservableGroupBy.java 98.90% <0.00%> (-1.10%) 2.00% <0.00%> (ø%)
...activex/rxjava3/processors/MulticastProcessor.java 99.54% <0.00%> (-0.46%) 82.00% <0.00%> (-1.00%)
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7ed8e1a...e9012a0. Read the comment docs.

@akarnokd akarnokd merged commit 5cbb607 into ReactiveX:3.x Aug 6, 2020
@akarnokd akarnokd deleted the ObservableErrorResumeWithMarbleFix branch September 12, 2020 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

onErrorResumeWith() javadoc has onErrorResumeNext() marble diagram
2 participants