More Mockito fixes for test XML configs

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

View File

@@ -28,7 +28,7 @@
<rabbit:template id="amqpTemplate" connection-factory="connectionFactory"/>
<bean id="connectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory" type="java.lang.Class"/>
</bean>
<int:channel id="toRabbit0">

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">

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">

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"

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"

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>

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"

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"

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>

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>

View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/integration/http https://www.springframework.org/schema/integration/http/spring-integration-http.xsd">
<bean id="restTemplate" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.web.client.RestTemplate"/>
<constructor-arg value="org.springframework.web.client.RestTemplate" type="java.lang.Class"/>
</bean>
<int-http:outbound-gateway url="/fake"

View File

@@ -17,6 +17,6 @@
</int-jdbc:inbound-channel-adapter>
<bean id="ops" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.jdbc.core.JdbcOperations"/>
<constructor-arg value="org.springframework.jdbc.core.JdbcOperations" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -8,7 +8,8 @@
https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
<beans:bean id="preparedStatementSetter" class="org.mockito.Mockito" factory-method="mock">
<beans:constructor-arg value="org.springframework.integration.jdbc.MessagePreparedStatementSetter"/>
<beans:constructor-arg value="org.springframework.integration.jdbc.MessagePreparedStatementSetter"
type="java.lang.Class"/>
</beans:bean>
<!-- Invalid Config

View File

@@ -60,17 +60,20 @@
<bean id="ackFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg
value="org.springframework.integration.kafka.inbound.KafkaMessageSource$KafkaAckCallbackFactory"/>
value="org.springframework.integration.kafka.inbound.KafkaMessageSource$KafkaAckCallbackFactory"
type="java.lang.Class"/>
</bean>
<int:channel id="inbound"/>
<bean id="converter" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.kafka.support.converter.RecordMessageConverter"/>
<constructor-arg value="org.springframework.kafka.support.converter.RecordMessageConverter"
type="java.lang.Class"/>
</bean>
<bean id="rebal" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.apache.kafka.clients.consumer.ConsumerRebalanceListener"/>
<constructor-arg value="org.apache.kafka.clients.consumer.ConsumerRebalanceListener"
type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -24,7 +24,7 @@
on-partitions-assigned-seek-callback="onPartitionsAssignedSeekCallback"/>
<bean id="template" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.kafka.core.KafkaTemplate"/>
<constructor-arg value="org.springframework.kafka.core.KafkaTemplate" type="java.lang.Class"/>
</bean>
<bean id="messageConverter" class="org.springframework.kafka.support.converter.MessagingMessageConverter"/>
@@ -47,7 +47,7 @@
</bean>
<bean id="onPartitionsAssignedSeekCallback" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.function.BiConsumer"/>
<constructor-arg value="java.util.function.BiConsumer" type="java.lang.Class"/>
</bean>
<bean id="ems" class="org.springframework.integration.kafka.support.RawRecordHeaderErrorMessageStrategy"/>

View File

@@ -58,11 +58,11 @@
</bean>
<bean id="onPartitionsAssignedSeekCallback" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="java.util.function.BiConsumer"/>
<constructor-arg value="java.util.function.BiConsumer" type="java.lang.Class"/>
</bean>
<bean id="recordFilterStrategy" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.kafka.listener.adapter.RecordFilterStrategy"/>
<constructor-arg value="org.springframework.kafka.listener.adapter.RecordFilterStrategy" type="java.lang.Class"/>
</bean>
<bean id="container2" class="org.springframework.kafka.listener.KafkaMessageListenerContainer">

View File

@@ -1,23 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mail="http://www.springframework.org/schema/integration/mail"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mail="http://www.springframework.org/schema/integration/mail"
xmlns:si="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/mail https://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- INT-2800 -->
<mail:inbound-channel-adapter id="pop3WithSearch" channel="testChannel" protocol="pop3" should-delete-messages="false" auto-startup="false"
search-term-strategy="searchTermStrategy"/>
<mail:inbound-channel-adapter id="pop3WithSearch" channel="testChannel" protocol="pop3"
should-delete-messages="false" auto-startup="false"
search-term-strategy="searchTermStrategy"/>
<bean id="searchTermStrategy" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.mail.SearchTermStrategy"/>
<constructor-arg value="org.springframework.integration.mail.SearchTermStrategy" type="java.lang.Class"/>
</bean>
<!-- COMMON CONFIGURATION -->

View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
<constructor-arg value="#{T(org.mockito.Answers).RETURNS_MOCKS}"/>
</bean>

View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
<constructor-arg value="#{T(org.mockito.Answers).RETURNS_MOCKS}"/>
</bean>

View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<int-mongodb:inbound-channel-adapter id="minimalConfig"

View File

@@ -10,7 +10,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<int-mongodb:inbound-channel-adapter id="minimalConfig"

View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<int-mongodb:outbound-channel-adapter id="fullConfigWithCollectionExpression"

View File

@@ -10,7 +10,7 @@
http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd">
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<int-mongodb:outbound-channel-adapter id="fullConfigWithCollectionExpression"

View File

@@ -20,7 +20,7 @@
reply-channel="out"/>
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<bean id="mongoDbTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
@@ -28,7 +28,7 @@
</bean>
<bean id="mockCollectionCallback" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.core.CollectionCallback"/>
<constructor-arg value="org.springframework.data.mongodb.core.CollectionCallback" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -19,7 +19,7 @@
reply-channel="out"/>
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<bean id="mongoDbTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">

View File

@@ -19,7 +19,7 @@
reply-channel="out"/>
<bean id="mongoDbFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory"/>
<constructor-arg value="org.springframework.data.mongodb.MongoDatabaseFactory" type="java.lang.Class"/>
</bean>
<bean id="mongoDbTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">

View File

@@ -10,7 +10,7 @@
http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd">
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
<bean id="customRedisConnectionFactory" parent="redisConnectionFactory"/>

View File

@@ -35,7 +35,7 @@
</int:channel>
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
<bean id="serializer" class="org.springframework.data.redis.serializer.StringRedisSerializer"/>

View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
<bean id="customRedisConnectionFactory" parent="redisConnectionFactory"/>

View File

@@ -40,7 +40,7 @@
</int:channel>
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
<bean id="serializer" class="org.springframework.data.redis.serializer.StringRedisSerializer"/>

View File

@@ -51,7 +51,7 @@
<bean id="hashValueSerializer" class="org.springframework.data.redis.serializer.JdkSerializationRedisSerializer"/>
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
</beans>

View File

@@ -49,7 +49,7 @@
</bean>
<bean id="redisConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory"/>
<constructor-arg value="org.springframework.data.redis.connection.RedisConnectionFactory" type="java.lang.Class"/>
</bean>
<int-redis:store-outbound-channel-adapter id="withExternalTemplate"