Skip to content

Add missing @Test annotation #4358

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

Merged
merged 1 commit into from
Aug 16, 2016
Merged

Add missing @Test annotation #4358

merged 1 commit into from
Aug 16, 2016

Conversation

dimitar-asenov
Copy link
Contributor

This annotation has been accidentally omitted when resolving a conflict during the merging of:
96feb27 and 98cccec
into:
d6bf9d1

We made PRs for both versions 1.x and 2.x.

We found the missing annotation while processing RxJava's git repository using a tool for structured code merge that we're developing as part of the Envision IDE: www.pm.inf.ethz.ch/research/envision.html

@akarnokd
Copy link
Member

Looks like a double post with #4359.

@akarnokd akarnokd closed this Aug 16, 2016
@akarnokd akarnokd added the Test label Aug 16, 2016
@akarnokd akarnokd added this to the 2.0 RC 1 milestone Aug 16, 2016
@dimitar-asenov
Copy link
Contributor Author

The two PRs are for two different versions: 1.x and 2.x. Is one PR really enough?

@akarnokd
Copy link
Member

Sorry, overlooked the version tag.

@akarnokd akarnokd reopened this Aug 16, 2016
@codecov-io
Copy link

Current coverage is 68.65% (diff: 100%)

Merging #4358 into 2.x will decrease coverage by <.01%

@@                2.x      #4358   diff @@
==========================================
  Files           434        434          
  Lines         30952      30952          
  Methods           0          0          
  Messages          0          0          
  Branches       4968       4968          
==========================================
- Hits          21251      21250     -1   
+ Misses         7628       7626     -2   
- Partials       2073       2076     +3   

Powered by Codecov. Last update 5688cc8...cff0e20

@akarnokd akarnokd merged commit 176346a into ReactiveX:2.x Aug 16, 2016
@dimitar-asenov dimitar-asenov deleted the 2.x branch August 17, 2016 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants