[MO-java-dev] CVS: mockobjects-java/src/jdk/common/com/mockobjects/io MockFile.java,1.4,1.5 MockPrintStream.java,1.1,1.2

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

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

Modified Files:
	MockFile.java MockPrintStream.java 
Log Message:
Pepper Mocks with ReturnValue


Index: MockFile.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/io/MockFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockFile.java	2 Jan 2003 16:04:29 -0000	1.4
+++ MockFile.java	18 Mar 2003 14:28:45 -0000	1.5
@@ -17,40 +17,38 @@
 
     private final ExpectationValue myFilenameFilter =
         new ExpectationValue("filename filter");
-    private String myParent;
-    private String fileName;
+    private final ReturnValue myParent = new ReturnValue("parent");
+    private final ReturnValue fileName = new ReturnValue("file name");
     private final ReturnValue exists = new ReturnValue("exists");
     private final ReturnValue mkdirs = new ReturnValue("mkdirs");
     private final ReturnValue parentFile = new ReturnValue("parent file");
     private final ExpectationCounter mkdirsCounter = new ExpectationCounter("mkdirs counter");
+    private final ReturnValue myFilesToReturn = new ReturnValue("files");
+    private final ReturnValue file = new ReturnValue("real file");
+    private final ReturnValue myPath = new ReturnValue("path");
 
-    private File[] myFilesToReturn;
-
-    private java.io.File file;
-    private String myPath;
-
-    public void setupGetName(final String name){
-        this.fileName = name;
+    public void setupGetName(final String name) {
+        this.fileName.setValue(name);
     }
 
     public String getName() {
-        return fileName;
+        return (String) fileName.getValue();
     }
 
-    public void setupGetParent(final String aParent){
-        myParent = aParent;
+    public void setupGetParent(final String aParent) {
+        myParent.setValue(aParent);
     }
 
     public String getParent() {
-        return myParent;
+        return (String) myParent.getValue();
     }
 
-    public void setupGetParentFile(File parentFile){
+    public void setupGetParentFile(File parentFile) {
         this.parentFile.setValue(parentFile);
     }
 
     public File getParentFile() {
-        return (File)parentFile.getValue();
+        return (File) parentFile.getValue();
     }
 
     public File createTempFile(String prefix, String suffix, File directory) throws IOException {
@@ -68,12 +66,12 @@
         return new File[0];
     }
 
-    public void setupGetPath(String aPath){
-        myPath = aPath;
+    public void setupGetPath(String aPath) {
+        myPath.setValue(aPath);
     }
 
     public String getPath() {
-        return myPath;
+        return (String)myPath.getValue();
     }
 
     public boolean isAbsolute() {
@@ -116,7 +114,7 @@
         return false;
     }
 
-    public void setupExists(boolean exists){
+    public void setupExists(boolean exists) {
         this.exists.setValue(exists);
     }
 
@@ -178,17 +176,17 @@
         return new File[0];
     }
 
-    public void setExpectedFilenameFilter(FilenameFilter aFilenameFilter){
+    public void setExpectedFilenameFilter(FilenameFilter aFilenameFilter) {
         myFilenameFilter.setExpected(aFilenameFilter);
     }
 
-    public void setupListFile(File[] aFilesToReturn){
-        myFilesToReturn = aFilesToReturn;
+    public void setupListFile(File[] aFilesToReturn) {
+        myFilesToReturn.setValue(aFilesToReturn);
     }
 
     public File[] listFiles(FilenameFilter aFilenameFilter) {
         myFilenameFilter.setActual(aFilenameFilter);
-        return myFilesToReturn;
+        return (File[]) myFilesToReturn.getValue();
     }
 
     public File[] listFiles(FileFilter filter) {
@@ -201,7 +199,7 @@
         return false;
     }
 
-    public void setupMkdirs(boolean mkdirs, int count){
+    public void setupMkdirs(boolean mkdirs, int count) {
         mkdirsCounter.setExpected(count);
         this.mkdirs.setValue(mkdirs);
     }
@@ -236,12 +234,12 @@
         return 0;
     }
 
-    public void setupGetRealFile(java.io.File file){
-        this.file= file;
+    public void setupGetRealFile(java.io.File file) {
+        this.file.setValue(file);
     }
 
     public java.io.File getRealFile() {
-        return file;
+        return (java.io.File)file.getValue();
     }
 
 }

Index: MockPrintStream.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/jdk/common/com/mockobjects/io/MockPrintStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockPrintStream.java	13 Apr 2002 15:08:23 -0000	1.1
+++ MockPrintStream.java	18 Mar 2003 14:28:45 -0000	1.2
@@ -1,15 +1,16 @@
 package com.mockobjects.io;
 
-import java.io.*;
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import com.mockobjects.ExpectationCounter;
+import com.mockobjects.ExpectationSegment;
+import com.mockobjects.util.Verifier;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
 
 public class MockPrintStream extends PrintStream {
     private ExpectationCounter myPrintlnCalls = new ExpectationCounter("MockPrintStream.println calls");
     private ExpectationSegment mySegment = new ExpectationSegment("String segment");
     private PrintStream myOldErrorStream;
-    private String myLastPrintedString;
 
     public MockPrintStream() {
         this(null);
@@ -34,7 +35,6 @@
 
     public void println(String aString) {
         println((Object) aString);
-        myLastPrintedString = aString;
         mySegment.setActual(aString);
     }