mockobjects-java-dev

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

Update of /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/net
In directory sc8-pr-cvs1:/tmp/cvs-serv22955/src/jdk/common/com/mockobjects/net

Modified Files:
	MockSocket.java MockSocketFactory.java 
Log Message:
Pepper Mocks with ReturnValue


Index: MockSocket.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/net/MockSocket.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockSocket.java	19 Jun 2002 15:26:24 -0000	1.1
+++ MockSocket.java	18 Mar 2003 14:28:45 -0000	1.2
@@ -4,6 +4,7 @@
 import com.mockobjects.ExpectationCounter;
 import com.mockobjects.ExpectationValue;
 import com.mockobjects.MockObject;
+import com.mockobjects.ReturnValue;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,10 +14,9 @@
 
 public class MockSocket extends MockObject implements Socket {
     private final ExpectationValue mySoTimeout = new ExpectationValue("so timeout");
-    private InputStream myInputStream;
-    private OutputStream myOutputStream;
-    private final ExpectationCounter myCloseCalls =
-        new ExpectationCounter("close calls");
+    private final ReturnValue myInputStream = new ReturnValue("input stream");
+    private final ReturnValue myOutputStream = new ReturnValue("output stream");
+    private final ExpectationCounter myCloseCalls = new ExpectationCounter("close calls");
 
     public InetAddress getInetAddress() {
         notImplemented();
@@ -39,19 +39,19 @@
     }
 
     public void setupGetInputStream(InputStream anInputStream) {
-        myInputStream = anInputStream;
+        myInputStream.setValue(anInputStream);
     }
 
     public InputStream getInputStream() throws IOException {
-        return myInputStream;
+        return (InputStream) myInputStream.getValue();
     }
 
     public void setupGetOutputStream(OutputStream anOutputStream) {
-        myOutputStream = anOutputStream;
+        myOutputStream.setValue(anOutputStream);
     }
 
     public OutputStream getOutputStream() throws IOException {
-        return myOutputStream;
+        return (OutputStream) myOutputStream.getValue();
     }
 
     public void setTcpNoDelay(boolean on) throws SocketException {

Index: MockSocketFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/net/MockSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockSocketFactory.java	19 Jun 2002 15:26:25 -0000	1.1
+++ MockSocketFactory.java	18 Mar 2003 14:28:45 -0000	1.2
@@ -4,27 +4,28 @@
 import alt.java.net.Socket;
 import com.mockobjects.MockObject;
 import com.mockobjects.ExpectationValue;
+import com.mockobjects.ReturnValue;
 
-public class MockSocketFactory extends MockObject implements SocketFactory{
+public class MockSocketFactory extends MockObject implements SocketFactory {
     private final ExpectationValue myHost = new ExpectationValue("host");
     private final ExpectationValue myPort = new ExpectationValue("port");
-    private Socket mySocket;
+    private final ReturnValue mySocket = new ReturnValue("socket");
 
-    public void setupCreateSocket(Socket aSocket){
-        mySocket = aSocket;
+    public void setupCreateSocket(Socket aSocket) {
+        mySocket.setValue(aSocket);
     }
 
-    public void setExpectedHost(String aHost){
+    public void setExpectedHost(String aHost) {
         myHost.setExpected(aHost);
     }
 
-    public void setExpectedPort(String aPort){
+    public void setExpectedPort(String aPort) {
         myPort.setExpected(aPort);
     }
 
     public Socket createSocket(String aHost, int aPort) {
         myHost.setActual(aHost);
         myPort.setActual(aPort);
-        return mySocket;
+        return (Socket) mySocket.getValue();
     }
 }