You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/22 19:43:23 UTC
qpid-jms git commit: QPIDJMS-121 Make the JmsAcknowledgementCallback
final and remove some redundant tests.
Repository: qpid-jms
Updated Branches:
refs/heads/master ca457d737 -> 430f0d5fb
QPIDJMS-121 Make the JmsAcknowledgementCallback final and remove some
redundant tests.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/430f0d5f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/430f0d5f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/430f0d5f
Branch: refs/heads/master
Commit: 430f0d5fb9baba59ebd8ea1cfce3e4e30330f78c
Parents: ca457d7
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 22 13:43:13 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 22 13:43:13 2015 -0400
----------------------------------------------------------------------
.../apache/qpid/jms/JmsAcknowledgeCallback.java | 2 +-
.../apache/qpid/jms/message/JmsMessageTest.java | 25 --------------------
2 files changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/430f0d5f/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsAcknowledgeCallback.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsAcknowledgeCallback.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsAcknowledgeCallback.java
index 4923124..cc60b56 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsAcknowledgeCallback.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsAcknowledgeCallback.java
@@ -23,7 +23,7 @@ import javax.jms.JMSException;
import org.apache.qpid.jms.message.JmsMessageSupport;
import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
-public class JmsAcknowledgeCallback {
+public final class JmsAcknowledgeCallback {
private final JmsSession session;
private int ackType;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/430f0d5f/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
index 609cc67..e2f302d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
@@ -31,10 +31,8 @@ import javax.jms.Message;
import javax.jms.MessageFormatException;
import javax.jms.MessageNotWriteableException;
-import org.apache.qpid.jms.JmsAcknowledgeCallback;
import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.JmsDestination;
-import org.apache.qpid.jms.JmsSession;
import org.apache.qpid.jms.JmsTopic;
import org.apache.qpid.jms.message.facade.JmsMessageFacade;
import org.apache.qpid.jms.message.facade.test.JmsTestMessageFacade;
@@ -1156,29 +1154,6 @@ public class JmsMessageTest {
msg.acknowledge();
}
- @Test
- public void testAcknowledgeWitCallback() throws Exception {
- JmsSession session = Mockito.mock(JmsSession.class);
- JmsAcknowledgeCallback callback = new JmsAcknowledgeCallback(session);
- JmsMessage msg = factory.createMessage();
- msg.setAcknowledgeCallback(callback);
- msg.acknowledge();
- }
-
- @Test
- public void testAcknowledgeWitCallbackThatThrows() throws Exception {
- JmsAcknowledgeCallback callback = Mockito.mock(JmsAcknowledgeCallback.class);
- Mockito.doThrow(new JMSException("expected")).when(callback).acknowledge();
- JmsMessage msg = factory.createMessage();
- msg.setAcknowledgeCallback(callback);
- assertEquals(callback, msg.getAcknowledgeCallback());
- try {
- msg.acknowledge();
- fail("Should have thrown.");
- } catch (JMSException e) {
- }
- }
-
//---- Test that message property getters throw expected exceptions ------//
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org