Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31187/src/core/test/mockobjects Modified Files: TestExpectationList.java TestExpectationSet.java Added Files: AbstractTestExpectationCollection.java Removed Files: TestExpectationCollection.java Log Message: Changed TestExpectationCollection to be AbstractTestExpectationCollection to avoid it being run as part of the tests --- NEW FILE: AbstractTestExpectationCollection.java --- package test.mockobjects; import java.util.*; import junit.framework.*; import com.mockobjects.*; import com.mockobjects.util.*; public abstract class AbstractTestExpectationCollection extends TestCaseMo { ExpectationCollection myExpectation; public AbstractTestExpectationCollection(String name) { super(name); } public void testEmpty() { myExpectation.verify(); } public void testFailImmediately() { myExpectation.addExpected("A"); myExpectation.addExpected("B"); myExpectation.addActual("A"); try { myExpectation.addActual("C"); } catch (AssertionFailedError ex) { return; } fail("Should have failed immediately"); } public void testFailImmediatelyAddingTooMany() { myExpectation.addExpected("A"); myExpectation.addActual("A"); try { myExpectation.addActual("C"); } catch (AssertionFailedError ex) { return; } fail("Should have failed immediately"); } public void testFailOnSizes() { myExpectation.addExpected("A"); myExpectation.addExpected("B"); myExpectation.addActual("A"); myExpectation.addActual("B"); try { myExpectation.addActual("C"); } catch (AssertionFailedError ex) { return; } fail("Should have failed immediately"); } public void testFailOnVerify() { myExpectation.setFailOnVerify(); myExpectation.addExpectedMany(new String[] { "A", "B" }); myExpectation.addActualMany(new String[] { "C", "A" }); assertVerifyFails(myExpectation); } public void testFlushActual() { myExpectation.addActual("a value"); myExpectation.setExpectNothing(); myExpectation.verify(); } public void testHasExpectations() { assertTrue( "Should not have any expectations", !myExpectation.hasExpectations()); myExpectation.addExpected("item"); assertTrue("Should have an expectation", myExpectation.hasExpectations()); } public void testHasExpectationsForAddingManyArray() { assertTrue( "Should not have any expectations", !myExpectation.hasExpectations()); myExpectation.addExpectedMany(new Object[0]); assertTrue("Should have an expectation", myExpectation.hasExpectations()); } public void testHasExpectationsForAddingManyVector() { assertTrue( "Should not have any expectations", !myExpectation.hasExpectations()); myExpectation.addExpectedMany(new Vector().elements()); assertTrue("Should have an expectation", myExpectation.hasExpectations()); } public void testHasNoExpectations() { myExpectation.addActual("a value"); assertTrue("Has no expectations", !myExpectation.hasExpectations()); } public void testManyFromEnumeration() { Vector expectedItems = new Vector(); expectedItems.addElement("A"); expectedItems.addElement("B"); Vector actualItems = (Vector) expectedItems.clone(); myExpectation.addExpectedMany(expectedItems.elements()); myExpectation.addActualMany(actualItems.elements()); myExpectation.verify(); } public void testManyFromIterator() { Vector expectedItems = new Vector(); expectedItems.addElement("A"); expectedItems.addElement("B"); Vector actualItems = (Vector) expectedItems.clone(); myExpectation.addExpectedMany(expectedItems.iterator()); myExpectation.addActualMany(actualItems.iterator()); myExpectation.verify(); } public void testMultiFailureFromEnumeration() { Vector expectedItems = new Vector(); expectedItems.addElement("A"); expectedItems.addElement("B"); Vector actualItems = new Vector(); actualItems.addElement("A"); actualItems.addElement("C"); myExpectation.addExpectedMany(expectedItems.elements()); myExpectation.setFailOnVerify(); myExpectation.addActualMany(actualItems.elements()); assertVerifyFails(myExpectation); } public void testMultiFailureFromIterator() { Vector expectedItems = new Vector(); expectedItems.addElement("A"); expectedItems.addElement("B"); Vector actualItems = new Vector(); actualItems.addElement("A"); actualItems.addElement("C"); myExpectation.addExpectedMany(expectedItems.iterator()); myExpectation.setFailOnVerify(); myExpectation.addActualMany(actualItems.iterator()); assertVerifyFails(myExpectation); } public void testMultiFailureSizes() { myExpectation.addExpectedMany(new String[] { "A", "B" }); myExpectation.setFailOnVerify(); myExpectation.addActualMany(new String[] { "A", "B", "C" }); assertVerifyFails(myExpectation); } public void testExpectingALong(){ final long expectedLong = 666l; myExpectation.addExpected(expectedLong); myExpectation.addActual(expectedLong); myExpectation.verify(); } } Index: TestExpectationList.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationList.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestExpectationList.java 24 Nov 2002 11:11:40 -0000 1.2 +++ TestExpectationList.java 14 May 2004 13:40:44 -0000 1.3 @@ -5,7 +5,7 @@ import com.mockobjects.ExpectationList; -public class TestExpectationList extends TestExpectationCollection { +public class TestExpectationList extends AbstractTestExpectationCollection { private static final Class THIS = TestExpectationList.class; public TestExpectationList(String name) { Index: TestExpectationSet.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationSet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestExpectationSet.java 8 Jun 2003 00:29:22 -0000 1.4 +++ TestExpectationSet.java 14 May 2004 13:40:44 -0000 1.5 @@ -8,7 +8,7 @@ import com.mockobjects.ExpectationSet; import com.mockobjects.MapEntry; -public class TestExpectationSet extends TestExpectationCollection { +public class TestExpectationSet extends AbstractTestExpectationCollection { private static final Class THIS = TestExpectationSet.class; public TestExpectationSet(String name) { --- TestExpectationCollection.java DELETED --- |