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

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

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

Modified Files:
      Tag: DynamicMockExperiment
	SimpleServletTest.java SimpleServlet.java 
Log Message:
Refactored class hierarchy:
   - call actions can be stubbed
   - stubs can be decorated with expectations
   - calls can be grouped in a CallSet (set/bag)
   - a mock object inherits from CallSet

Index: SimpleServletTest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/dynamic/Attic/SimpleServletTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SimpleServletTest.java	4 Apr 2003 16:47:41 -0000	1.1.2.1
+++ SimpleServletTest.java	7 Apr 2003 14:27:01 -0000	1.1.2.2
@@ -55,8 +55,13 @@
 		Mock mockHttpServletResponse = new Mock(HttpServletResponse.class, "response");
 		Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
 		
-		mockHttpServletRequest.expect( new SingleCall( "getParameter", C.args(C.eq("subject")) ) );
-		mockHttpServletRequest.expect( new SingleCall( "getParameter", C.args(C.eq("body")) ) );
+		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");
 		
@@ -66,8 +71,10 @@
 		
 		final StringWriter contentWriter = new StringWriter();
 		
-		mockHttpServletResponse.expect( new SingleCall( "setContentType", C.args(C.eq("text/html")) ) );
-		//mockHttpServletResponse.expect( "getWriter" ).returnValue( contentWriter );
+//		mockHttpServletResponse.expect( new CallMocker[] {
+//			new SingleCall( "setContentType", C.args(C.eq("text/html")) ),
+//			new SingleCall( "getWriter", C.args() ).returnValue( 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SimpleServlet.java	4 Apr 2003 16:47:41 -0000	1.1.2.1
+++ SimpleServlet.java	7 Apr 2003 14:27:02 -0000	1.1.2.2
@@ -18,7 +18,7 @@
 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		//super.doGet(arg0, arg1);
 		
-		String subject = request.getParameter("subjectx");
+		String subject = request.getParameter("subject");
 	}
 
 }