Menu
▾
▴
[Mockobjects-java-dev] CVS: mockobjects-java/src/examples/com/mockobjects/examples/mailinglist ListAction.java,NONE,1.1 MockListAction.java,NONE,1.1 MailingList.java,1.4,1.5 TestMailingList.java,1.9,1.10 ListMembers.java,1.2,NONE MockListMembers.java,1.4,NONE
|
From: Steve F. <sm...@us...> - 2001-08-27 02:42:56
|
Update of /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist
In directory usw-pr-cvs1:/tmp/cvs-serv4373
Modified Files:
MailingList.java TestMailingList.java
Added Files:
ListAction.java MockListAction.java
Removed Files:
ListMembers.java MockListMembers.java
Log Message:
Changed the name of ListMembers to ListAction
in the mailing list example.
--- NEW FILE: ListAction.java ---
package com.mockobjects.examples.mailinglist;
public interface ListAction {
public void applyTo(String email, String name) throws MailingListException;
}
--- NEW FILE: MockListAction.java ---
package com.mockobjects.examples.mailinglist;
import com.mockobjects.MockObject;
import com.mockobjects.ExpectationList;
import com.mockobjects.MapEntry;
import com.mockobjects.ExpectationCounter;
public class MockListAction extends MockObject implements ListAction {
private ExpectationList members = new ExpectationList("MockListAction.members");
private ExpectationCounter memberCount = new ExpectationCounter("MockListAction.count");
private MailingListException memberException = null;
public void applyTo(String email, String name) throws MailingListException {
memberCount.inc();
if (null != memberException) {
throw memberException;
}
members.addActual(constructEntry(email, name));
}
public void addExpectedMember(String email, String name) {
members.addExpected(constructEntry(email, name));
}
public void setExpectedMemberCount(int count) {
memberCount.setExpected(count);
}
public void setExpectNoMembers() {
memberCount.setExpectNothing();
members.setExpectNothing();
}
public void setupThrowExceptionOnMember(MailingListException exception) {
memberException = exception;
}
private Object constructEntry(String email, String name) {
return new MapEntry(email, name);
}
}
Index: MailingList.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/MailingList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailingList.java 2001/08/11 23:50:22 1.4
+++ MailingList.java 2001/08/27 02:42:54 1.5
@@ -36,13 +36,13 @@
}
}
- public void applyToAllMembers(Connection connection, ListMembers listMembers) throws MailingListException, SQLException {
+ public void applyToAllMembers(Connection connection, ListAction listMembers) throws MailingListException, SQLException {
Statement statement = connection.createStatement();
try {
ResultSet results = statement.executeQuery(LIST_SQL);
while (results.next()) {
- listMembers.member(results.getString("email_address"), results.getString("name"));
+ listMembers.applyTo(results.getString("email_address"), results.getString("name"));
}
} finally {
statement.close();
Index: TestMailingList.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/examples/com/mockobjects/examples/mailinglist/TestMailingList.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestMailingList.java 2001/08/11 23:50:22 1.9
+++ TestMailingList.java 2001/08/27 02:42:54 1.10
@@ -19,7 +19,7 @@
private MailingList list = new MailingList();
- private MockListMembers mockListMembers = new MockListMembers();
+ private MockListAction mockListAction = new MockListAction();
private MockConnection mockConnection = new MockConnection();
private MockPreparedStatement mockPreparedStatement = new MockPreparedStatement();
private MockStatement mockStatement = new MockStatement();
@@ -95,14 +95,14 @@
MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
mockResultSet.setExpectedNextCalls(1);
- mockListMembers.setExpectNoMembers();
+ mockListAction.setExpectNoMembers();
setExpectationsForListMembers();
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
verifyJDBC();
mockResultSet.verify();
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListOneMember() throws MailingListException, SQLException {
@@ -111,14 +111,14 @@
mockResultSet.addExpectedNamedValues(COLUMN_NAMES, ONE_ROW);
mockResultSet.setExpectedNextCalls(2);
- mockListMembers.addExpectedMember(EMAIL, NAME);
+ mockListAction.addExpectedMember(EMAIL, NAME);
setExpectationsForListMembers();
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
verifyJDBC();
mockResultSet.verify();
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListTwoMembers() throws MailingListException, SQLException {
@@ -126,32 +126,32 @@
mockResultSet.setupRows(TWO_ROWS);
mockResultSet.setExpectedNextCalls(3);
- mockListMembers.setExpectedMemberCount(2);
+ mockListAction.setExpectedMemberCount(2);
setExpectationsForListMembers();
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
verifyJDBC();
mockResultSet.verify();
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListmembersFailure() throws SQLException {
MockMultiRowResultSet mockResultSet = makeMultiRowResultSet();
mockResultSet.setupRows(TWO_ROWS);
- mockListMembers.setupThrowExceptionOnMember(new MailingListException());
+ mockListAction.setupThrowExceptionOnMember(new MailingListException());
mockResultSet.setExpectedNextCalls(1);
setExpectationsForListMembers();
try {
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
fail("Should have thrown exception");
} catch (MailingListException expected) {
}
mockResultSet.verify();
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListResultSetFailure() throws MailingListException {
@@ -160,29 +160,29 @@
mockResultSet.setupThrowExceptionOnGet(new SQLException("Mock Exception"));
mockResultSet.setExpectedNextCalls(1);
- mockListMembers.setExpectNoMembers();
+ mockListAction.setExpectNoMembers();
setExpectationsForListMembers();
try {
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
fail("Should have thrown exception");
} catch (SQLException expected) {
}
mockResultSet.verify();
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListStatementFailure() throws MailingListException {
mockStatement.setupThrowExceptionOnExecute(new SQLException("Mock exception"));
- mockListMembers.setExpectNoMembers();
+ mockListAction.setExpectNoMembers();
setExpectationsForListMembers();
try {
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
fail("Should have thrown exception");
} catch (SQLException expected) {
}
- mockListMembers.verify();
+ mockListAction.verify();
}
public void testListConnectionFailure() throws MailingListException {
@@ -192,14 +192,14 @@
mockStatement.setExpectedCloseCalls(0);
mockStatement.setExpectedExecuteCalls(0);
- mockListMembers.setExpectNoMembers();
+ mockListAction.setExpectNoMembers();
try {
- list.applyToAllMembers(mockConnection, mockListMembers);
+ list.applyToAllMembers(mockConnection, mockListAction);
fail("Should have thrown exception");
} catch (SQLException expected) {
}
- mockListMembers.verify();
+ mockListAction.verify();
}
private MockMultiRowResultSet makeMultiRowResultSet() {
--- ListMembers.java DELETED ---
--- MockListMembers.java DELETED ---
|
