[MO-java-dev] CVS: mockobjects-java/src/examples/com/mockobjects/examples/dynamic SimpleServlet.java,1.1.2.4,1.1.2.5 SimpleServletTest.java,1.1.2.6,1.1.2.7

[Tim M. <ma...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv2259/examples/com/mockobjects/examples/dynamic

Modified Files:
      Tag: DynamicMockExperiment
	SimpleServlet.java SimpleServletTest.java 
Log Message:
Added CallSequence and OrderedMock

This gives a usable reference implementation

Index: SimpleServlet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServlet.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SimpleServlet.java	14 Apr 2003 08:46:29 -0000	1.1.2.4
+++ SimpleServlet.java	14 Apr 2003 18:46:51 -0000	1.1.2.5
@@ -19,12 +19,13 @@
 				
 		String body = request.getParameter("body");
 		String subject = request.getParameter("subject");
-		String subjectCopy = request.getParameter("subject");
 		String browser = request.getParameter("browser-identifier");
+		String subjectCopy = request.getParameter("subject");
 		//String pet = request.getParameter("favourite-pet");
-		
+
 		response.setContentType("text/html");
 		Writer writer = response.getWriter();
+		
 	}
 
 }

Index: SimpleServletTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServletTest.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SimpleServletTest.java	14 Apr 2003 08:46:29 -0000	1.1.2.6
+++ SimpleServletTest.java	14 Apr 2003 18:46:51 -0000	1.1.2.7
@@ -52,11 +52,11 @@
 	}
 */	
 	public void testDoGetNew() throws ServletException, IOException {
-		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class, "response");
-		Mock mockHttpServletRequest = new OrderedMock(HttpServletRequest.class);
+		Mock mockHttpServletResponse = new OrderedMock(HttpServletResponse.class, "response");
+		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
 		
 		mockHttpServletRequest.matchAndReturn( "getParameter", C.args(C.eq("browser-identifier")), "MSIE-5.0" );
-		mockHttpServletRequest.expectAndReturn( "getParameter", C.args(C.eq("subject")), "Mail Subject" );
+		mockHttpServletRequest.expectAndReturn( "getParameter", "subject", "Mail Subject" );
 		mockHttpServletRequest.expectAndReturn( "getParameter", C.args(C.eq("body")), "Mail Body" );
 		
 		final PrintWriter contentWriter = new PrintWriter(new StringWriter());