Menu
▾
▴
[MO-java-dev] CVS: mockobjects-java/src/j2ee/common/com/mockobjects/jms MockConnection.java,1.3,1.4 MockMessage.java,1.2,1.3 MockMessageConsumer.java,1.3,1.4 MockMessageProducer.java,1.1,1.2 MockObjectMessage.java,1.1,1.2 MockQueue.java,1.2,1.3 MockQueueConnection.java,1.1,1.2 MockQueueConnectionFactory.java,1.1,1.2 MockQueueSession.java,1.2,1.3 MockTemporaryQueue.java,1.1,1.2 MockTextMessage.java,1.1,1.2 MockTopicConnection.java,1.2,1.3 MockTopicConnectionFactory.java,1.1,1.2 MockTopicSession.java,1.3,1.4
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms
In directory sc8-pr-cvs1:/tmp/cvs-serv22955/src/j2ee/common/com/mockobjects/jms
Modified Files:
MockConnection.java MockMessage.java MockMessageConsumer.java
MockMessageProducer.java MockObjectMessage.java MockQueue.java
MockQueueConnection.java MockQueueConnectionFactory.java
MockQueueSession.java MockTemporaryQueue.java
MockTextMessage.java MockTopicConnection.java
MockTopicConnectionFactory.java MockTopicSession.java
Log Message:
Pepper Mocks with ReturnValue
Index: MockConnection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockConnection.java 28 Jun 2002 17:35:39 -0000 1.3
+++ MockConnection.java 18 Mar 2003 14:28:44 -0000 1.4
@@ -15,9 +15,6 @@
private JMSException myException;
- public MockConnection() {
- }
-
public void close() throws JMSException {
myCloseCalls.inc();
throwExceptionIfAny();
Index: MockMessage.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockMessage.java 5 Apr 2002 10:45:43 -0000 1.2
+++ MockMessage.java 18 Mar 2003 14:28:44 -0000 1.3
@@ -16,7 +16,7 @@
/**
* Used for both messageID and correlationID
*/
- private String myJMSMessageID;
+ private final ReturnValue myJMSMessageID = new ReturnValue("messageID / correlationID");
public void acknowledge() throws JMSException {
myAcknowledgeCount.inc();
@@ -60,7 +60,7 @@
}
public String getJMSCorrelationID() {
- return myJMSMessageID;
+ return (String)myJMSMessageID.getValue();
}
public byte[] getJMSCorrelationIDAsBytes() {
@@ -84,7 +84,7 @@
}
public String getJMSMessageID() {
- return myJMSMessageID;
+ return (String)myJMSMessageID.getValue();
}
public int getJMSPriority() {
@@ -232,7 +232,7 @@
}
public void setupJMSMessageID(String jmsMessageID) {
- myJMSMessageID = jmsMessageID;
+ myJMSMessageID.setValue(jmsMessageID);
}
public void setupThrowException(JMSException e) {
Index: MockMessageConsumer.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockMessageConsumer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockMessageConsumer.java 21 Feb 2003 14:07:24 -0000 1.3
+++ MockMessageConsumer.java 18 Mar 2003 14:28:44 -0000 1.4
@@ -4,7 +4,7 @@
import javax.jms.*;
public class MockMessageConsumer extends MockObject implements MessageConsumer{
- private Message myMessage;
+ private final ReturnValue myMessage = new ReturnValue("message");
private boolean myExpiresOnTimeout = false;
private JMSException myException;
protected ExpectationCounter myCloseCalls =
@@ -47,7 +47,7 @@
}
}
}
- return myMessage;
+ return (Message)myMessage.getValue();
}
public Message receive(long timeout) throws JMSException {
@@ -57,7 +57,7 @@
if (myExpiresOnTimeout) {
return null;
} else {
- return myMessage;
+ return (Message)myMessage.getValue();
}
}
@@ -68,7 +68,7 @@
public Message receiveNoWait() throws JMSException {
throwExceptionIfAny();
myReceiveCalls.inc();
- return myMessage;
+ return (Message)myMessage.getValue();
}
public void setExpectedCloseCalls(int callCount) {
@@ -80,7 +80,7 @@
}
public void setupReceivedMessage(Message message) {
- myMessage = message;
+ myMessage.setValue(message);
}
public void setupExpiresOnTimeout(boolean expiresOnTimeout) {
Index: MockMessageProducer.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockMessageProducer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockMessageProducer.java 22 Feb 2002 16:25:05 -0000 1.1
+++ MockMessageProducer.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -5,12 +5,9 @@
public abstract class MockMessageProducer extends MockObject implements MessageProducer {
- protected ExpectationCounter myCloseCalls = new ExpectationCounter("MockMessageConsumer.close");
+ protected final ExpectationCounter myCloseCalls = new ExpectationCounter("MockMessageConsumer.close");
private JMSException myException;
-
- public MockMessageProducer() {
- }
public void close() throws JMSException {
myCloseCalls.inc();
Index: MockObjectMessage.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockObjectMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockObjectMessage.java 23 Feb 2002 18:50:35 -0000 1.1
+++ MockObjectMessage.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -1,18 +1,20 @@
package com.mockobjects.jms;
+import com.mockobjects.ReturnValue;
+
import java.io.*;
import javax.jms.*;
public class MockObjectMessage extends MockMessage implements ObjectMessage{
- private Serializable objectToReturn;
+ private final ReturnValue objectToReturn = new ReturnValue("object");
public void setupGetObject(Serializable objectToReturn){
- this.objectToReturn = objectToReturn;
+ this.objectToReturn.setValue(objectToReturn);
}
public Serializable getObject() throws JMSException{
- return objectToReturn;
+ return (Serializable)objectToReturn.getValue();
}
public void setObject(Serializable serialisable) throws JMSException{
Index: MockQueue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockQueue.java 21 Feb 2003 14:07:24 -0000 1.2
+++ MockQueue.java 18 Mar 2003 14:28:44 -0000 1.3
@@ -1,6 +1,7 @@
package com.mockobjects.jms;
import com.mockobjects.MockObject;
+import com.mockobjects.ReturnValue;
import javax.jms.JMSException;
import javax.jms.Queue;
@@ -8,33 +9,19 @@
public class MockQueue extends MockObject implements Queue {
private JMSException myException;
- private String myName;
-
- public MockQueue(String name) {
- myName = name;
- }
+ private final ReturnValue myName = new ReturnValue("name");
public String getQueueName() throws JMSException {
throwExceptionIfAny();
- return myName;
- }
-
- public boolean equals(Object object) {
- if (!(object instanceof Queue)) return false;
- try {
- return myName.equals(((Queue) object).getQueueName());
- } catch (JMSException e) {
- throw new junit.framework.AssertionFailedError(
- "JMSException caught while getting actual queue name");
- }
+ return (String)myName.getValue();
}
- public int hashCode() {
- return myName.hashCode();
+ public void setupGetQueueName(final String name){
+ myName.setValue(name);
}
public String toString() {
- return this.getClass().getName() + ", " + myName;
+ return this.getClass().getName() + ", " + myName.getValue();
}
public void setupThrowException(JMSException e) {
Index: MockQueueConnection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueueConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockQueueConnection.java 22 Feb 2002 16:25:05 -0000 1.1
+++ MockQueueConnection.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -5,7 +5,7 @@
public class MockQueueConnection extends MockConnection implements QueueConnection {
- private QueueSession myQueueSession;
+ private final ReturnValue myQueueSession = new ReturnValue("queue session");
public MockQueueConnection() {
}
@@ -20,10 +20,10 @@
public QueueSession createQueueSession(boolean transacted,
int acknowledgeMode) throws JMSException {
throwExceptionIfAny();
- return myQueueSession;
+ return (QueueSession)myQueueSession.getValue();
}
public void setupQueueSession(QueueSession queueSession) {
- myQueueSession = queueSession;
+ myQueueSession.setValue(queueSession);
}
}
Index: MockQueueConnectionFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueueConnectionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockQueueConnectionFactory.java 22 Feb 2002 16:25:05 -0000 1.1
+++ MockQueueConnectionFactory.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -1,52 +1,50 @@
package com.mockobjects.jms;
import com.mockobjects.*;
+
import javax.jms.*;
public class MockQueueConnectionFactory extends MockObject implements
- QueueConnectionFactory {
+ QueueConnectionFactory {
+
+ private final ExpectationValue myUserName = new ExpectationValue("MockQueueConnectionFactory.createQueueConnection");
+ private final ExpectationValue myPassword = new ExpectationValue("MockQueueConnectionFactory.createQueueConnection");
- protected ExpectationValue myUserName = new ExpectationValue("MockQueueConnectionFactory.createQueueConnection");
- protected ExpectationValue myPassword = new ExpectationValue("MockQueueConnectionFactory.createQueueConnection");
+ private JMSException myException;
+ private final ReturnValue myQueueConnection = new ReturnValue("queue connection");
+
+ public QueueConnection createQueueConnection() throws JMSException {
+ throwExceptionIfAny();
+ return (QueueConnection) myQueueConnection.getValue();
+ }
- private JMSException myException;
- private QueueConnection myQueueConnection;
+ public QueueConnection createQueueConnection(String userName, String password)
+ throws JMSException {
+ throwExceptionIfAny();
+ myUserName.setActual(userName);
+ myPassword.setActual(password);
+ return (QueueConnection) myQueueConnection.getValue();
+ }
+
+ public void setExpectedUserName(String userName) {
+ myUserName.setExpected(userName);
+ }
+
+ public void setExpectedPassword(String password) {
+ myPassword.setExpected(password);
+ }
+
+ public void setupQueueConnection(QueueConnection queueConnection) {
+ myQueueConnection.setValue(queueConnection);
+ }
+
+ public void setupThrowException(JMSException e) {
+ myException = e;
+ }
- public MockQueueConnectionFactory() {
- }
-
- public QueueConnection createQueueConnection() throws JMSException {
- throwExceptionIfAny();
- return myQueueConnection;
- }
-
- public QueueConnection createQueueConnection(String userName, String password)
- throws JMSException {
- throwExceptionIfAny();
- myUserName.setActual(userName);
- myPassword.setActual(password);
- return myQueueConnection;
- }
-
- public void setExpectedUserName(String userName) {
- myUserName.setExpected(userName);
- }
-
- public void setExpectedPassword(String password) {
- myPassword.setExpected(password);
- }
-
- public void setupQueueConnection(QueueConnection queueConnection) {
- myQueueConnection = queueConnection;
- }
-
- public void setupThrowException(JMSException e) {
- myException = e;
- }
-
- private void throwExceptionIfAny() throws JMSException {
- if (null != myException) {
- throw myException;
+ private void throwExceptionIfAny() throws JMSException {
+ if (null != myException) {
+ throw myException;
+ }
}
- }
}
Index: MockQueueSession.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueueSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockQueueSession.java 21 Feb 2003 14:07:25 -0000 1.2
+++ MockQueueSession.java 18 Mar 2003 14:28:44 -0000 1.3
@@ -11,6 +11,7 @@
private final ExpectationValue messageSelector = new ExpectationValue("message selector");
private final ExpectationValue queue = new ExpectationValue("queue");
+ private final ReturnValue queueToReturn = new ReturnValue("queue");
private final ReturnValue myReceiver = new ReturnValue("reciever");
private final ReturnValue mySender = new ReturnValue("reciever");
private final ReturnValue myTemporaryQueue = new ReturnValue("reciever");
@@ -34,9 +35,13 @@
return null;
}
+ public void setupCreateQueue(Queue queue) {
+ this.queueToReturn.setValue(queue);
+ }
+
public Queue createQueue(String queueName) throws JMSException {
throwExceptionIfAny();
- return new MockQueue(queueName);
+ return (Queue) queueToReturn.getValue();
}
public QueueReceiver createReceiver(Queue queue) throws JMSException {
Index: MockTemporaryQueue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockTemporaryQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockTemporaryQueue.java 22 Feb 2002 16:25:05 -0000 1.1
+++ MockTemporaryQueue.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -6,11 +6,7 @@
public class MockTemporaryQueue extends MockQueue implements TemporaryQueue {
- protected ExpectationCounter myDeleteCalls = new ExpectationCounter("MockTemporaryQueue.delete");
-
- public MockTemporaryQueue() {
- super("TemporaryQueue");
- }
+ private final ExpectationCounter myDeleteCalls = new ExpectationCounter("MockTemporaryQueue.delete");
public void delete() throws JMSException {
myDeleteCalls.inc();
@@ -20,4 +16,4 @@
public void setExpectedDeleteCalls(int callCount) {
myDeleteCalls.setExpected(callCount);
}
-}
\ No newline at end of file
+}
Index: MockTextMessage.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockTextMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockTextMessage.java 22 Feb 2002 16:25:05 -0000 1.1
+++ MockTextMessage.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -6,25 +6,22 @@
public class MockTextMessage extends MockMessage implements TextMessage {
- protected ExpectationValue myExpectedText = new ExpectationValue("MockTextMessage.setText");
- private String myText;
+ private final ExpectationValue myExpectedText = new ExpectationValue("MockTextMessage.setText");
+ private final ReturnValue myText = new ReturnValue("text");
- public MockTextMessage() {
- }
+ public void setText(String text) {
+ myExpectedText.setActual(text);
+ }
- public MockTextMessage(String text) {
- myText = text;
- }
+ public String getText() {
+ return (String)myText.getValue();
+ }
- public void setText(String text) {
- myExpectedText.setActual(text);
- }
+ public void setupGetText(String text) {
+ myText.setValue(text);
+ }
- public String getText() {
- return myText;
- }
-
- public void setExpectedText(String text) {
- myExpectedText.setExpected(text);
- }
+ public void setExpectedText(String text) {
+ myExpectedText.setExpected(text);
+ }
}
Index: MockTopicConnection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockTopicConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockTopicConnection.java 22 Apr 2002 16:53:13 -0000 1.2
+++ MockTopicConnection.java 18 Mar 2003 14:28:44 -0000 1.3
@@ -1,35 +1,36 @@
package com.mockobjects.jms;
import com.mockobjects.*;
+
import javax.jms.*;
-public class MockTopicConnection extends MockConnection implements TopicConnection{
+public class MockTopicConnection extends MockConnection implements TopicConnection {
- private TopicSession topicSessionToReturn;
+ private final ReturnValue topicSessionToReturn = new ReturnValue("topic session");
- public void setupCreateTopicSession(TopicSession topicSessionToReturn){
- this.topicSessionToReturn = topicSessionToReturn;
+ public void setupCreateTopicSession(TopicSession topicSessionToReturn) {
+ this.topicSessionToReturn.setValue(topicSessionToReturn);
}
public ConnectionConsumer createConnectionConsumer(Topic topic,
- String messageSelector, ServerSessionPool sessionPool, int maxMessages)
- throws JMSException{
+ String messageSelector, ServerSessionPool sessionPool, int maxMessages)
+ throws JMSException {
notImplemented();
return null;
}
-
+
public ConnectionConsumer createDurableConnectionConsumer(Topic topic,
- String subscriptionName, String messageSelector,
- ServerSessionPool sessionPool, int maxMessages) throws JMSException{
+ String subscriptionName, String messageSelector,
+ ServerSessionPool sessionPool, int maxMessages) throws JMSException {
notImplemented();
return null;
}
public TopicSession createTopicSession(boolean transacted,
- int acknowledgeMode) throws JMSException{
+ int acknowledgeMode) throws JMSException {
- return topicSessionToReturn;
+ return (TopicSession)topicSessionToReturn.getValue();
}
}
Index: MockTopicConnectionFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockTopicConnectionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockTopicConnectionFactory.java 23 Feb 2002 18:50:35 -0000 1.1
+++ MockTopicConnectionFactory.java 18 Mar 2003 14:28:44 -0000 1.2
@@ -6,21 +6,21 @@
public class MockTopicConnectionFactory extends MockObject
implements TopicConnectionFactory{
- private TopicConnection topicConnectionToReturn;
+ private final ReturnValue topicConnectionToReturn = new ReturnValue("topic connection");
public void setupCreateTopicConnection(
TopicConnection topicConnectionToReturn){
- this.topicConnectionToReturn = topicConnectionToReturn;
+ this.topicConnectionToReturn.setValue(topicConnectionToReturn);
}
public TopicConnection createTopicConnection() throws JMSException{
- return topicConnectionToReturn;
+ return (TopicConnection)topicConnectionToReturn.getValue();
}
public TopicConnection createTopicConnection(String userName,
String password) throws JMSException{
- return topicConnectionToReturn;
+ return (TopicConnection)topicConnectionToReturn.getValue();
}
}
Index: MockTopicSession.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockTopicSession.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockTopicSession.java 22 Apr 2002 16:53:13 -0000 1.3
+++ MockTopicSession.java 18 Mar 2003 14:28:44 -0000 1.4
@@ -4,15 +4,15 @@
import javax.jms.*;
public class MockTopicSession extends MockSession implements TopicSession{
- private Topic topicToReturn;
+ private final ReturnValue topicToReturn = new ReturnValue("topic");
private ExpectationValue topicName = new ExpectationValue("topicName");
private ExpectationCounter createTopicCalls =
new ExpectationCounter("createTopicCalls");
- private TopicPublisher topicPublisherToReturn;
- private TopicSubscriber topicSubscriberToReturn;
+ private final ReturnValue topicPublisherToReturn = new ReturnValue("topic publisher");
+ private final ReturnValue topicSubscriberToReturn = new ReturnValue("topic subscriber");
public void setupCreateTopic(Topic topicToReturn){
- this.topicToReturn = topicToReturn;
+ this.topicToReturn.setValue(topicToReturn);
}
public void setExpectedTopicName(String topicName){
@@ -25,33 +25,33 @@
public TopicSubscriber createDurableSubscriber(Topic topic, String name)
throws JMSException{
- return topicSubscriberToReturn;
+ return (TopicSubscriber)topicSubscriberToReturn.getValue();
}
public TopicSubscriber createDurableSubscriber(Topic topic, String name,
String messsageSelecter, boolean noLocal) throws JMSException{
- return topicSubscriberToReturn;
+ return (TopicSubscriber)topicSubscriberToReturn.getValue();
}
public void setupCreatePublisher(TopicPublisher topicPublisherToReturn){
- this.topicPublisherToReturn = topicPublisherToReturn;
+ this.topicPublisherToReturn.setValue(topicPublisherToReturn);
}
public TopicPublisher createPublisher(Topic topic) throws JMSException{
- return topicPublisherToReturn;
+ return (TopicPublisher)topicPublisherToReturn.getValue();
}
public void setupTopicSubscriber(TopicSubscriber topicSubscriberToReturn){
- this.topicSubscriberToReturn = topicSubscriberToReturn;
+ this.topicSubscriberToReturn.setValue(topicSubscriberToReturn);
}
public TopicSubscriber createSubscriber(Topic topic) throws JMSException{
- return topicSubscriberToReturn;
+ return (TopicSubscriber)topicSubscriberToReturn.getValue();
}
public TopicSubscriber createSubscriber(Topic topic,
String messsageSelecter, boolean noLocal) throws JMSException{
- return topicSubscriberToReturn;
+ return (TopicSubscriber)topicSubscriberToReturn.getValue();
}
public TemporaryTopic createTemporaryTopic() throws JMSException{
@@ -62,7 +62,7 @@
public Topic createTopic(String topicName) throws JMSException{
this.topicName.setActual(topicName);
this.createTopicCalls.inc();
- return topicToReturn;
+ return (Topic)topicToReturn.getValue();
}
public void unsubscribe(String topicName) throws JMSException{
|