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

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

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

Modified Files:
      Tag: DynamicMockExperiment
	SimpleServletTest.java 
Log Message:
expect and VoidReturnStub

Index: SimpleServletTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServletTest.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SimpleServletTest.java	10 Apr 2003 21:27:06 -0000	1.1.2.4
+++ SimpleServletTest.java	11 Apr 2003 15:38:19 -0000	1.1.2.5
@@ -27,33 +27,33 @@
 	public SimpleServletTest(String name) {
 		super(name);
 	}
-
-//	public void testDoGet() throws ServletException, IOException {
-//		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
-//		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
-//		
-//		//CallSequence calls = new CallSequence();
-//		//calls.add("getParameter", "body", "this is the body");
-//		//calls.add("getParameter", "subject", "mail from tim");
-//		//calls.add("getParameterValues", "recipients", new String[] {"na...@te...", "st...@mp..."} );
-//		
-//		CallSequence params = new CallSequence();
-//		params.expectAndReturn( new Constraint[] { C.eq("body") }, "this is the body" );
-//		params.expectAndReturn( new Constraint[] { C.eq("subject") }, "mail from tim" ); 
-//		params.expectAndReturn( new Constraint[] { C.eq("recipients") }, new String[] { "nat...@b1...", "st...@m3..." } );
-//		
-//		mockHttpServletRequest.expect( "getParameter", params );
-//		
-//		SimpleServlet aServlet = new SimpleServlet();
-//		aServlet.doGet((HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy());
-//		
-//		mockHttpServletRequest.verify();
-//		mockHttpServletResponse.verify();
-//	}
-	
+/*
+	public void testDoGetOldStyle() throws ServletException, IOException {
+		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
+		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+		
+		CallSequence calls = new CallSequence();
+		calls.add("getParameter", "body", "this is the body");
+		calls.add("getParameter", "subject", "mail from tim");
+	    calls.add("getParameterValues", "recipients", new String[] {"na...@te...", "st...@mp..."} );
+		
+		CallSequence params = new CallSequence();
+		params.expectAndReturn( new Constraint[] { C.eq("body") }, "this is the body" );
+		params.expectAndReturn( new Constraint[] { C.eq("subject") }, "mail from tim" ); 
+		params.expectAndReturn( new Constraint[] { C.eq("recipients") }, new String[] { "nat...@b1...", "st...@m3..." } );
+		
+		mockHttpServletRequest.expect( "getParameter", params );
+		
+		SimpleServlet aServlet = new SimpleServlet();
+		aServlet.doGet((HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy());
+		
+		mockHttpServletRequest.verify();
+		mockHttpServletResponse.verify();
+	}
+*/	
 	public void testDoGetNew() throws ServletException, IOException {
 		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class, "response");
-		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+		Mock mockHttpServletRequest = new OrderedMock(HttpServletRequest.class);
 		
 		mockHttpServletRequest.matchAndReturn( "getParameter", C.args(C.eq("browser-identifier")), "MSIE-5.0" );
 		mockHttpServletRequest.expectAndReturn( "getParameter", C.args(C.eq("subject")), "Mail Subject" );
@@ -61,9 +61,12 @@
 		
 		final StringWriter contentWriter = new StringWriter();
 		
-//		CallSequence seq = mockHttpServletResponse.expectSequence();
-//		seq.expectVoid( "setContentType", C.args(C.eq("text/html")) );
-//		seq.expectAndReturn( "getWriter", C.args(), contentWriter );
+		mockHttpServletResponse.expect( "setContentType", C.args(C.eq("text/html")) );
+		mockHttpServletResponse.expectAndReturn( "getWriter", C.args(), contentWriter );
+		
+//		CallMatch m1 = mockHttpServletResponse.expect( "setContentType", C.args(C.eq("text/html")) );
+//		CallMatch m2 = mockHttpServletResponse.expectAndReturn( "getWriter", C.args(), contentWriter );
+//		m1.expectBefore(m2);
 		
 		SimpleServlet aServlet = new SimpleServlet();
 		aServlet.doGet((HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy());