[MO-java-dev] CVS: mockobjects-java/src/j2ee/common/com/mockobjects/servlet MockServletInputStream.java,1.2,1.3

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24538/src/j2ee/common/com/mockobjects/servlet

Modified Files:
	MockServletInputStream.java 
Log Message:
Did some stuff


Index: MockServletInputStream.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/servlet/MockServletInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockServletInputStream.java	28 Jun 2002 13:29:33 -0000	1.2
+++ MockServletInputStream.java	22 Nov 2004 14:45:58 -0000	1.3
@@ -1,14 +1,17 @@
 package com.mockobjects.servlet;
 
 import com.mockobjects.Verifiable;
+import com.mockobjects.util.AssertMo;
 import com.mockobjects.util.Verifier;
 
 import javax.servlet.ServletInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 public class MockServletInputStream extends ServletInputStream implements
     Verifiable {
 
-    private byte[] myData;
+    private ByteArrayInputStream data;
     private int myIndex;
 
     public void verify() {
@@ -16,14 +19,39 @@
     }
 
     public void setupRead(byte[] data) {
-        myData = data;
+        this.data = new ByteArrayInputStream(data);
     }
 
-    public int read() {
-        if(myData!=null && myIndex < myData.length) {
-            return myData[myIndex++];
-        } else {
-            return -1;
-        }
+    public int read() throws IOException {
+        return data.read();
     }
+
+    public int available(){
+        return data.available();
+    }
+
+    public synchronized void reset(){
+        data.reset();
+    }
+
+    public boolean markSupported(){
+        return data.markSupported();
+    }
+
+    public synchronized void mark(int i){
+        data.mark(i);
+    }
+
+    public long skip(long l){
+        return data.skip(l);
+    }
+
+    public int read(byte[] bytes) throws IOException {
+        return data.read(bytes);
+    }
+
+    public int read(byte[] bytes,int off,int len) throws IOException {
+        return data.read(bytes, off, len);
+    }
+
 }