Skip to content

Commit eb570ec

Browse files
committed
More test XML configs for latest Mockito
1 parent 376d5df commit eb570ec

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests-context.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<si:channel id="requests"/>
1212

1313
<beans:bean id="validator" class="org.mockito.Mockito" factory-method="mock">
14-
<beans:constructor-arg value="org.springframework.validation.Validator"/>
14+
<beans:constructor-arg value="org.springframework.validation.Validator" type="java.lang.Class"/>
1515
</beans:bean>
1616

1717
<inbound-channel-adapter id="reactiveMinimalConfig" channel="requests" validator="validator"/>
@@ -36,15 +36,16 @@
3636
</inbound-channel-adapter>
3737

3838
<beans:bean id="headerMapper" class="org.mockito.Mockito" factory-method="mock">
39-
<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper"/>
39+
<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper" type="java.lang.Class"/>
4040
</beans:bean>
4141

4242
<beans:bean id="codecConfigurer" class="org.mockito.Mockito" factory-method="mock">
43-
<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer"/>
43+
<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer" type="java.lang.Class"/>
4444
</beans:bean>
4545

4646
<beans:bean id="requestedContentTypeResolver" class="org.mockito.Mockito" factory-method="mock">
47-
<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"/>
47+
<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"
48+
type="java.lang.Class"/>
4849
</beans:bean>
4950

5051
<beans:bean id="reactiveAdapterRegistry" class="org.springframework.core.ReactiveAdapterRegistry"/>

spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests-context.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@
3232
</inbound-gateway>
3333

3434
<beans:bean id="headerMapper" class="org.mockito.Mockito" factory-method="mock">
35-
<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper"/>
35+
<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper" type="java.lang.Class"/>
3636
</beans:bean>
3737

3838
<beans:bean id="codecConfigurer" class="org.mockito.Mockito" factory-method="mock">
39-
<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer"/>
39+
<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer" type="java.lang.Class"/>
4040
</beans:bean>
4141

4242
<beans:bean id="requestedContentTypeResolver" class="org.mockito.Mockito" factory-method="mock">
43-
<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"/>
43+
<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"
44+
type="java.lang.Class"/>
4445
</beans:bean>
4546

4647
<beans:bean id="reactiveAdapterRegistry" class="org.springframework.core.ReactiveAdapterRegistry"/>

spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
</int-websocket:server-container>
3535

3636
<bean id="handshakeHandler" class="org.mockito.Mockito" factory-method="mock">
37-
<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler" type="java.lang.Class"/>
37+
<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler" type="java.lang.Class"/>
3838
</bean>
3939

4040
<bean id="handshakeInterceptor" class="org.mockito.Mockito" factory-method="mock">
41-
<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor" type="java.lang.Class"/>
41+
<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor" type="java.lang.Class"/>
4242
</bean>
4343

4444
<bean id="sockJsMessageCodec" class="org.mockito.Mockito" factory-method="mock">
45-
<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec" type="java.lang.Class"/>
45+
<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec" type="java.lang.Class"/>
4646
</bean>
4747

4848
<bean id="decoratorFactory"
@@ -57,7 +57,7 @@
5757
use-broker="true" />
5858

5959
<bean id="webSocketClient" class="org.mockito.Mockito" factory-method="mock">
60-
<constructor-arg value="org.springframework.web.socket.client.WebSocketClient" type="java.lang.Class"/>
60+
<constructor-arg value="org.springframework.web.socket.client.WebSocketClient" type="java.lang.Class"/>
6161
</bean>
6262

6363
<int-websocket:client-container id="clientWebSocketContainer"

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests-context.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</bean>
3737

3838
<bean id="jmsConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
39-
<constructor-arg value="jakarta.jms.ConnectionFactory"/>
39+
<constructor-arg value="jakarta.jms.ConnectionFactory" type="java.lang.Class"/>
4040
</bean>
4141

4242
<!--Email Transport-->
@@ -70,7 +70,7 @@
7070
</bean>
7171

7272
<bean id="xmppConnection" class="org.mockito.Mockito" factory-method="mock">
73-
<constructor-arg value="org.jivesoftware.smack.XMPPConnection"/>
73+
<constructor-arg value="org.jivesoftware.smack.XMPPConnection" type="java.lang.Class"/>
7474
</bean>
7575

7676
</beans>

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
header-mapper="testHeaderMapper"/>
4646

4747
<bean id="marshaller" class="org.mockito.Mockito" factory-method="mock">
48-
<constructor-arg value="org.springframework.oxm.support.AbstractMarshaller" />
48+
<constructor-arg value="org.springframework.oxm.support.AbstractMarshaller" type="java.lang.Class"/>
4949
</bean>
5050

5151
<bean id="testHeaderMapper" class="org.springframework.integration.ws.config.WebServiceInboundGatewayParserTests$TestHeaderMapper"/>

0 commit comments

Comments
 (0)