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

Remove @Deprecated from MethodRule and related methods. #519

Merged
merged 4 commits into from
Oct 29, 2012

Conversation

kcooney
Copy link
Member

@kcooney kcooney commented Sep 29, 2012

Many developers are legitimate reasons to stick with MethodRule and the JUnit team has
no plans to remove support for MethodRule, so removing the @deprecated annotations
from MethodRule and methods that use MethodRule.

@dsaff
Copy link
Member

dsaff commented Oct 15, 2012

I'm good with this change, but I fell behind in reviews, and now it's not automatically mergeable. Can you merge and push again? Sorry, and thanks.

@dsaff
Copy link
Member

dsaff commented Oct 24, 2012

@kcooney, this should be safe to merge in before 4.11. Do you have time to fix the merge? (FYI, @marcphilipp)

Conflicts:
	src/main/java/org/junit/ClassRule.java
	src/main/java/org/junit/Rule.java
	src/main/java/org/junit/rules/MethodRule.java
	src/main/java/org/junit/rules/TestWatchman.java
	src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
@kcooney
Copy link
Member Author

kcooney commented Oct 24, 2012

Sorry for the delay; my day job has been busy.
The merge was quite painful due to the global reformatting. I could not figure out how to apply the new code formatting rules in Eclipse, so I checked out the master versions and manually reapplied by changes.

PTAL

@marcphilipp
Copy link
Member

@dsaff +1 Makes sense to be merged before 4.11 is released.

@dsaff
Copy link
Member

dsaff commented Oct 24, 2012

There's a lot of formatting churn still in this pull. I'm hoping, on another thread, to get @awulder to check in the Eclipse formatting file he used, so that we can automatically remove the churn.

@marcphilipp
Copy link
Member

@dsaff Actually the formatting is only in Javadoc comments and looks like it is in accordance with the style guide (4 character indentation).

IMHO this can be merged.

dsaff pushed a commit that referenced this pull request Oct 29, 2012
Remove @deprecated from MethodRule and related methods.
@dsaff dsaff merged commit 35505c4 into junit-team:master Oct 29, 2012
@dsaff
Copy link
Member

dsaff commented Oct 29, 2012

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants