[MO-java-dev] CVS: mockobjects-java/src/j2ee/common/com/mockobjects/jms MockMessageConsumer.java,1.2,1.3 MockQueue.java,1.1,1.2 MockQueueReceiver.java,1.1,1.2 MockQueueSession.java,1.1,1.2

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms
In directory sc8-pr-cvs1:/tmp/cvs-serv29556/src/j2ee/common/com/mockobjects/jms

Modified Files:
	MockMessageConsumer.java MockQueue.java MockQueueReceiver.java 
	MockQueueSession.java 
Log Message:
Added some more stuff


Index: MockMessageConsumer.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockMessageConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockMessageConsumer.java	23 Feb 2002 18:50:35 -0000	1.2
+++ MockMessageConsumer.java	21 Feb 2003 14:07:24 -0000	1.3
@@ -13,6 +13,7 @@
         new ExpectationCounter("MockMessageConsumer.receive");
     private ExpectationValue messageListener =
         new ExpectationValue("messageListener");
+    private final ExpectationValue timeout = new ExpectationValue("timeout");
 
     public void setExpectedMessageListener(MessageListener messageListener){
         this.messageListener.setExpected(messageListener);
@@ -50,6 +51,7 @@
     }
 
     public Message receive(long timeout) throws JMSException {
+        this.timeout.setActual(timeout);
         throwExceptionIfAny();
         myReceiveCalls.inc();
         if (myExpiresOnTimeout) {
@@ -59,6 +61,9 @@
         }
     }
 
+    public void setExpectedTimeout(long timeout){
+        this.timeout.setExpected(timeout);
+    }
 
     public Message receiveNoWait() throws JMSException {
         throwExceptionIfAny();

Index: MockQueue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockQueue.java	22 Feb 2002 16:25:05 -0000	1.1
+++ MockQueue.java	21 Feb 2003 14:07:24 -0000	1.2
@@ -1,8 +1,9 @@
 package com.mockobjects.jms;
 
+import com.mockobjects.MockObject;
+
 import javax.jms.JMSException;
 import javax.jms.Queue;
-import com.mockobjects.MockObject;
 
 public class MockQueue extends MockObject implements Queue {
 
@@ -24,7 +25,7 @@
             return myName.equals(((Queue) object).getQueueName());
         } catch (JMSException e) {
             throw new junit.framework.AssertionFailedError(
-                    "JMSException caught while getting actual queue name");
+                "JMSException caught while getting actual queue name");
         }
     }
 

