[MO-java-dev] CVS: mockobjects-java/src/examples/com/mockobjects/examples/dynamic SimpleServletTest.java,1.1.2.2,1.1.2.3 SimpleServlet.java,1.1.2.2,1.1.2.3

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

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

Modified Files:
      Tag: DynamicMockExperiment
	SimpleServletTest.java SimpleServlet.java 
Log Message:
Basic implementation
- adds syntactic sugar for permitAndReturn, expectAndReturn etc.
- separated CallMatch from ExpectedCall

Still needs Sequence, SingleCall, CallCount support

Index: SimpleServletTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServletTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SimpleServletTest.java	7 Apr 2003 14:27:01 -0000	1.1.2.2
+++ SimpleServletTest.java	7 Apr 2003 17:38:25 -0000	1.1.2.3
@@ -55,26 +55,15 @@
 		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class, "response");
 		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
 		
-		mockHttpServletRequest.expect( new ExpectedCall( "getParameter", C.args(C.eq("subject")), new ReturnStub("Mail Subject") ));
-		mockHttpServletRequest.expect( new ExpectedCall( "getParameter", C.args(C.eq("body")), new ReturnStub("Mail Body") ));
-		//mockHttpServletRequest.permit( new ArgumentChecker( "getParameter", C.args(C.eq("browser-identifier"))), new ReturnStub("MSIE 5.0") );
-		
-//		mockHttpServletRequest.expect( "getParameter", new Object[] {"subject"}, C.returnValue("Mail Subject") );
-//		mockHttpServletRequest.expectAndReturn( "getParameter", new Object[] {"subject"}, "Mail Subject");
-//		mockHttpServletRequest.expectAndThrow( "getParameter", new Object[] {"subject"}, C.throwException(new Exception()) );
-		
-		// mockHttpServletRequest.expect( "getParameter", "subject"); //.returnValue("mail subject");
-		
-		//mockHttpServletRequest.expect( "getParameter", "body").returnValue("mail body");
-		//mockHttpServletRequest.expect( "getParameter", "recipients").returnValue( new String[] { "person1", "person2" } );
-		
+		mockHttpServletRequest.permitAndReturn( "getParameter", C.args(C.eq("browser-identifier")), "MSIE-5.0" );
+		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();
 		
-//		mockHttpServletResponse.expect( new CallMocker[] {
-//			new SingleCall( "setContentType", C.args(C.eq("text/html")) ),
-//			new SingleCall( "getWriter", C.args() ).returnValue( contentWriter ),
-//		} );
+//		CallSequence seq = mockHttpServletResponse.expectSequence();
+//		seq.expectVoid( "setContentType", C.args(C.eq("text/html")) );
+//		seq.expectAndReturn( "getWriter", C.args(), contentWriter );
 		
 		SimpleServlet aServlet = new SimpleServlet();
 		aServlet.doGet((HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy());

Index: SimpleServlet.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServlet.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SimpleServlet.java	7 Apr 2003 14:27:02 -0000	1.1.2.2
+++ SimpleServlet.java	7 Apr 2003 17:38:28 -0000	1.1.2.3
@@ -18,7 +18,10 @@
 	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 browser = request.getParameter("browser-identifier");
+		String pet = request.getParameter("favourite-pet");
 	}
 
 }