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 unused constructors in the external AssumptionViolatedException. #993

Conversation

kcooney
Copy link
Member

@kcooney kcooney commented Sep 21, 2014

Remove unused constructors in the external AssumptionViolatedException.
Rename fields of internal AssumptionViolatedException so we don't break serialization with JUnit 4.11

@marcphilipp marcphilipp added this to the 4.12 milestone Sep 21, 2014

@DataPoint
public static Matcher<?> IS_THREE = is(3);
public static Matcher<Integer> IS_THREE = is(3);

@DataPoint
public static Matcher<?> NULL = null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be Matcher<Integer>, too. Even though the current Theories implementation will not take the type parameter into account.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Fixed

@kcooney kcooney force-pushed the AssumptionViolatedException-remove-unused-ctors branch from 30efd9a to fdc4374 Compare September 22, 2014 16:12
@kcooney
Copy link
Member Author

kcooney commented Sep 22, 2014

I am going to wait until #994 is merged, then rebase this pull before merging.

@kcooney kcooney force-pushed the AssumptionViolatedException-remove-unused-ctors branch from fdc4374 to d0b029f Compare September 24, 2014 20:17
@kcooney
Copy link
Member Author

kcooney commented Sep 24, 2014

Merged in changes from #994 and rebased. PTAL

marcphilipp added a commit that referenced this pull request Sep 24, 2014
…ve-unused-ctors

Remove unused constructors in the external AssumptionViolatedException.
@marcphilipp marcphilipp merged commit af83b6b into junit-team:master Sep 24, 2014
@marcphilipp
Copy link
Member

Thanks!

@kcooney
Copy link
Member Author

kcooney commented Sep 25, 2014

Thanks for reviewing! I owe you an update to the release notes

@marcphilipp
Copy link
Member

What do you want to update in the release notes?

@kcooney kcooney deleted the AssumptionViolatedException-remove-unused-ctors branch September 27, 2014 22:14
@kcooney
Copy link
Member Author

kcooney commented Sep 27, 2014

@marcphilipp just sent out #999

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.

2 participants