Merge pull request #11 from zapodot/fix-npe-in-session

Fix npe in session
fusesource · Apr 17, 2013 · a553522 · a553522
2 parents 95c7739 + b112890
commit a553522
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,6 +42,7 @@
     <apollo-version>1.6</apollo-version>
     <activemq-version>5.8.0</activemq-version>
     <mvnplugins-version>1.15</mvnplugins-version>
+      <mockito.version>1.9.5</mockito.version>
   </properties>
 
   <url>http://${forge-project-id}.fusesource.org/</url>

diff --git a/stompjms-client/pom.xml b/stompjms-client/pom.xml
@@ -84,19 +84,19 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- to enable the webconsole in the apollo broker -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-web</artifactId>
-      <version>${apollo-version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
       <version>7.1.6.v20100715</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>${mockito.version}</version>
+        <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/stompjms-client/src/main/java/org/fusesource/stomp/jms/StompJmsMessageConsumer.java b/stompjms-client/src/main/java/org/fusesource/stomp/jms/StompJmsMessageConsumer.java
@@ -11,7 +11,6 @@
 package org.fusesource.stomp.jms;
 
 import org.fusesource.hawtbuf.AsciiBuffer;
-import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdispatch.CustomDispatchSource;
 import org.fusesource.hawtdispatch.Dispatch;
 import org.fusesource.hawtdispatch.OrderedEventAggregator;
@@ -29,8 +28,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static org.fusesource.stomp.client.Constants.*;
-
 /**
  * implementation of a Jms Message Consumer
  */
@@ -231,7 +228,7 @@ StompJmsMessage ack(final StompJmsMessage message) {
             if( message.getAcknowledgeCallback()!=null ) {
                 // Message has been received by the app.. expand the credit window
                 // so that we receive more messages.
-                StompFrame frame = session.serverAdaptor.createCreditFrame(this, message.getFrame());
+                StompFrame frame = session.channel.serverAdaptor.createCreditFrame(this, message.getFrame());
                 if( frame != null ) {
                     try {
                         session.channel.sendFrame(frame);

diff --git a/stompjms-client/src/test/java/org/fusesource/stomp/jms/StompJmsSessionUntransactedTest.java b/stompjms-client/src/test/java/org/fusesource/stomp/jms/StompJmsSessionUntransactedTest.java
@@ -0,0 +1,80 @@
+package org.fusesource.stomp.jms;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TemporaryTopic;
+
+import static org.junit.Assert.assertSame;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author zapodot at gmail dot com
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class StompJmsSessionUntransactedTest {
+
+    @Mock
+    private StompJmsConnection stompJmsConnection;
+
+    @Mock
+    private StompChannel stompChannel;
+
+    @Mock
+    private StompServerAdaptor stompServerAdaptor;
+
+    @Mock
+    private StompJmsPrefetch stompJmsPrefetch;
+
+    @Mock
+    private TemporaryQueue temporaryQueue;
+
+    @Mock
+    private TemporaryTopic temporaryTopic;
+    private StompJmsSession stompJmsSession;
+
+    @Before
+    public void setUp() throws Exception {
+        when(stompJmsConnection.createChannel(any(StompJmsSession.class))).thenReturn(stompChannel);
+        stompJmsConnection.prefetch = stompJmsPrefetch;
+
+        when(stompChannel.getServerAdaptor()).thenReturn(stompServerAdaptor);
+        when(stompServerAdaptor.createTemporaryQueue(any(StompJmsSession.class))).thenReturn(temporaryQueue);
+        when(stompServerAdaptor.createTemporaryTopic(any(StompJmsSession.class))).thenReturn(temporaryTopic);
+        stompJmsSession = new StompJmsSession(stompJmsConnection, Session.AUTO_ACKNOWLEDGE, false);
+
+    }
+
+    @Test
+    public void testCreateTemporaryQueue() throws Exception {
+        assertSame(temporaryQueue, stompJmsSession.createTemporaryQueue());
+        verify(stompJmsConnection).createChannel(any(StompJmsSession.class));
+        verify(stompChannel).getServerAdaptor();
+        verify(stompServerAdaptor).createTemporaryQueue(same(stompJmsSession));
+
+    }
+
+    @Test
+    public void testCreateTemporaryTopic() throws Exception {
+        assertSame(temporaryTopic, stompJmsSession.createTemporaryTopic());
+        verify(stompJmsConnection).createChannel(any(StompJmsSession.class));
+        verify(stompChannel).getServerAdaptor();
+        verify(stompServerAdaptor).createTemporaryTopic(same(stompJmsSession));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        verifyNoMoreInteractions(stompJmsConnection, stompChannel, stompServerAdaptor);
+
+    }
+}