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

Fixed issue #30 #56

Merged
merged 9 commits into from
Aug 21, 2014
Merged

Fixed issue #30 #56

merged 9 commits into from
Aug 21, 2014

Conversation

durron597
Copy link
Contributor

Added an extra conditional to prevent using MockProvider if it's an inner class, and added a test to verify that the new version works correctly. This fixes issue #30

Added a test case to verify that the behavior still works properly
for static inner classes.
@durron597
Copy link
Contributor Author

Well, apparently http://stackoverflow.com/a/7189981/1768232 isn't actually true

@christiangoudreau
Copy link
Member

Build issue is linked to checkstyle

@durron597
Copy link
Contributor Author

I copied the license from a different class and it's still failing.

@@ -0,0 +1,87 @@
/**
* Copyright 2013 ArcBees Inc.
Copy link
Member

Choose a reason for hiding this comment

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

2014 (Always inception year of the file)

Added contributors section to pom
* @param klass
*/
@Test(expected = ConfigurationException.class)
public void testInnerClass(InnerClass klass) {
Copy link
Member

Choose a reason for hiding this comment

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

I don't think you need to add javadoc on every method. Is it sending you an error because of that?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just saw a lot of javadoc errors on one of the builds and it was easier for me to add javadoc than to figure out which line numbers were which because I had deleted and moved stuff around.

I still haven't managed to get checkstyle to work on my local machine, so better to be safe than sorry. Feel free to modify the pull request on the way in if you like

Copy link
Member

Choose a reason for hiding this comment

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

That's fine, more is better than not enough :D

@christiangoudreau
Copy link
Member

LGTM! Merging

@christiangoudreau
Copy link
Member

@meriouma you can now start issue #58

@buildhive
Copy link

ArcBees » Jukito #144 SUCCESS
This pull request looks good
(what's this?)

christiangoudreau added a commit that referenced this pull request Aug 21, 2014
@christiangoudreau christiangoudreau merged commit 209c381 into ArcBees:master Aug 21, 2014
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