diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index 7cb6d820745..62f961af48b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -89,16 +89,16 @@ public class JmsTemplateTests { */ @Before public void setupMocks() throws Exception { - jndiContext = mock(Context.class); - connectionFactory = mock(ConnectionFactory.class); - connection = mock(Connection.class); - session = mock(Session.class); - queue = mock(Queue.class); + this.jndiContext = mock(Context.class); + this.connectionFactory = mock(ConnectionFactory.class); + this.connection = mock(Connection.class); + this.session = mock(Session.class); + this.queue = mock(Queue.class); - given(connectionFactory.createConnection()).willReturn(connection); - given(connection.createSession(useTransactedTemplate(), Session.AUTO_ACKNOWLEDGE)).willReturn(session); - given(session.getTransacted()).willReturn(useTransactedSession()); - given(jndiContext.lookup("testDestination")).willReturn(queue); + given(this.connectionFactory.createConnection()).willReturn(this.connection); + given(this.connection.createSession(useTransactedTemplate(), Session.AUTO_ACKNOWLEDGE)).willReturn(this.session); + given(this.session.getTransacted()).willReturn(useTransactedSession()); + given(this.jndiContext.lookup("testDestination")).willReturn(this.queue); } private JmsTemplate createTemplate() { @@ -107,7 +107,7 @@ public class JmsTemplateTests { destMan.setJndiTemplate(new JndiTemplate() { @Override protected Context createInitialContext() { - return jndiContext; + return JmsTemplateTests.this.jndiContext; } }); template.setDestinationResolver(destMan); @@ -124,7 +124,7 @@ public class JmsTemplateTests { } protected Session getLocalSession() { - return session; + return this.session; } @@ -144,10 +144,10 @@ public class JmsTemplateTests { @Test public void testProducerCallback() throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); MessageProducer messageProducer = mock(MessageProducer.class); - given(session.createProducer(null)).willReturn(messageProducer); + given(this.session.createProducer(null)).willReturn(messageProducer); given(messageProducer.getPriority()).willReturn(4); template.execute(new ProducerCallback() { @@ -160,19 +160,19 @@ public class JmsTemplateTests { }); verify(messageProducer).close(); - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } @Test public void testProducerCallbackWithIdAndTimestampDisabled() throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); template.setMessageIdEnabled(false); template.setMessageTimestampEnabled(false); MessageProducer messageProducer = mock(MessageProducer.class); - given(session.createProducer(null)).willReturn(messageProducer); + given(this.session.createProducer(null)).willReturn(messageProducer); given(messageProducer.getPriority()).willReturn(4); template.execute(new ProducerCallback() { @@ -187,8 +187,8 @@ public class JmsTemplateTests { verify(messageProducer).setDisableMessageID(true); verify(messageProducer).setDisableMessageTimestamp(true); verify(messageProducer).close(); - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } /** @@ -197,7 +197,7 @@ public class JmsTemplateTests { @Test public void testSessionCallback() throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); template.execute(new SessionCallback() { @Override @@ -207,13 +207,13 @@ public class JmsTemplateTests { } }); - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } @Test public void testSessionCallbackWithinSynchronizedTransaction() throws Exception { - SingleConnectionFactory scf = new SingleConnectionFactory(connectionFactory); + SingleConnectionFactory scf = new SingleConnectionFactory(this.connectionFactory); JmsTemplate template = createTemplate(); template.setConnectionFactory(scf); @@ -234,8 +234,8 @@ public class JmsTemplateTests { } }); - assertSame(session, ConnectionFactoryUtils.getTransactionalSession(scf, null, false)); - assertSame(session, ConnectionFactoryUtils.getTransactionalSession(scf, scf.createConnection(), false)); + assertSame(this.session, ConnectionFactoryUtils.getTransactionalSession(scf, null, false)); + assertSame(this.session, ConnectionFactoryUtils.getTransactionalSession(scf, scf.createConnection(), false)); TransactionAwareConnectionFactoryProxy tacf = new TransactionAwareConnectionFactoryProxy(scf); Connection tac = tacf.createConnection(); @@ -258,13 +258,13 @@ public class JmsTemplateTests { } assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); - verify(connection).start(); + verify(this.connection).start(); if (useTransactedTemplate()) { - verify(session).commit(); + verify(this.session).commit(); } - verify(session).close(); - verify(connection).stop(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).stop(); + verify(this.connection).close(); } /** @@ -345,13 +345,13 @@ public class JmsTemplateTests { boolean ignoreQOS, boolean disableIdAndTimestamp) throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); String destinationName = "testDestination"; if (useDefaultDestination) { if (explicitDestination) { - template.setDefaultDestination(queue); + template.setDefaultDestination(this.queue); } else { template.setDefaultDestinationName(destinationName); @@ -365,11 +365,11 @@ public class JmsTemplateTests { MessageProducer messageProducer = mock(MessageProducer.class); TextMessage textMessage = mock(TextMessage.class); - given(session.createProducer(queue)).willReturn(messageProducer); - given(session.createTextMessage("just testing")).willReturn(textMessage); + given(this.session.createProducer(this.queue)).willReturn(messageProducer); + given(this.session.createTextMessage("just testing")).willReturn(textMessage); if (!ignoreQOS) { - template.setQosSettings(qosSettings); + template.setQosSettings(this.qosSettings); } if (useDefaultDestination) { @@ -382,7 +382,7 @@ public class JmsTemplateTests { } else { if (explicitDestination) { - template.send(queue, new MessageCreator() { + template.send(this.queue, new MessageCreator() { @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); @@ -400,7 +400,7 @@ public class JmsTemplateTests { } if (useTransactedTemplate()) { - verify(session).commit(); + verify(this.session).commit(); } if (disableIdAndTimestamp) { @@ -412,36 +412,36 @@ public class JmsTemplateTests { verify(messageProducer).send(textMessage); } else { - verify(messageProducer).send(textMessage, qosSettings.getDeliveryMode(), - qosSettings.getPriority(), qosSettings.getTimeToLive()); + verify(messageProducer).send(textMessage, this.qosSettings.getDeliveryMode(), + this.qosSettings.getPriority(), this.qosSettings.getTimeToLive()); } verify(messageProducer).close(); - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } @Test public void testConverter() throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); template.setMessageConverter(new SimpleMessageConverter()); String s = "Hello world"; MessageProducer messageProducer = mock(MessageProducer.class); TextMessage textMessage = mock(TextMessage.class); - given(session.createProducer(queue)).willReturn(messageProducer); - given(session.createTextMessage("Hello world")).willReturn(textMessage); + given(this.session.createProducer(this.queue)).willReturn(messageProducer); + given(this.session.createTextMessage("Hello world")).willReturn(textMessage); - template.convertAndSend(queue, s); + template.convertAndSend(this.queue, s); verify(messageProducer).send(textMessage); verify(messageProducer).close(); if (useTransactedTemplate()) { - verify(session).commit(); + verify(this.session).commit(); } - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } @Test @@ -535,13 +535,13 @@ public class JmsTemplateTests { throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); String destinationName = "testDestination"; if (useDefaultDestination) { if (explicitDestination) { - template.setDefaultDestination(queue); + template.setDefaultDestination(this.queue); } else { template.setDefaultDestinationName(destinationName); @@ -555,11 +555,11 @@ public class JmsTemplateTests { MessageConsumer messageConsumer = mock(MessageConsumer.class); String selectorString = "selector"; - given(session.createConsumer(queue, + given(this.session.createConsumer(this.queue, messageSelector ? selectorString : null)).willReturn(messageConsumer); if (!useTransactedTemplate() && !useTransactedSession()) { - given(session.getAcknowledgeMode()).willReturn( + given(this.session.getAcknowledgeMode()).willReturn( clientAcknowledge ? Session.CLIENT_ACKNOWLEDGE : Session.AUTO_ACKNOWLEDGE); } @@ -596,12 +596,12 @@ public class JmsTemplateTests { else if (explicitDestination) { if (testConverter) { textFromMessage = (String) - (messageSelector ? template.receiveSelectedAndConvert(queue, selectorString) : - template.receiveAndConvert(queue)); + (messageSelector ? template.receiveSelectedAndConvert(this.queue, selectorString) : + template.receiveAndConvert(this.queue)); } else { - message = (messageSelector ? template.receiveSelected(queue, selectorString) : - template.receive(queue)); + message = (messageSelector ? template.receiveSelected(this.queue, selectorString) : + template.receive(this.queue)); } } else { @@ -623,12 +623,12 @@ public class JmsTemplateTests { assertEquals("Messages should refer to the same object", message, textMessage); } - verify(connection).start(); - verify(connection).close(); + verify(this.connection).start(); + verify(this.connection).close(); if (useTransactedTemplate()) { - verify(session).commit(); + verify(this.session).commit(); } - verify(session).close(); + verify(this.session).close(); if (!useTransactedSession() && clientAcknowledge) { verify(textMessage).acknowledge(); } @@ -659,12 +659,12 @@ public class JmsTemplateTests { throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); String destinationName = "testDestination"; if (useDefaultDestination) { if (explicitDestination) { - template.setDefaultDestination(queue); + template.setDefaultDestination(this.queue); } else { template.setDefaultDestinationName(destinationName); @@ -675,7 +675,7 @@ public class JmsTemplateTests { Session localSession = getLocalSession(); TemporaryQueue replyDestination = mock(TemporaryQueue.class); MessageProducer messageProducer = mock(MessageProducer.class); - given(localSession.createProducer(queue)).willReturn(messageProducer); + given(localSession.createProducer(this.queue)).willReturn(messageProducer); given(localSession.createTemporaryQueue()).willReturn(replyDestination); MessageConsumer messageConsumer = mock(MessageConsumer.class); @@ -702,7 +702,7 @@ public class JmsTemplateTests { message = template.sendAndReceive(messageCreator); } else if (explicitDestination) { - message = template.sendAndReceive(queue, messageCreator); + message = template.sendAndReceive(this.queue, messageCreator); } else { message = template.sendAndReceive(destinationName, messageCreator); @@ -711,8 +711,8 @@ public class JmsTemplateTests { // replyTO set on the request verify(request).setJMSReplyTo(replyDestination); assertSame("Reply message not received", reply, message); - verify(connection).start(); - verify(connection).close(); + verify(this.connection).start(); + verify(this.connection).close(); verify(localSession).close(); verify(messageConsumer).close(); verify(messageProducer).close(); @@ -785,21 +785,21 @@ public class JmsTemplateTests { protected void doTestJmsException(JMSException original, Class thrownExceptionClass) throws Exception { JmsTemplate template = createTemplate(); - template.setConnectionFactory(connectionFactory); + template.setConnectionFactory(this.connectionFactory); template.setMessageConverter(new SimpleMessageConverter()); String s = "Hello world"; MessageProducer messageProducer = mock(MessageProducer.class); TextMessage textMessage = mock(TextMessage.class); - reset(session); - given(session.createProducer(queue)).willReturn(messageProducer); - given(session.createTextMessage("Hello world")).willReturn(textMessage); + reset(this.session); + given(this.session.createProducer(this.queue)).willReturn(messageProducer); + given(this.session.createTextMessage("Hello world")).willReturn(textMessage); willThrow(original).given(messageProducer).send(textMessage); try { - template.convertAndSend(queue, s); + template.convertAndSend(this.queue, s); fail("Should have thrown JmsException"); } catch (JmsException wrappedEx) { @@ -809,8 +809,8 @@ public class JmsTemplateTests { } verify(messageProducer).close(); - verify(session).close(); - verify(connection).close(); + verify(this.session).close(); + verify(this.connection).close(); } }