[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/test AllTests.java,1.2,1.3 TestReturnObjectList.java,1.1,1.2

[Steve F. <sm...@us...>]

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

Modified Files:
	AllTests.java TestReturnObjectList.java 
Log Message:
Added TestReturnObjectList to AllTests and general tidy up

Index: AllTests.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/test/AllTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AllTests.java	22 Feb 2002 10:28:44 -0000	1.2
+++ AllTests.java	19 May 2002 21:38:28 -0000	1.3
@@ -1,6 +1,8 @@
 package com.mockobjects.test;
 
 import junit.framework.*;
+
+import com.mockobjects.ReturnObjectList;
 import com.mockobjects.util.*;
 
 /**
@@ -58,6 +60,10 @@
         suite.addTestSuite(TestExpectationSqlRow.class);
     }
 
+    public static void addTestReturnObjectList(TestSuite suite) {
+        suite.addTestSuite(ReturnObjectList.class);
+    }
+    
     public static void main(String[] args) {
         start(new String[] { THIS.getName()});
     }

Index: TestReturnObjectList.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/test/TestReturnObjectList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestReturnObjectList.java	23 Apr 2002 11:09:59 -0000	1.1
+++ TestReturnObjectList.java	19 May 2002 21:38:28 -0000	1.2
@@ -5,11 +5,8 @@
 import com.mockobjects.*;
 import com.mockobjects.util.*;
 
-/**
- * JUnit test case for TestMapEntry
- */
-
 public class TestReturnObjectList extends TestCaseMo {
+    private ReturnObjectList list = new ReturnObjectList("test");
 
     public TestReturnObjectList(String name) {
         super(name);
@@ -19,31 +16,30 @@
         start(new String[] { TestReturnObjectList.class.getName()});
     }
 
-    public static Test suite() {
-        return new TestSuite(TestReturnObjectList.class);
-    }
-
-    public void testREturnObjectList() {
-        final String test1 = "test1";
-        final String test2 = "test2";
-
-        final ReturnObjectList objectList = new ReturnObjectList("test");
-
-        objectList.addObjectToReturn(test1);
-        objectList.addObjectToReturn(test2);
-
-        assertVerifyFails(objectList);
-
-        assertEquals(test1, objectList.nextReturnObject());
-        assertEquals(test2, objectList.nextReturnObject());
+    public void testLeftoverObjectFails() {
+        list.addObjectToReturn("one");
         
-        objectList.verify();
-
+        assertVerifyFails(list);
+    }
+    
+    public void testEmptyList() {
+        list.verify();        
+    }
+    
+    public void testReturnSucceeds() {
+        list.addObjectToReturn("one");
+        list.addObjectToReturn("two");
+
+        assertEquals("Should be first result", "one", list.nextReturnObject());
+        assertEquals("Should be second result", "two", list.nextReturnObject());
+        list.verify();
+    }
+    
+    public void testTooManyReturns() {
         try{
-            objectList.nextReturnObject();
+            list.nextReturnObject();
             fail("Error should have been raised");
-        }catch(AssertionFailedError e){
-            assertEquals("test has run out of objects.", e.getMessage());
-        }
+        } catch(AssertionFailedError expected){
+        }        
     }
 }