From e1f671beb9ccd00e35dc7521c0dad3b14f1af115 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 27 Jul 2010 14:57:04 +0000 Subject: [PATCH] INT-1129 fixed reflective access of messagingTemplate in tests --- .../integration/config/AggregatorParserTests.java | 2 +- .../integration/config/ResequencerParserTests.java | 4 ++-- .../config/annotation/AggregatorAnnotationTests.java | 6 +++--- .../integration/config/xml/DelayerParserTests.java | 2 +- .../integration/config/xml/HeaderEnricherParserTests.java | 4 ++-- .../integration/handler/SendTimeoutConfigurationTests.java | 2 +- .../router/config/RecipientListRouterParserTests.java | 4 ++-- .../integration/router/config/RouterParserTests.java | 2 +- .../http/config/HttpOutboundGatewayParserTests.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 22f0baa7e9..3983894e7b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -97,7 +97,7 @@ public class AggregatorParserTests { Assert.assertEquals("The AggregatorEndpoint is not injected with the appropriate discard channel", discardChannel, accessor.getPropertyValue("discardChannel")); Assert.assertEquals("The AggregatorEndpoint is not set with the appropriate timeout value", - 86420000l, TestUtils.getPropertyValue(consumer, "channelTemplate.sendTimeout")); + 86420000l, TestUtils.getPropertyValue(consumer, "messagingTemplate.sendTimeout")); Assert.assertEquals( "The AggregatorEndpoint is not configured with the appropriate 'send partial results on timeout' flag", true, accessor.getPropertyValue("sendPartialResultOnExpiry")); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index 3bb7cf68b6..48afe25621 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -84,7 +84,7 @@ public class ResequencerParserTests { assertNull(getPropertyValue(resequencer, "outputChannel")); assertTrue(getPropertyValue(resequencer, "discardChannel") instanceof NullChannel); assertEquals("The ResequencerEndpoint is not set with the appropriate timeout value", 1000l, getPropertyValue( - resequencer, "channelTemplate.sendTimeout")); + resequencer, "messagingTemplate.sendTimeout")); assertEquals( "The ResequencerEndpoint is not configured with the appropriate 'send partial results on timeout' flag", false, getPropertyValue(resequencer, "sendPartialResultOnExpiry")); @@ -104,7 +104,7 @@ public class ResequencerParserTests { assertEquals("The ResequencerEndpoint is not injected with the appropriate discard channel", discardChannel, getPropertyValue(resequencer, "discardChannel")); assertEquals("The ResequencerEndpoint is not set with the appropriate timeout value", 86420000l, - getPropertyValue(resequencer, "channelTemplate.sendTimeout")); + getPropertyValue(resequencer, "messagingTemplate.sendTimeout")); assertEquals( "The ResequencerEndpoint is not configured with the appropriate 'send partial results on timeout' flag", true, getPropertyValue(resequencer, "sendPartialResultOnExpiry")); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index 609fee4326..434c636a12 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 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. @@ -57,7 +57,7 @@ public class AggregatorAnnotationTests { assertNull(getPropertyValue(aggregator, "outputChannel")); assertTrue(getPropertyValue(aggregator, "discardChannel") instanceof NullChannel); assertEquals(CorrelatingMessageHandler.DEFAULT_SEND_TIMEOUT, - getPropertyValue(aggregator, "channelTemplate.sendTimeout")); + getPropertyValue(aggregator, "messagingTemplate.sendTimeout")); assertEquals(false, getPropertyValue(aggregator, "sendPartialResultOnExpiry")); } @@ -74,7 +74,7 @@ public class AggregatorAnnotationTests { getPropertyValue(aggregator, "outputChannel")); assertEquals(channelResolver.resolveChannelName("discardChannel"), getPropertyValue(aggregator, "discardChannel")); - assertEquals(98765432l, getPropertyValue(aggregator, "channelTemplate.sendTimeout")); + assertEquals(98765432l, getPropertyValue(aggregator, "messagingTemplate.sendTimeout")); assertEquals(true, getPropertyValue(aggregator, "sendPartialResultOnExpiry")); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java index 64f4703a9a..bad07009f4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java @@ -56,7 +56,7 @@ public class DelayerParserTests { assertEquals(new Long(1234), accessor.getPropertyValue("defaultDelay")); assertEquals("foo", accessor.getPropertyValue("delayHeaderName")); assertEquals(new Long(987), new DirectFieldAccessor( - accessor.getPropertyValue("channelTemplate")).getPropertyValue("sendTimeout")); + accessor.getPropertyValue("messagingTemplate")).getPropertyValue("sendTimeout")); assertEquals(Boolean.TRUE, new DirectFieldAccessor( accessor.getPropertyValue("taskScheduler")).getPropertyValue("waitForTasksToCompleteOnShutdown")); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java index b56c2d06b2..df493799c8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java @@ -42,14 +42,14 @@ public class HeaderEnricherParserTests { @Test // INT-1154 public void sendTimeoutDefault() { Object endpoint = context.getBean("headerEnricherWithDefaults"); - long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.channelTemplate.sendTimeout", Long.class).longValue(); + long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.messagingTemplate.sendTimeout", Long.class).longValue(); assertEquals(1000L, sendTimeout); } @Test // INT-1154 public void sendTimeoutConfigured() { Object endpoint = context.getBean("headerEnricherWithSendTimeout"); - long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.channelTemplate.sendTimeout", Long.class).longValue(); + long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.messagingTemplate.sendTimeout", Long.class).longValue(); assertEquals(1234L, sendTimeout); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java index 91bd5e6a8b..ba1abaf21a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java @@ -66,7 +66,7 @@ public class SendTimeoutConfigurationTests { private long getTimeout(String endpointName) { return TestUtils.getPropertyValue(context.getBean(endpointName), - "handler.channelTemplate.sendTimeout", Long.class).longValue(); + "handler.messagingTemplate.sendTimeout", Long.class).longValue(); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java index 4604097e2c..6e153c3f91 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java @@ -74,7 +74,7 @@ public class RecipientListRouterParserTests { RecipientListRouter router = (RecipientListRouter) handler; DirectFieldAccessor accessor = new DirectFieldAccessor(router); assertEquals(new Long(-1), new DirectFieldAccessor( - accessor.getPropertyValue("channelTemplate")).getPropertyValue("sendTimeout")); + accessor.getPropertyValue("messagingTemplate")).getPropertyValue("sendTimeout")); assertEquals(Boolean.FALSE, accessor.getPropertyValue("applySequence")); assertEquals(Boolean.FALSE, accessor.getPropertyValue("ignoreSendFailures")); } @@ -87,7 +87,7 @@ public class RecipientListRouterParserTests { RecipientListRouter router = (RecipientListRouter) handler; DirectFieldAccessor accessor = new DirectFieldAccessor(router); assertEquals(new Long(1234), new DirectFieldAccessor( - accessor.getPropertyValue("channelTemplate")).getPropertyValue("sendTimeout")); + accessor.getPropertyValue("messagingTemplate")).getPropertyValue("sendTimeout")); assertEquals(Boolean.TRUE, accessor.getPropertyValue("applySequence")); assertEquals(Boolean.TRUE, accessor.getPropertyValue("ignoreSendFailures")); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 5550abeb02..5fd37e29e6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -132,7 +132,7 @@ public class RouterParserTests { Object endpoint = context.getBean("routerWithTimeout"); MethodInvokingRouter router = TestUtils.getPropertyValue(endpoint, "handler", MethodInvokingRouter.class); MessagingTemplate template = (MessagingTemplate) - new DirectFieldAccessor(router).getPropertyValue("channelTemplate"); + new DirectFieldAccessor(router).getPropertyValue("messagingTemplate"); Long timeout = (Long) new DirectFieldAccessor(template).getPropertyValue("sendTimeout"); assertEquals(new Long(1234), timeout); } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java index f81ddfdd74..083fc544b8 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java @@ -112,7 +112,7 @@ public class HttpOutboundGatewayParserTests { Object requestFactoryBean = this.applicationContext.getBean("testRequestFactory"); assertEquals(requestFactoryBean, requestFactory); Object sendTimeout = new DirectFieldAccessor( - handlerAccessor.getPropertyValue("channelTemplate")).getPropertyValue("sendTimeout"); + handlerAccessor.getPropertyValue("messagingTemplate")).getPropertyValue("sendTimeout"); assertEquals(new Long("1234"), sendTimeout); assertEquals(parameterExtractor, handlerAccessor.getPropertyValue("parameterExtractor")); }