[Mockobjects-java-dev] CVS: mockobjects-java/src/examples/com/mockobjects/examples/mailinglist ListMembers.java,1.1,1.2 MailingList.java,1.3,1.4 MockListMembers.java,1.3,1.4 TestMailingList.java,1.8,1.9

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

Update of /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist
In directory usw-pr-cvs1:/tmp/cvs-serv12189

Modified Files:
	ListMembers.java MailingList.java MockListMembers.java 
	TestMailingList.java 
Log Message:
added MailingListException to ListMembers.member()

Index: ListMembers.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/ListMembers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ListMembers.java	2001/08/05 23:46:33	1.1
--- ListMembers.java	2001/08/11 23:50:22	1.2
***************
*** 2,5 ****
  
  public interface ListMembers {
!     public void member(String email, String name);
  }
--- 2,5 ----
  
  public interface ListMembers {
!     public void member(String email, String name) throws MailingListException;
  }

Index: MailingList.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/MailingList.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MailingList.java	2001/08/05 23:46:33	1.3
--- MailingList.java	2001/08/11 23:50:22	1.4
***************
*** 37,41 ****
      }
  
!     public void applyToAllMembers(Connection connection, ListMembers listMembers) throws SQLException {
          Statement statement = connection.createStatement();
          try {
--- 37,41 ----
      }
  
!     public void applyToAllMembers(Connection connection, ListMembers listMembers) throws MailingListException, SQLException {
          Statement statement = connection.createStatement();
          try {

Index: MockListMembers.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/MockListMembers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MockListMembers.java	2001/08/06 00:19:54	1.3
--- MockListMembers.java	2001/08/11 23:50:22	1.4
***************
*** 9,15 ****
      private ExpectationList members = new ExpectationList("MockListMembers.members");
      private ExpectationCounter memberCount = new ExpectationCounter("MockListMembers.count");
  
!     public void member(String email, String name) {
          memberCount.inc();
          members.addActual(constructEntry(email, name));
      }
--- 9,19 ----
      private ExpectationList members = new ExpectationList("MockListMembers.members");
      private ExpectationCounter memberCount = new ExpectationCounter("MockListMembers.count");
+     private MailingListException memberException = null;
  
!     public void member(String email, String name) throws MailingListException {
          memberCount.inc();
+         if (null != memberException) {
+             throw memberException;
+         }
          members.addActual(constructEntry(email, name));
      }
***************
*** 26,29 ****
--- 30,37 ----
          memberCount.setExpectNothing();
          members.setExpectNothing();
+     }
+ 
+     public void setupThrowExceptionOnMember(MailingListException exception) {
+         memberException = exception;
      }
  

Index: TestMailingList.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/TestMailingList.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestMailingList.java	2001/08/11 20:42:05	1.8
--- TestMailingList.java	2001/08/11 23:50:22	1.9
***************
*** 92,96 ****
      }
  
!     public void testListNoMembers() throws SQLException {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
  
--- 92,96 ----
      }
  
!     public void testListNoMembers() throws MailingListException, SQLException {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
  
***************
*** 106,110 ****
      }
  
!     public void testListOneMember() throws SQLException {
          MockSingleRowResultSet mockResultSet = new MockSingleRowResultSet();
          mockStatement.setupResultSet(mockResultSet);
--- 106,110 ----
      }
  
!     public void testListOneMember() throws MailingListException, SQLException {
          MockSingleRowResultSet mockResultSet = new MockSingleRowResultSet();
          mockStatement.setupResultSet(mockResultSet);
***************
*** 122,126 ****
      }
  
!     public void testListTwoMembers() throws SQLException {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
          mockResultSet.setupRows(TWO_ROWS);
--- 122,126 ----
      }
  
!     public void testListTwoMembers() throws MailingListException, SQLException {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
          mockResultSet.setupRows(TWO_ROWS);
***************
*** 138,144 ****
      }
  
!     public void testListResultSetFailure() {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
          mockResultSet.setupRows(TWO_ROWS);
          mockResultSet.setupThrowExceptionOnGet(new SQLException("Mock Exception"));
  
--- 138,161 ----
      }
  
!     public void testListmembersFailure() throws SQLException {
          MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
          mockResultSet.setupRows(TWO_ROWS);
+         mockListMembers.setupThrowExceptionOnMember(new MailingListException());
+ 
+         mockResultSet.setExpectedNextCalls(1);
+         setExpectationsForListMembers();
+ 
+         try {
+             list.applyToAllMembers(mockConnection, mockListMembers);
+             fail("Should have thrown exception");
+         } catch (MailingListException expected) {
+         }
+         mockResultSet.verify();
+         mockListMembers.verify();
+     }
+ 
+     public void testListResultSetFailure() throws MailingListException {
+         MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
+         mockResultSet.setupRows(TWO_ROWS);
          mockResultSet.setupThrowExceptionOnGet(new SQLException("Mock Exception"));
  
***************
*** 156,160 ****
      }
  
!     public void testListStatementFailure() {
          mockStatement.setupThrowExceptionOnExecute(new SQLException("Mock exception"));
          mockListMembers.setExpectNoMembers();
--- 173,177 ----
      }
  
!     public void testListStatementFailure() throws MailingListException {
          mockStatement.setupThrowExceptionOnExecute(new SQLException("Mock exception"));
          mockListMembers.setExpectNoMembers();
***************
*** 169,173 ****
      }
  
!     public void testListConnectionFailure() {
          mockConnection.setupThrowExceptionOnPrepareOrCreate(new SQLException("Mock Exception"));
  
--- 186,190 ----
      }
  
!     public void testListConnectionFailure() throws MailingListException {
          mockConnection.setupThrowExceptionOnPrepareOrCreate(new SQLException("Mock Exception"));