From b9121de1e8d0e609bfd96f6635274c34044978af Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 9 Aug 2011 07:06:12 -0400 Subject: [PATCH] INT-2039 removed more references to deprecated Spring classes. --- ...hodInvokingMessageGroupProcessorTests.java | 21 ++++++++++--------- .../channel/DatatypeChannelTests.java | 19 ++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java index 729fbc55cb..f2f83b3f2c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java @@ -16,13 +16,6 @@ package org.springframework.integration.aggregator; -import static junit.framework.Assert.assertTrue; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -35,10 +28,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; - import org.springframework.aop.framework.ProxyFactory; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.annotation.Aggregator; @@ -53,6 +45,15 @@ import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; +import static junit.framework.Assert.assertTrue; +import static org.hamcrest.CoreMatchers.is; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + +import static org.mockito.Mockito.when; + @RunWith(MockitoJUnitRunner.class) public class MethodInvokingMessageGroupProcessorTests { @@ -239,7 +240,7 @@ public class MethodInvokingMessageGroupProcessorTests { } MethodInvokingMessageGroupProcessor processor = new MethodInvokingMessageGroupProcessor(new SimpleAggregator()); - GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + GenericConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter, Iterator>() { public Iterator convert(ArrayList source) { return source.iterator(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java index 885cd50e5b..05689ee50b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java @@ -16,21 +16,16 @@ package org.springframework.integration.channel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.Collections; import java.util.Date; import org.junit.Test; - import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.ConversionServiceFactoryBean; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageDeliveryException; @@ -39,6 +34,10 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Mark Fisher * @since 2.0 @@ -60,7 +59,7 @@ public class DatatypeChannelTests { @Test public void unsupportedTypeButConversionServiceSupports() { QueueChannel channel = createChannel(Integer.class); - ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + ConversionService conversionService = new DefaultConversionService(); channel.setConversionService(conversionService); assertTrue(channel.send(new GenericMessage("123"))); } @@ -68,7 +67,7 @@ public class DatatypeChannelTests { @Test(expected = MessageDeliveryException.class) public void unsupportedTypeAndConversionServiceDoesNotSupport() { QueueChannel channel = createChannel(Integer.class); - ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + ConversionService conversionService = new DefaultConversionService(); channel.setConversionService(conversionService); assertTrue(channel.send(new GenericMessage(Boolean.TRUE))); } @@ -76,7 +75,7 @@ public class DatatypeChannelTests { @Test public void unsupportedTypeButCustomConversionServiceSupports() { QueueChannel channel = createChannel(Integer.class); - GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + GenericConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter() { public Integer convert(Boolean source) { return source ? 1 : 0; @@ -116,7 +115,7 @@ public class DatatypeChannelTests { return source ? 1 : 0; } }; - GenericConversionService customConversionService = ConversionServiceFactory.createDefaultConversionService(); + GenericConversionService customConversionService = new DefaultConversionService(); customConversionService.addConverter(new Converter() { public Integer convert(Boolean source) { return source ? 99 : -99;