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

More Mockito fixes for test XML configs

Browse Source 
Looks like sometime Spring Framework XML parser can properly determine the target factory method to chose,
but sometimes it does that in a wrong order.

* Add `type="java.lang.Class"` to the ctor args everywhere for `class="org.mockito.Mockito" factory-method="mock"`
`<bean>` definitions
This commit is contained in:
abilan
2022-12-21 11:16:56 -05:00
parent e74393f995
commit 19d6b7617f
32 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
View File

@@ -40,7 +40,7 @@
</ftp:inbound-channel-adapter>
<bean id="filter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int:channel id="ftpIn">

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
View File

@@ -28,7 +28,7 @@
</ftp:inbound-channel-adapter>
<bean id="filter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int:channel id="ftpIn">

4
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
View File

@@ -60,7 +60,7 @@
<int:channel id="failureChannel" />
<bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.Comparator"/>
<constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</bean>
<int-ftp:inbound-channel-adapter
@@ -87,7 +87,7 @@
</int:channel>
<bean id="entryListFilter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
<int-ftp:inbound-channel-adapter id="autoChannel"

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
View File

@@ -78,7 +78,7 @@
<int:publish-subscribe-channel id="ftpChannel"/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
<int-ftp:outbound-channel-adapter id="withBeanExpressions"

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-fail.xml
View File

@@ -32,6 +32,6 @@
<int:publish-subscribe-channel id="ftpChannel"/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
</beans>

4
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests-context.xml
View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="sf" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory"/>
<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory" type="java.lang.Class"/>
</bean>
<bean id="csf" class="org.springframework.integration.file.remote.session.CachingSessionFactory">
@@ -93,7 +93,7 @@
</int-ftp:outbound-gateway>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
<int-ftp:outbound-gateway id="withBeanExpression"

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpStreamingInboundChannelAdapterParserTests-context.xml
View File

@@ -32,7 +32,7 @@
</int:channel>
<bean id="comparator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.Comparator"/>
<constructor-arg value="java.util.Comparator" type="java.lang.Class"/>
</bean>
<int-ftp:inbound-streaming-channel-adapter id="contextLoadsWithNoComparator"

2
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
View File

@@ -42,7 +42,7 @@
<int:channel id="ftpChannel"/>
<bean id="entryListFilter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
<constructor-arg value="org.springframework.integration.file.filters.FileListFilter" type="java.lang.Class"/>
</bean>
</beans>

6
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
View File

@@ -8,10 +8,10 @@
http://www.springframework.org/schema/integration/ftp https://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd">
<bean id="keyManager" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="javax.net.ssl.KeyManager"/>
<constructor-arg value="javax.net.ssl.KeyManager" type="java.lang.Class"/>
</bean>
<bean id="trustManager" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="javax.net.ssl.TrustManager"/>
<constructor-arg value="javax.net.ssl.TrustManager" type="java.lang.Class"/>
</bean>
<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpsSessionFactory">
@@ -44,7 +44,7 @@
<int:channel id="ftpChannel"/>
<bean id="fileNameGenerator" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.FileNameGenerator"/>
<constructor-arg value="org.springframework.integration.file.FileNameGenerator" type="java.lang.Class"/>
</bean>
</beans>