Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix more test XML configs for latest Mockito

Browse Source
This commit is contained in:
abilan
2022-12-20 17:08:34 -05:00
parent 80115d33b1
commit aa761b44b4
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdempotentReceiverParserTests-context.xml
View File

@@ -16,7 +16,8 @@
<idempotent-receiver id="selectorInterceptor" endpoint="foo" selector="selector"/>
<beans:bean id="keyStrategy" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.springframework.integration.handler.MessageProcessor"/>
<beans:constructor-arg value="org.springframework.integration.handler.MessageProcessor"
type="java.lang.Class"/>
</beans:bean>
<beans:bean id="valueStrategy" class="org.mockito.Mockito" factory-method="mock">

3
spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests-context.xml
View File

@@ -10,7 +10,8 @@
<si:service-activator input-channel="input" ref="mock" method="test" />
<bean id="mock" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.handler.MockHandlerTests$TestInterface" />
<constructor-arg value="org.springframework.integration.handler.MockHandlerTests$TestInterface"
type="java.lang.Class"/>
</bean>
</beans>

3
spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests-context.xml
View File

@@ -18,7 +18,8 @@
<splitter id="splitter" input-channel="splitterInput" expression="payload.values" send-timeout="123"/>
<beans:bean id="mock" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.springframework.integration.handler.MockHandlerTests$TestInterface"/>
<beans:constructor-arg value="org.springframework.integration.handler.MockHandlerTests$TestInterface"
type="java.lang.Class"/>
</beans:bean>
</beans:beans>

38
spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorOnMockitoMockTests-context.xml
View File

@@ -1,54 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:int="http://www.springframework.org/schema/integration"
xsi:schemaLocation="
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd">
<int:channel id="in" />
<int:channel id="in"/>
<int:chain input-channel="in" output-channel="out">
<int:filter expression="payload == 'singleAnnotatedMethodOnClass'" throw-exception-on-rejection="true"/>
<int:service-activator ref="singleAnnotatedMethodOnClass" />
<int:service-activator ref="singleAnnotatedMethodOnClass"/>
</int:chain>
<bean id="singleAnnotatedMethodOnClass" class="org.mockito.Mockito"
factory-method="mock">
factory-method="mock">
<constructor-arg
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleAnnotatedMethodOnClass" />
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleAnnotatedMethodOnClass"
type="java.lang.Class"/>
</bean>
<int:chain input-channel="in" output-channel="out">
<int:filter expression="payload == 'SingleMethodOnClass'" throw-exception-on-rejection="true"/>
<int:service-activator ref="singleMethodOnClass" />
<int:service-activator ref="singleMethodOnClass"/>
</int:chain>
<bean id="singleMethodOnClass" class="org.mockito.Mockito"
factory-method="mock">
factory-method="mock">
<constructor-arg
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleMethodOnClass"
type="java.lang.Class"/>
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleMethodOnClass"
type="java.lang.Class"/>
</bean>
<int:chain input-channel="in" output-channel="out">
<int:filter expression="payload == 'SingleMethodAcceptingHeaderOnClass'" throw-exception-on-rejection="true"/>
<int:service-activator ref="singleMethodAcceptingHeaderOnClass" />
<int:service-activator ref="singleMethodAcceptingHeaderOnClass"/>
</int:chain>
<bean id="singleMethodAcceptingHeaderOnClass" class="org.mockito.Mockito"
factory-method="mock">
factory-method="mock">
<constructor-arg
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleMethodAcceptingHeaderOnClass"
type="java.lang.Class"/>
value="org.springframework.integration.handler.ServiceActivatorOnMockitoMockTests.SingleMethodAcceptingHeaderOnClass"
type="java.lang.Class"/>
</bean>
<int:channel id="out">
<int:queue capacity="10" />
<int:queue capacity="10"/>
</int:channel>
</beans>