Repository: qpid-jms Updated Branches: refs/heads/master c0bc5f074 -> ca457d737
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ca457d73/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 5e68557..609cc67 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 @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.Enumeration; -import java.util.concurrent.Callable; import javax.jms.DeliveryMode; import javax.jms.JMSException; @@ -32,8 +31,10 @@ 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; @@ -1155,21 +1156,19 @@ public class JmsMessageTest { msg.acknowledge(); } - @SuppressWarnings("unchecked") @Test public void testAcknowledgeWitCallback() throws Exception { - Callable<Void> callback = Mockito.mock(Callable.class); + JmsSession session = Mockito.mock(JmsSession.class); + JmsAcknowledgeCallback callback = new JmsAcknowledgeCallback(session); JmsMessage msg = factory.createMessage(); msg.setAcknowledgeCallback(callback); msg.acknowledge(); - Mockito.verify(callback).call(); } - @SuppressWarnings("unchecked") @Test public void testAcknowledgeWitCallbackThatThrows() throws Exception { - Callable<Void> callback = Mockito.mock(Callable.class); - Mockito.doThrow(new Exception()).when(callback).call(); + 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()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ca457d73/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderClosedTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderClosedTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderClosedTest.java index e059a17..1b170e0 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderClosedTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderClosedTest.java @@ -100,13 +100,13 @@ public class FailoverProviderClosedTest extends FailoverProviderTestSupport { @Test(timeout=30000, expected=IOException.class) public void testSessionAcknowledge() throws Exception { ProviderFuture request = new ProviderFuture(); - provider.acknowledge(session.getId(), request); + provider.acknowledge(session.getId(), ACK_TYPE.ACCEPTED, request); } @Test(timeout=30000, expected=IOException.class) public void testAcknowledgeMessage() throws Exception { ProviderFuture request = new ProviderFuture(); - provider.acknowledge(new JmsInboundMessageDispatch(1), ACK_TYPE.CONSUMED, request); + provider.acknowledge(new JmsInboundMessageDispatch(1), ACK_TYPE.ACCEPTED, request); } @Test(timeout=30000, expected=IOException.class) http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ca457d73/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java index 8b65ed2..c324002 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java @@ -282,7 +282,7 @@ public class MockProvider implements Provider { } @Override - public void acknowledge(final JmsSessionId sessionId, final AsyncResult request) throws IOException, JMSException { + public void acknowledge(final JmsSessionId sessionId, final ACK_TYPE ackType, final AsyncResult request) throws IOException, JMSException { checkClosed(); serializer.execute(new Runnable() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