Index: MockQueueReceiver.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueueReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockQueueReceiver.java	22 Feb 2002 16:25:05 -0000	1.1
+++ MockQueueReceiver.java	21 Feb 2003 14:07:25 -0000	1.2
@@ -5,9 +5,6 @@
 
 public class MockQueueReceiver extends MockMessageConsumer implements QueueReceiver {
 
-  public MockQueueReceiver() {
-  }
-
   public Queue getQueue() {
     notImplemented();
     return null;

Index: MockQueueSession.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/common/com/mockobjects/jms/MockQueueSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockQueueSession.java	22 Feb 2002 16:25:05 -0000	1.1
+++ MockQueueSession.java	21 Feb 2003 14:07:25 -0000	1.2
@@ -1,75 +1,89 @@
 package com.mockobjects.jms;
 
 import com.mockobjects.*;
+
 import javax.jms.*;
 
 public class MockQueueSession extends MockSession implements QueueSession {
 
-  protected ExpectationValue mySendingQueue = new ExpectationValue("MockQueueSession.createSender");
-  protected ExpectationValue myReceivingQueue = new ExpectationValue("MockQueueSession.createReceiver");
-
-  private QueueReceiver myReceiver;
-  private QueueSender mySender;
-  private TemporaryQueue myTemporaryQueue;
-
-  public MockQueueSession() {
-  }
-
-  public QueueBrowser createBrowser(Queue queue) throws JMSException {
-    notImplemented();
-    return null;
-  }
-
-  public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException {
-    notImplemented();
-    return null;
-  }
-
-  public Queue createQueue(String queueName) throws JMSException {
-    throwExceptionIfAny();
-    return new MockQueue(queueName);
-  }
-
-  public QueueReceiver createReceiver(Queue queue) throws JMSException {
-    throwExceptionIfAny();
-    myReceivingQueue.setActual(queue);
-    return myReceiver;
-  }
-
-  public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
-    myReceivingQueue.setActual(queue);
-    throwExceptionIfAny();
-    return myReceiver;
-  }
-
-  public QueueSender createSender(Queue queue) throws JMSException {
-    mySendingQueue.setActual(queue);
-    throwExceptionIfAny();
-    return mySender;
-  }
-
-  public TemporaryQueue createTemporaryQueue() throws JMSException {
-    throwExceptionIfAny();
-    return myTemporaryQueue;
-  }
-
-  public void setExpectedSendingQueue(Queue queue) {
-    mySendingQueue.setExpected(queue);
-  }
-
-  public void setExpectedReceivingQueue(Queue queue) {
-    myReceivingQueue.setExpected(queue);
-  }
-
-  public void setupReceiver(QueueReceiver receiver) {
-    myReceiver = receiver;
-  }
-
-  public void setupSender(QueueSender sender) {
-    mySender = sender;
-  }
-
-  public void setupTemporaryQueue(MockTemporaryQueue temporaryQueue) {
-    myTemporaryQueue = temporaryQueue;
-  }
+    private final ExpectationValue mySendingQueue = new ExpectationValue("MockQueueSession.createSender");
+    private final ExpectationValue myReceivingQueue = new ExpectationValue("MockQueueSession.createReceiver");
+    private final ExpectationValue messageSelector = new ExpectationValue("message selector");
+    private final ExpectationValue queue = new ExpectationValue("queue");
+
+    private final ReturnValue myReceiver = new ReturnValue("reciever");
+    private final ReturnValue mySender = new ReturnValue("reciever");
+    private final ReturnValue myTemporaryQueue = new ReturnValue("reciever");
+    private final ReturnValue queueBrowser = new ReturnValue("queue browser");
+
+    public QueueBrowser createBrowser(Queue queue) throws JMSException {
+        this.queue.setActual(queue);
+        return (QueueBrowser) queueBrowser.getValue();
+    }
+
+    public void setExpectedQueue(Queue queue) {
+        this.queue.setExpected(queue);
+    }
+
+    public void setupCreateQueueBrowser(QueueBrowser browser) {
+        this.queueBrowser.setValue(browser);
+    }
+
+    public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException {
+        notImplemented();
+        return null;
+    }
+
+    public Queue createQueue(String queueName) throws JMSException {
+        throwExceptionIfAny();
+        return new MockQueue(queueName);
+    }
+
+    public QueueReceiver createReceiver(Queue queue) throws JMSException {
+        throwExceptionIfAny();
+        myReceivingQueue.setActual(queue);
+        return (QueueReceiver) myReceiver.getValue();
+    }
+
+    public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
+        this.messageSelector.setActual(messageSelector);
+        myReceivingQueue.setActual(queue);
+        throwExceptionIfAny();
+        return (QueueReceiver) myReceiver.getValue();
+    }
+
+    public QueueSender createSender(Queue queue) throws JMSException {
+        mySendingQueue.setActual(queue);
+        throwExceptionIfAny();
+        return (QueueSender) mySender.getValue();
+    }
+
+    public TemporaryQueue createTemporaryQueue() throws JMSException {
+        throwExceptionIfAny();
+        return (TemporaryQueue) myTemporaryQueue.getValue();
+    }
+
+    public void setExpectedSendingQueue(Queue queue) {
+        mySendingQueue.setExpected(queue);
+    }
+
+    public void setExpectedReceivingQueue(Queue queue) {
+        myReceivingQueue.setExpected(queue);
+    }
+
+    public void setupReceiver(QueueReceiver receiver) {
+        myReceiver.setValue(receiver);
+    }
+
+    public void setupSender(QueueSender sender) {
+        mySender.setValue(sender);
+    }
+
+    public void setupTemporaryQueue(MockTemporaryQueue temporaryQueue) {
+        myTemporaryQueue.setValue(temporaryQueue);
+    }
+
+    public void setExpectedMessageSelector(String messageSelector) {
+        this.messageSelector.setExpected(messageSelector);
+    }
 }