diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests-context.xml b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests-context.xml index c27342a498..1d53667fab 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests-context.xml +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests-context.xml @@ -4,7 +4,7 @@ xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - - \ No newline at end of file + + diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java index 188b1f0a00..5df2fdef75 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java @@ -18,12 +18,9 @@ package org.springframework.integration.jpa.core; import java.text.ParseException; -import javax.sql.DataSource; - import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -36,12 +33,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration public class HibernateJpaOperationsTests extends AbstractJpaOperationsTests { - @Autowired - private DataSource dataSource; - - @Autowired - private LocalContainerEntityManagerFactoryBean fb; - @Test @Override public void testExecuteUpdate() { diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests-context.xml b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests-context.xml index 12c9a811ba..1d53667fab 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests-context.xml +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests-context.xml @@ -4,7 +4,7 @@ xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - \ No newline at end of file + diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/OpenJpaJpaOperationsTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/OpenJpaJpaOperationsTests.java index d992987405..d912f07e0f 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/OpenJpaJpaOperationsTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/OpenJpaJpaOperationsTests.java @@ -16,11 +16,12 @@ package org.springframework.integration.jpa.core; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.sql.SQLException; import java.text.ParseException; -import org.junit.Assert; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl; import org.apache.openjpa.jdbc.meta.MappingTool; @@ -28,8 +29,10 @@ import org.apache.openjpa.lib.conf.Configurations; import org.apache.openjpa.lib.util.Options; import org.apache.openjpa.persistence.InvalidStateException; import org.apache.openjpa.persistence.PersistenceException; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,6 +50,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * * * @author Gunnar Hillert + * @author Gary Russell * @since 2.2 * */ @@ -101,6 +105,7 @@ public class OpenJpaJpaOperationsTests extends AbstractJpaOperationsTests { boolean ret = Configurations.runAgainstAllAnchors(opts, new Configurations.Runnable() { + @Override public boolean run(Options opts) throws IOException, SQLException { JDBCConfiguration conf = new JDBCConfigurationImpl(); conf.setConnectionDriverName("org.h2.Driver"); @@ -116,7 +121,7 @@ public class OpenJpaJpaOperationsTests extends AbstractJpaOperationsTests { } } }); - + assertTrue(ret); } @Test diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java index 753f51c0c8..5f1442645b 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java @@ -17,11 +17,13 @@ package org.springframework.integration.mail.config; import org.junit.Test; + import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Oleg Zhurakousky + * @author Gary Russell * */ public class FailedMailConfigurationTests { @@ -30,13 +32,13 @@ public class FailedMailConfigurationTests { */ @Test(expected = XmlBeanDefinitionStoreException.class) public void testImapIdleWithNoDeleteMessageAttribute() { - new ClassPathXmlApplicationContext("failed-imap-config.xml", this.getClass()); + new ClassPathXmlApplicationContext("failed-imap-config.xml", this.getClass()).close(); } /** * validates that if 'should-delete-messages' is not set the context fails */ @Test(expected = XmlBeanDefinitionStoreException.class) public void testAdapterWithNoDeleteMessageAttribute() { - new ClassPathXmlApplicationContext("failed-adapter-config.xml", this.getClass()); + new ClassPathXmlApplicationContext("failed-adapter-config.xml", this.getClass()).close(); } } diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java index 02630f634f..601ea14e1a 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,18 +22,19 @@ import static org.junit.Assert.assertNotNull; import java.util.Properties; import org.junit.Test; + import org.springframework.beans.DirectFieldAccessor; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.mail.MailSendingMessageHandler; -import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.mail.MailSender; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.support.GenericMessage; /** * @author Mark Fisher @@ -46,7 +47,7 @@ public class MailOutboundChannelAdapterParserTests { @Test public void adapterWithMailSenderReference() { - ApplicationContext context = new ClassPathXmlApplicationContext( + ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( "mailOutboundChannelAdapterParserTests.xml", this.getClass()); Object adapter = context.getBean("adapterWithMailSenderReference.adapter"); MailSendingMessageHandler handler = (MailSendingMessageHandler) @@ -55,22 +56,24 @@ public class MailOutboundChannelAdapterParserTests { MailSender mailSender = (MailSender) fieldAccessor.getPropertyValue("mailSender"); assertNotNull(mailSender); assertEquals(23, fieldAccessor.getPropertyValue("order")); + context.close(); } @Test public void advised() { - ApplicationContext context = new ClassPathXmlApplicationContext( + ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( "mailOutboundChannelAdapterParserTests.xml", this.getClass()); Object adapter = context.getBean("advised.adapter"); MessageHandler handler = (MessageHandler) new DirectFieldAccessor(adapter).getPropertyValue("handler"); handler.handleMessage(new GenericMessage("foo")); assertEquals(1, adviceCalled); + context.close(); } @Test public void adapterWithHostProperty() { - ApplicationContext context = new ClassPathXmlApplicationContext( + ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( "mailOutboundChannelAdapterParserTests.xml", this.getClass()); Object adapter = context.getBean("adapterWithHostProperty.adapter"); MailSendingMessageHandler handler = (MailSendingMessageHandler) @@ -78,20 +81,22 @@ public class MailOutboundChannelAdapterParserTests { DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(handler); MailSender mailSender = (MailSender) fieldAccessor.getPropertyValue("mailSender"); assertNotNull(mailSender); + context.close(); } @Test public void adapterWithPollableChannel() { - ApplicationContext context = new ClassPathXmlApplicationContext( + ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( "mailOutboundChannelAdapterParserTests.xml", this.getClass()); PollingConsumer pc = context.getBean("adapterWithPollableChannel", PollingConsumer.class); QueueChannel pollableChannel = TestUtils.getPropertyValue(pc, "inputChannel", QueueChannel.class); assertEquals("pollableChannel", pollableChannel.getComponentName()); + context.close(); } @Test public void adapterWithJavaMailProperties() { - ApplicationContext context = new ClassPathXmlApplicationContext( + ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( "MailOutboundWithJavamailProperties-context.xml", this.getClass()); Object adapter = context.getBean("adapterWithHostProperty.adapter"); MailSendingMessageHandler handler = (MailSendingMessageHandler) @@ -103,6 +108,7 @@ public class MailOutboundChannelAdapterParserTests { assertEquals(7, javaMailProperties.size()); assertNotNull(javaMailProperties); assertEquals("true", javaMailProperties.get("mail.smtps.auth")); + context.close(); } public static class FooAdvice extends AbstractRequestHandlerAdvice { diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java index 12ca13d885..90c9892004 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java @@ -73,7 +73,8 @@ public class MailToStringTransformerParserTests { @Test(expected = BeanDefinitionStoreException.class) public void topLevelTransformerMissingInput() { try { - new ClassPathXmlApplicationContext("mailToStringTransformerWithoutInputChannel.xml", this.getClass()); + new ClassPathXmlApplicationContext("mailToStringTransformerWithoutInputChannel.xml", this.getClass()) + .close(); } catch (BeanDefinitionStoreException e) { assertTrue(e.getMessage().contains("input-channel")); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml index bce094fc3d..0710c56274 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml @@ -12,27 +12,27 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + - + - - - + true - true - true - + true + true + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java index 00d23c54bc..043f11879f 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java @@ -36,19 +36,20 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.mail.MailSendingMessageHandler; -import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileCopyUtils; /** * @author Oleg Zhurakousky + * @author Gary Russell * */ public class MessageWithContentTypeTests { @@ -56,12 +57,14 @@ public class MessageWithContentTypeTests { @Test @Ignore public void testSendEmail() throws Exception { - ApplicationContext ac = new ClassPathXmlApplicationContext("MessageWithContentTypeTests-context.xml", this.getClass()); + ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext( + "MessageWithContentTypeTests-context.xml", this.getClass()); MessageChannel inputChannel = ac.getBean("inputChannel", MessageChannel.class); StringWriter writer = new StringWriter(); FileReader reader = new FileReader("src/test/java/org/springframework/integration/mail/config/test.html"); FileCopyUtils.copy(reader, writer); inputChannel.send(new GenericMessage(writer.getBuffer().toString())); + ac.close(); } @Test @@ -80,6 +83,7 @@ public class MessageWithContentTypeTests { // MOCKS when(sender.createMimeMessage()).thenReturn(mMessage); doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock invocation) throws Throwable { MimeMessage mimeMessage = (MimeMessage) invocation.getArguments()[0]; assertEquals("text/html", mimeMessage.getDataHandler().getContentType()); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml index 224dc62cfe..d14d07b485 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml @@ -8,12 +8,12 @@ xmlns:int-mail="http://www.springframework.org/schema/integration/mail"> - + - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml index d1aeda9bc1..0f5edf76bf 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml @@ -8,8 +8,8 @@ xmlns:int-mail="http://www.springframework.org/schema/integration/mail"> - + - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml index 971871dcda..a7148b1e59 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml @@ -11,8 +11,8 @@ xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"> - @@ -23,30 +23,28 @@ auto-startup="true" should-delete-messages="false" java-mail-properties="javaMailProperties"/> - + - - - + - + - + - + javax.net.ssl.SSLSocketFactory false imaps false - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml index b8e242e922..9984242acb 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml @@ -10,17 +10,17 @@ - + - + - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html index fc67570a30..ed8b47b0e5 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/test.html @@ -1,767 +1,767 @@ - - - - - - - - + - + - - - - - - - - - - Twitter - - - - - - - - - + + + + + + + + + + Twitter + + + + + + + + + - -