You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by vs...@apache.org on 2009/04/05 13:10:03 UTC
svn commit: r762068 - in
/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet:
OAuthCallbackServletTest.java ServletTestFixture.java
Author: vsiveton
Date: Sun Apr 5 11:10:03 2009
New Revision: 762068
URL: http://svn.apache.org/viewvc?rev=762068&view=rev
Log:
SHINDIG-991: Make ServletTestFixture abstract to avoid misuse
Submitted by: Chi-Ngai Wan
o patch applied
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java?rev=762068&r1=762067&r2=762068&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java Sun Apr 5 11:10:03 2009
@@ -26,16 +26,14 @@
*/
public class OAuthCallbackServletTest extends ServletTestFixture {
- private final ServletTestFixture fixture = new ServletTestFixture();
-
@Test
public void testServlet() throws Exception {
OAuthCallbackServlet servlet = new OAuthCallbackServlet();
replay();
- servlet.doGet(fixture.request, fixture.recorder);
+ servlet.doGet(this.request, this.recorder);
verify();
- assertEquals("text/html; charset=UTF-8", fixture.recorder.getContentType());
- String body = fixture.recorder.getResponseAsString();
+ assertEquals("text/html; charset=UTF-8", this.recorder.getContentType());
+ String body = this.recorder.getResponseAsString();
Assert.assertNotSame("body is " + body, body.indexOf("window.close()"), -1);
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=762068&r1=762067&r2=762068&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Sun Apr 5 11:10:03 2009
@@ -45,7 +45,7 @@
*
* TODO: Get rid of 'stuff that shouldn't be here'.
*/
-public class ServletTestFixture extends EasyMockTestCase {
+public abstract class ServletTestFixture extends EasyMockTestCase {
public final RequestPipeline pipeline = mock(RequestPipeline.class);
public final CaptureRewriter rewriter = new CaptureRewriter();
public final ContentRewriterRegistry rewriterRegistry