You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2013/10/21 03:30:17 UTC
svn commit: r1534016 - in /shindig/trunk:
java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
pom.xml
Author: lindner
Date: Mon Oct 21 01:30:16 2013
New Revision: 1534016
URL: http://svn.apache.org/r1534016
Log:
Upgrade easymock to 3.2
Modified:
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
shindig/trunk/pom.xml
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java?rev=1534016&r1=1534015&r2=1534016&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java Mon Oct 21 01:30:16 2013
@@ -191,17 +191,19 @@ public class OAuth2AuthCodeFlowTest exte
HttpServletResponse resp = mock(HttpServletResponse.class);
Capture<String> redirectURI = new Capture<String>();
resp.setHeader(EasyMock.eq("Location"), EasyMock.capture(redirectURI));
- resp.setStatus(EasyMock.eq(HttpServletResponse.SC_FOUND));
+ resp.setStatus(HttpServletResponse.SC_FOUND);
MockServletOutputStream outputStream = new MockServletOutputStream();
EasyMock.expect(resp.getOutputStream()).andReturn(outputStream).anyTimes();
PrintWriter writer = new PrintWriter(outputStream);
EasyMock.expect(resp.getWriter()).andReturn(writer).anyTimes();
replay();
+
servlet.service(req, resp);
writer.flush();
String response = new String(outputStream.getBuffer(), "UTF-8");
assertTrue(response == null || response.equals(""));
verify();
+
assertTrue(redirectURI.getValue().startsWith(REDIRECT_URI + "?code="));
String code = redirectURI.getValue().substring(
redirectURI.getValue().indexOf("=") + 1);
@@ -229,19 +231,20 @@ public class OAuth2AuthCodeFlowTest exte
HttpServletResponse resp = mock(HttpServletResponse.class);
Capture<String> redirectURI = new Capture<String>();
resp.setHeader(EasyMock.eq("Location"), EasyMock.capture(redirectURI));
- Capture<Integer> respCode = new Capture<Integer>();
- resp.setStatus(EasyMock.capture(respCode));
+ resp.setStatus(302);
+
MockServletOutputStream outputStream = new MockServletOutputStream();
EasyMock.expect(resp.getOutputStream()).andReturn(outputStream).anyTimes();
PrintWriter writer = new PrintWriter(outputStream);
EasyMock.expect(resp.getWriter()).andReturn(writer).anyTimes();
replay();
+
servlet.service(req, resp);
writer.flush();
String response = new String(outputStream.getBuffer(), "UTF-8");
assertTrue(response == null || response.equals(""));
verify();
- assertEquals((Integer) 302, respCode.getValue());
+
assertTrue(redirectURI.getValue().startsWith(REDIRECT_URI + "?code="));
String code = redirectURI.getValue().substring(
redirectURI.getValue().indexOf("=") + 1);
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1534016&r1=1534015&r2=1534016&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Mon Oct 21 01:30:16 2013
@@ -1484,7 +1484,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>