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 Servlet API 3 specific code #24

Merged
merged 2 commits into from
Aug 22, 2012
Merged

Remove Servlet API 3 specific code #24

merged 2 commits into from
Aug 22, 2012

Conversation

ryantxu
Copy link
Contributor

@ryantxu ryantxu commented Aug 21, 2012

We should avoid the complication of supporting Servlet API 3 explicitly since we are not using anything special in it.

This branch removes it, and moves the waffle-http class into waffle-mock

See discussion at:
https://groups.google.com/forum/?fromgroups=#!topic/waffle-users/ocBGxKC55aI

@@ -71,12 +69,15 @@ public void testImpersonateEnabled() throws IOException, ServletException {
Advapi32Util.getUserName().equals(
MockWindowsAccount.TEST_USER_NAME));
SimpleHttpRequest request = new SimpleHttpRequest();

//SimpleHttpRequest request = new SimpleHttpRequest();
Copy link
Collaborator

Choose a reason for hiding this comment

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

Take the habit of deleting code. This was clearly my mistake. Don't worry about this one - removing it in merge.

@dblock
Copy link
Collaborator

dblock commented Aug 22, 2012

Merging, thanks much for this. The mockito implementation is particularly nice.

@dblock dblock merged commit 3f7a1dc into Waffle:1.5 Aug 22, 2012
@ryantxu
Copy link
Contributor Author

ryantxu commented Aug 22, 2012

Thanks! Yes, Mockito makes writing tests much easier and (I think) cleaner. Also lets us avoid the hairy implementation details for things like servlet 2.5 vs 3.0

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.

None yet

2 participants