[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/servlet MockServletOutputStream.java,1.1,1.2

[<moc...@li...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv29129/core/com/mockobjects/servlet

Modified Files:
	MockServletOutputStream.java 
Log Message:
minor additions to API

Index: MockServletOutputStream.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/servlet/MockServletOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockServletOutputStream.java	2001/07/29 19:50:24	1.1
+++ MockServletOutputStream.java	2001/11/17 10:16:56	1.2
@@ -1,28 +1,22 @@
 package com.mockobjects.servlet;
 
-import com.mockobjects.*;
-import junit.framework.*;
-import javax.servlet.*;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import javax.servlet.ServletOutputStream;
+import com.mockobjects.ExpectationCounter;
+import com.mockobjects.ExpectationValue;
 
 public class MockServletOutputStream extends ServletOutputStream {
     private ExpectationValue myWriteCalled = new ExpectationValue("MockServletOutputStream.write()");
     private boolean myThrowException = false;
     private ExpectationCounter myCloseCallCount = new ExpectationCounter("MockServletOutputstream.close()");
-    private ByteArrayOutputStream myBuffer = new ByteArrayOutputStream();
+    private ByteArrayOutputStream myBuffer;
 
     public MockServletOutputStream() {
         super();
+        setupClearContents();
     }
 
-    public void close() throws IOException {
-        myCloseCallCount.inc();
-    }
-
-    public String getContents() {
-        return myBuffer.toString();
-    }
-
     public void setExpectedCloseCalls(int closeCall) {
         myCloseCallCount.setExpected(closeCall);
     }
@@ -35,19 +29,31 @@
         myThrowException = throwException;
     }
 
-    public String toString() {
-        return getContents();
+    public void close() throws IOException {
+        myCloseCallCount.inc();
     }
 
-    public void verify() {
-        myWriteCalled.verify();
-        myCloseCallCount.verify();
+    public String toString() {
+        return getContents();
     }
 
     public void write(int b) throws IOException {
+        myWriteCalled.setActual(true);
         if (myThrowException)
             throw new IOException("Test IOException generated by request");
         myBuffer.write(b);
-        myWriteCalled.setActual(true);
+    }
+
+    public void setupClearContents () {
+        myBuffer = new ByteArrayOutputStream();
+    }
+
+    public String getContents() {
+        return myBuffer.toString();
+    }
+
+    public void verify() {
+        myWriteCalled.verify();
+        myCloseCallCount.verify();
     }
 }