Update of /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv14578/src/examples/com/mockobjects/examples/dynamic
Modified Files:
Tag: DynamicMockExperiment
SimpleServletTest.java SimpleServlet.java
Log Message:
Made CallSet a composite of Mock (with CallableAddable interface)
made tests that were tricky much simpler, and first step to
CallList
Index: SimpleServletTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServletTest.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SimpleServletTest.java 11 Apr 2003 15:38:19 -0000 1.1.2.5
+++ SimpleServletTest.java 14 Apr 2003 08:46:29 -0000 1.1.2.6
@@ -59,12 +59,12 @@
mockHttpServletRequest.expectAndReturn( "getParameter", C.args(C.eq("subject")), "Mail Subject" );
mockHttpServletRequest.expectAndReturn( "getParameter", C.args(C.eq("body")), "Mail Body" );
- final StringWriter contentWriter = new StringWriter();
+ final PrintWriter contentWriter = new PrintWriter(new StringWriter());
- mockHttpServletResponse.expect( "setContentType", C.args(C.eq("text/html")) );
+ mockHttpServletResponse.expect( "setContentType", "text/html");
mockHttpServletResponse.expectAndReturn( "getWriter", C.args(), contentWriter );
-// CallMatch m1 = mockHttpServletResponse.expect( "setContentType", C.args(C.eq("text/html")) );
+// CallMatch m1 = mockHttpServletResponse.expect( "setContentType", "text/html");
// CallMatch m2 = mockHttpServletResponse.expectAndReturn( "getWriter", C.args(), contentWriter );
// m1.expectBefore(m2);
Index: SimpleServlet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServlet.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SimpleServlet.java 7 Apr 2003 17:38:28 -0000 1.1.2.3
+++ SimpleServlet.java 14 Apr 2003 08:46:29 -0000 1.1.2.4
@@ -16,12 +16,15 @@
public class SimpleServlet extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- //super.doGet(arg0, arg1);
-
+
String body = request.getParameter("body");
String subject = request.getParameter("subject");
+ String subjectCopy = request.getParameter("subject");
String browser = request.getParameter("browser-identifier");
- String pet = request.getParameter("favourite-pet");
+ //String pet = request.getParameter("favourite-pet");
+
+ response.setContentType("text/html");
+ Writer writer = response.getWriter();
}
}
|
