|
From: Steve F. <sm...@us...> - 2001-08-27 11:20:26
|
Update of /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/password
In directory usw-pr-cvs1:/tmp/cvs-serv13887
Modified Files:
ForgotPasswordServlet.java TestForgotPasswordServlet.java
Added Files:
StubServletConfig.java
Log Message:
Moved password reminder hook to servlet constructor
--- NEW FILE: StubServletConfig.java ---
package com.mockobjects.examples.password;
import java.util.Enumeration;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import junit.framework.AssertionFailedError;
public class StubServletConfig implements ServletConfig {
public String getInitParameter(String s) {
throw new AssertionFailedError("not expected: " + s);
}
public Enumeration getInitParameterNames() {
throw new AssertionFailedError("not expected");
}
public ServletContext getServletContext() {
throw new AssertionFailedError("not expected");
}
public String getServletName() {
throw new AssertionFailedError("not expected");
}
}
Index: ForgotPasswordServlet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/password/ForgotPasswordServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ForgotPasswordServlet.java 2001/08/21 00:16:27 1.1
+++ ForgotPasswordServlet.java 2001/08/27 11:20:23 1.2
@@ -15,8 +15,8 @@
private PasswordReminder passwordReminder;
- public void init(ServletConfig config, PasswordReminder aPasswordReminder) throws ServletException {
- super.init(config);
+ public ForgotPasswordServlet(PasswordReminder aPasswordReminder) {
+ super();
passwordReminder = aPasswordReminder;
}
@@ -33,7 +33,7 @@
}
private void redirectFor(String baseName, HttpServletResponse response, String emailAddress) throws IOException {
- response.sendRedirect(getInitParameter(baseName) + "?email=" + emailAddress);
+ response.sendRedirect(getInitParameter(baseName) + "?" + EMAIL_PARAM + "=" + emailAddress);
}
}
Index: TestForgotPasswordServlet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/password/TestForgotPasswordServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestForgotPasswordServlet.java 2001/08/21 00:16:27 1.1
+++ TestForgotPasswordServlet.java 2001/08/27 11:20:24 1.2
@@ -1,36 +1,35 @@
package com.mockobjects.examples.password;
-import java.util.Enumeration;
import java.io.IOException;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import junit.framework.AssertionFailedError;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.util.TestCaseMo;
public class TestForgotPasswordServlet extends TestCaseMo {
public static final String SENT_URI = "sent_uri";
- public static final String EMAIL_FAILED_URI = "bademail_uri";
- public static final String EMAIL_NOT_FOUND_URI = "noemail_uri";
+ public static final String EMAIL_FAILED_URI = "bad_email_uri";
+ public static final String EMAIL_NOT_FOUND_URI = "no_email_uri";
public static final String EMAIL = "em...@an...";
public TestForgotPasswordServlet(String name) {
super(name);
}
- private ForgotPasswordServlet passwordServlet = new ForgotPasswordServlet();
private MockHttpServletRequest mockRequest = new MockHttpServletRequest();
private MockHttpServletResponse mockResponse = new MockHttpServletResponse();
private MockPasswordReminder mockReminder = new MockPasswordReminder();
+ private ForgotPasswordServlet passwordServlet;
public void setUp() throws ServletException, IOException {
+ passwordServlet = new ForgotPasswordServlet(mockReminder);
+ passwordServlet.init(createStubServletConfig());
+
mockRequest.setupAddParameter(ForgotPasswordServlet.EMAIL_PARAM, EMAIL);
- passwordServlet.init(createStubServletConfig(), mockReminder);
}
- public void testReminderEmailSent() throws ServletException, IOException {
+ public void testReminderEmailSent() throws ServletException, IOException {
mockReminder.setExpectedEmailAddress(EMAIL);
mockResponse.setExpectedRedirect(SENT_URI + "?email=" + EMAIL);
@@ -40,7 +39,7 @@
mockReminder.verify();
}
- public void testNoPasswordForEmail() throws ServletException, IOException {
+ public void testNoPasswordForEmail() throws ServletException, IOException {
mockReminder.setupEmailNotFound();
mockReminder.setExpectedEmailAddress(EMAIL);
@@ -53,7 +52,7 @@
}
private ServletConfig createStubServletConfig() {
- return new ServletConfig() {
+ return new StubServletConfig() {
public String getInitParameter(String s) {
if (ForgotPasswordServlet.SENT_PARAM_NAME.equals(s)) {
return SENT_URI;
@@ -62,19 +61,7 @@
} else if (ForgotPasswordServlet.EMAIL_NOT_FOUND_PARAM_NAME.equals(s)) {
return EMAIL_NOT_FOUND_URI;
}
- throw new AssertionFailedError("not expected: " + s);
- }
-
- public Enumeration getInitParameterNames() {
- throw new AssertionFailedError("not expected");
- }
-
- public ServletContext getServletContext() {
- throw new AssertionFailedError("not expected");
- }
-
- public String getServletName() {
- throw new AssertionFailedError("not expected");
+ return super.getInitParameter(s);
}
};
}
|