2.x: Use predicates in BaseTestConsumer assertError(Class/Throwable) to remove duplicate code, tests tweaks to remove few IDE warnings#4627
Merged
akarnokd merged 2 commits intoReactiveX:2.xfrom Sep 28, 2016
jraska:2.x
Merged
2.x: Use predicates in BaseTestConsumer assertError(Class/Throwable) to remove duplicate code, tests tweaks to remove few IDE warnings#4627akarnokd merged 2 commits intoReactiveX:2.xfrom jraska:2.x
akarnokd merged 2 commits intoReactiveX:2.xfrom
jraska:2.x
Conversation
akarnokd
approved these changes
Sep 28, 2016
Current coverage is 78.07% (diff: 100%)@@ 2.x #4627 diff @@
==========================================
Files 557 557
Lines 36298 36278 -20
Methods 0 0
Messages 0 0
Branches 5571 5563 -8
==========================================
- Hits 28378 28323 -55
- Misses 5906 5934 +28
- Partials 2014 2021 +7
|
vanniktech
reviewed
Sep 29, 2016
| throw fail("Error not present"); | ||
| } | ||
| return (U)this; | ||
| return (U)assertError((Predicate)Functions.isInstanceOf(errorClass)); |
Collaborator
There was a problem hiding this comment.
Since this change I can't run ./gradlew test locally any longer:
error: incompatible types: BaseTestConsumer cannot be converted to U
return assertError((Predicate)Functions.isInstanceOf(errorClass));
Member
|
Super odd. Travis's Java 7 compiled it fine but 8u102' javac fails to compile it even though -source 1.6 is set. Eclipse complains about (U). I've restored (U) in master. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Messages and error checking was duplicates between all three assertError overloads.