From c4c786596f0f78c45ff4ce61998d6ae758a3de26 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 19 Jan 2023 14:32:29 +0100 Subject: [PATCH] Migrate to Mockito.mock(T...) where feasible --- ...ansactionalAnnotationIntegrationTests.java | 2 +- .../adapter/ThrowsAdviceInterceptorTests.java | 10 +- .../CustomizableTraceInterceptorTests.java | 15 +- .../interceptor/DebugInterceptorTests.java | 10 +- .../PerformanceMonitorInterceptorTests.java | 8 +- .../SimpleTraceInterceptorTests.java | 8 +- .../aop/scope/DefaultScopedObjectTests.java | 2 +- ...elegatingIntroductionInterceptorTests.java | 28 ++-- .../DefaultListableBeanFactoryTests.java | 8 +- .../annotation/ParameterResolutionTests.java | 6 +- .../beans/factory/aot/AotServicesTests.java | 4 +- ...AutowiredMethodArgumentsResolverTests.java | 2 +- ...DefinitionMethodGeneratorFactoryTests.java | 6 +- .../aot/BeanInstanceSupplierTests.java | 6 +- .../config/CustomScopeConfigurerTests.java | 2 +- ...ObjectFactoryCreatingFactoryBeanTests.java | 2 +- .../ServiceLocatorFactoryBeanTests.java | 2 +- .../parsing/FailFastProblemReporterTests.java | 2 +- .../support/RootBeanDefinitionTests.java | 4 +- .../wiring/BeanConfigurerSupportTests.java | 11 +- .../xml/ResourceEntityResolverTests.java | 4 +- .../caffeine/CaffeineCacheManagerTests.java | 2 +- .../cache/jcache/JCacheCacheManagerTests.java | 5 +- .../AnnotationCacheOperationSourceTests.java | 2 +- .../CacheResolverAdapterTests.java | 4 +- .../interceptor/JCacheErrorHandlerTests.java | 6 +- .../scheduling/quartz/QuartzSupportTests.java | 2 +- .../cache/TestableCacheResolver.java | 2 +- .../aop/aspectj/AfterAdviceBindingTests.java | 3 +- .../AfterReturningAdviceBindingTests.java | 3 +- .../AfterThrowingAdviceBindingTests.java | 3 +- .../aop/aspectj/AroundAdviceBindingTests.java | 6 +- .../aop/aspectj/BeforeAdviceBindingTests.java | 3 +- .../MethodLocatingFactoryBeanTests.java | 10 +- .../interceptor/CacheErrorHandlerTests.java | 4 +- .../LoggingCacheErrorHandlerTests.java | 2 +- .../DeferredImportSelectorTests.java | 8 +- .../EnableLoadTimeWeavingTests.java | 6 +- ...actoryInitializationAotProcessorTests.java | 3 +- .../event/ApplicationContextEventTests.java | 10 +- ...ApplicationListenerMethodAdapterTests.java | 2 +- .../EventPublicationInterceptorTests.java | 2 +- ...enericApplicationListenerAdapterTests.java | 4 +- .../GenericApplicationContextTests.java | 6 +- .../jndi/JndiObjectFactoryBeanTests.java | 2 +- .../jndi/JndiTemplateTests.java | 14 +- .../annotation/EnableAsyncTests.java | 4 +- .../ScheduledExecutorFactoryBeanTests.java | 14 +- .../ThreadPoolExecutorFactoryBeanTests.java | 2 +- .../config/ScheduledTaskRegistrarTests.java | 8 +- .../scripting/bsh/BshScriptFactoryTests.java | 2 +- .../groovy/GroovyScriptFactoryTests.java | 6 +- .../RefreshableScriptTargetSourceTests.java | 4 +- .../support/ResourceScriptSourceTests.java | 6 +- .../ScriptFactoryPostProcessorTests.java | 3 +- .../aot/generate/GeneratedClassesTests.java | 2 +- .../aot/hint/ReflectionHintsTests.java | 2 +- .../aot/hint/ResourceHintsTests.java | 2 +- .../ReflectiveRuntimeHintsRegistrarTests.java | 2 +- .../core/ResolvableTypeTests.java | 2 +- .../annotation/AttributeMethodsTests.java | 2 +- .../MergedAnnotationsCollectionTests.java | 4 +- .../core/io/PathResourceTests.java | 2 +- .../core/io/buffer/DataBufferUtilsTests.java | 10 +- .../core/io/support/ResourceRegionTests.java | 14 +- .../support/SpringFactoriesLoaderTests.java | 6 +- .../core/log/CompositeLogTests.java | 4 +- .../util/StreamUtilsTests.java | 4 +- .../util/UnmodifiableMultiValueMapTests.java | 14 +- .../util/concurrent/FutureAdapterTests.java | 26 ++-- .../concurrent/ListenableFutureTaskTests.java | 22 +-- .../SettableListenableFutureTests.java | 4 +- .../util/xml/AbstractStaxXMLReaderTests.java | 4 +- .../util/xml/StaxEventXMLReaderTests.java | 2 +- .../util/xml/StaxStreamXMLReaderTests.java | 2 +- .../jdbc/core/AbstractRowMapperTests.java | 14 +- .../jdbc/core/JdbcTemplateQueryTests.java | 21 +-- .../jdbc/core/JdbcTemplateTests.java | 30 ++-- .../jdbc/core/RowMapperTests.java | 8 +- .../jdbc/core/SingleColumnRowMapperTests.java | 12 +- .../jdbc/core/StatementCreatorUtilsTests.java | 31 ++-- .../NamedParameterJdbcTemplateTests.java | 20 +-- .../namedparam/NamedParameterQueryTests.java | 18 +-- .../core/simple/CallMetaDataContextTests.java | 9 +- .../jdbc/core/simple/SimpleJdbcCallTests.java | 16 +-- .../core/simple/SimpleJdbcInsertTests.java | 16 +-- .../simple/TableMetaDataContextTests.java | 19 ++- .../JdbcBeanDefinitionReaderTests.java | 8 +- .../core/support/JdbcDaoSupportTests.java | 2 +- .../jdbc/core/support/LobSupportTests.java | 14 +- .../DataSourceJtaTransactionTests.java | 36 ++--- .../DataSourceTransactionManagerTests.java | 53 ++++--- .../jdbc/datasource/DataSourceUtilsTests.java | 4 +- .../datasource/DelegatingDataSourceTests.java | 8 +- .../DriverManagerDataSourceTests.java | 2 +- ...UserCredentialsDataSourceAdapterTests.java | 12 +- .../init/AbstractDatabasePopulatorTests.java | 2 +- .../init/CompositeDatabasePopulatorTests.java | 6 +- .../ResourceDatabasePopulatorUnitTests.java | 6 +- .../BeanFactoryDataSourceLookupTests.java | 4 +- .../jdbc/object/BatchSqlUpdateTests.java | 8 +- .../jdbc/object/GenericSqlQueryTests.java | 15 +- .../object/GenericStoredProcedureTests.java | 6 +- .../jdbc/object/SqlQueryTests.java | 20 +-- .../jdbc/object/SqlUpdateTests.java | 16 +-- .../jdbc/object/StoredProcedureTests.java | 24 ++-- .../DatabaseStartupValidatorTests.java | 8 +- .../jdbc/support/DefaultLobHandlerTests.java | 4 +- .../support/JdbcTransactionManagerTests.java | 51 ++++--- ...LErrorCodeSQLExceptionTranslatorTests.java | 6 +- .../support/SQLErrorCodesFactoryTests.java | 12 +- .../DataFieldMaxValueIncrementerTests.java | 8 +- .../rowset/ResultSetWrappingRowSetTests.java | 12 +- .../AbstractJmsAnnotationDrivenTests.java | 3 +- ...tenerAnnotationBeanPostProcessorTests.java | 2 +- ...tenerContainerFactoryIntegrationTests.java | 2 +- .../JmsListenerContainerFactoryTests.java | 2 +- .../jms/config/JmsListenerEndpointTests.java | 2 +- .../jms/config/JmsNamespaceHandlerTests.java | 6 +- .../MethodJmsListenerEndpointTests.java | 52 +++---- .../JmsTransactionManagerTests.java | 58 ++++---- .../SingleConnectionFactoryTests.java | 68 ++++----- .../jms/core/JmsMessagingTemplateTests.java | 18 +-- .../jms/core/JmsTemplateTests.java | 49 +++---- .../jms/core/JmsTemplateTransactedTests.java | 3 +- .../core/support/JmsGatewaySupportTests.java | 2 +- .../DefaultMessageListenerContainerTests.java | 20 +-- .../SimpleMessageListenerContainerTests.java | 76 +++++----- .../listener/adapter/JmsResponseTests.java | 8 +- .../adapter/MessageListenerAdapterTests.java | 100 ++++++------- .../MessagingMessageListenerAdapterTests.java | 92 ++++++------ .../DefaultJmsActivationSpecFactoryTests.java | 2 +- .../support/SimpleMessageConverterTests.java | 30 ++-- .../MappingJackson2MessageConverterTests.java | 28 ++-- .../MarshallingMessageConverterTests.java | 26 ++-- .../MessagingMessageConverterTests.java | 8 +- .../DynamicDestinationResolverTests.java | 8 +- .../JmsDestinationAccessorTests.java | 2 +- .../JndiDestinationResolverTests.java | 12 +- .../ProtobufMessageConverterTests.java | 3 +- .../core/CachingDestinationResolverTests.java | 2 +- .../core/GenericMessagingTemplateTests.java | 10 +- .../MessageMethodArgumentResolverTests.java | 9 +- .../InvocableHandlerMethodTests.java | 2 +- .../reactive/InvocableHandlerMethodTests.java | 2 +- .../DefaultRSocketRequesterBuilderTests.java | 5 +- .../DefaultRSocketStrategiesTests.java | 2 +- .../messaging/simp/SimpAttributesTests.java | 18 +-- .../simp/SimpMessageHeaderAccessorTests.java | 4 +- .../messaging/simp/SimpSessionScopeTests.java | 14 +- .../SendToMethodReturnValueHandlerTests.java | 2 +- ...criptionMethodReturnValueHandlerTests.java | 2 +- .../broker/BrokerMessageHandlerTests.java | 5 +- .../SimpleBrokerMessageHandlerTests.java | 2 +- .../MessageBrokerConfigurationTests.java | 10 +- .../simp/stomp/DefaultStompSessionTests.java | 26 ++-- .../StompBrokerRelayMessageHandlerTests.java | 23 +-- .../DefaultUserDestinationResolverTests.java | 10 +- .../user/MultiServerUserRegistryTests.java | 13 +- .../UserDestinationMessageHandlerTests.java | 4 +- .../user/UserRegistryMessageHandlerTests.java | 56 +++----- .../support/ChannelInterceptorTests.java | 2 +- .../ExecutorSubscribableChannelTests.java | 6 +- ...AbstractEntityManagerFactoryBeanTests.java | 4 +- .../orm/jpa/DefaultJpaDialectTests.java | 4 +- .../jpa/EntityManagerFactoryUtilsTests.java | 6 +- .../orm/jpa/JpaTransactionManagerTests.java | 21 +-- ...ontainerEntityManagerFactoryBeanTests.java | 18 +-- .../jpa/SharedEntityManagerCreatorTests.java | 48 +++---- ...ypesBeanRegistrationAotProcessorTests.java | 2 +- .../support/OpenEntityManagerInViewTests.java | 37 ++--- ...BeanPostProcessorAotContributionTests.java | 12 +- .../PersistenceContextTransactionTests.java | 56 ++++---- .../support/PersistenceInjectionTests.java | 50 +++---- .../SharedEntityManagerFactoryTests.java | 4 +- .../oxm/jaxb/Jaxb2MarshallerTests.java | 8 +- .../oxm/jaxb/Jaxb2UnmarshallerTests.java | 2 +- .../oxm/xstream/XStreamMarshallerTests.java | 2 +- .../DelegatingConnectionFactoryUnitTests.java | 4 +- .../R2dbcTransactionManagerUnitTests.java | 6 +- .../SingleConnectionFactoryUnitTests.java | 10 +- ...nAwareConnectionFactoryProxyUnitTests.java | 8 +- .../init/CompositeDatabasePopulatorTests.java | 6 +- ...ConnectionFactoryInitializerUnitTests.java | 2 +- .../ResourceDatabasePopulatorUnitTests.java | 6 +- ...ctoryConnectionFactoryLookupUnitTests.java | 2 +- .../core/DefaultDatabaseClientUnitTests.java | 8 +- .../core/NamedParameterUtilsUnitTests.java | 2 +- .../AnonymousBindMarkersUnitTests.java | 2 +- .../r2dbc/core/binding/BindingsUnitTests.java | 2 +- .../binding/IndexedBindMarkersUnitTests.java | 6 +- .../binding/NamedBindMarkersUnitTests.java | 4 +- .../mock/web/MockFilterChainTests.java | 28 ++-- .../test/context/BootstrapUtilsTests.java | 2 +- .../MergedContextConfigurationTests.java | 6 +- .../AotMergedContextConfigurationTests.java | 2 +- .../context/cache/LruContextCacheTests.java | 8 +- ...TestExecutionListenerIntegrationTests.java | 2 +- .../SqlScriptsTestExecutionListenerTests.java | 16 +-- .../jupiter/DisabledIfConditionTests.java | 4 +- .../statements/SpringFailOnTimeoutTests.java | 2 +- ...bstractContextConfigurationUtilsTests.java | 5 +- ...tiesContextTestExecutionListenerTests.java | 2 +- ...namicPropertiesContextCustomizerTests.java | 9 +- .../support/TestPropertySourceUtilsTests.java | 6 +- ...ansactionalTestExecutionListenerTests.java | 4 +- .../ServletTestExecutionListenerTests.java | 7 +- .../response/DefaultResponseCreatorTests.java | 2 +- .../ExecutingResponseCreatorTests.java | 2 +- .../reactive/server/CookieAssertionTests.java | 2 +- .../reactive/server/HeaderAssertionTests.java | 2 +- .../reactive/server/StatusAssertionTests.java | 2 +- .../MockMvcConnectionBuilderSupportTests.java | 13 +- .../result/PrintingResultHandlerTests.java | 5 +- .../AsyncControllerJavaConfigTests.java | 3 +- .../client/context/JavaConfigTests.java | 4 +- .../standalone/FrameworkExtensionTests.java | 2 +- .../AsyncControllerJavaConfigTests.java | 3 +- .../samples/context/JavaConfigTests.java | 4 +- .../standalone/FrameworkExtensionTests.java | 2 +- ...eExceptionTranslationInterceptorTests.java | 2 +- .../LocalConnectionFactoryBeanTests.java | 6 +- .../JndiJtaTransactionManagerTests.java | 12 +- .../JtaTransactionManagerTests.java | 134 +++++++++--------- ...tionBeanRegistrationAotProcessorTests.java | 7 +- ...bstractReactiveTransactionAspectTests.java | 24 ++-- .../AbstractTransactionAspectTests.java | 38 ++--- .../BeanFactoryTransactionTests.java | 4 +- .../TransactionInterceptorTests.java | 26 ++-- ...aTransactionManagerSerializationTests.java | 6 +- .../springframework/http/HttpRangeTests.java | 6 +- .../SimpleClientHttpRequestFactoryTests.java | 2 +- .../client/SimpleClientHttpResponseTests.java | 4 +- ...ientRequestObservationConventionTests.java | 2 +- .../reactive/ReactorResourceFactoryTests.java | 4 +- .../MultipartHttpMessageWriterTests.java | 2 +- .../multipart/PartHttpMessageWriterTests.java | 4 +- .../codec/support/CodecConfigurerTests.java | 32 ++--- .../ResourceHttpMessageConverterTests.java | 10 +- ...sourceRegionHttpMessageConverterTests.java | 4 +- .../ProtobufHttpMessageConverterTests.java | 37 ++--- .../MarshallingHttpMessageConverterTests.java | 16 +-- .../reactive/ListenerReadPublisherTests.java | 2 +- .../reactive/ListenerWriteProcessorTests.java | 8 +- .../reactive/ServerHttpRequestTests.java | 2 +- ...ltResponseErrorHandlerHttpStatusTests.java | 2 +- .../DefaultResponseErrorHandlerTests.java | 2 +- .../ExtractingResponseErrorHandlerTests.java | 2 +- .../HttpMessageConverterExtractorTests.java | 6 +- .../IntrospectingClientHttpResponseTests.java | 2 +- .../client/RestTemplateObservationTests.java | 10 +- .../web/client/RestTemplateTests.java | 16 +-- .../ServletRequestAttributesTests.java | 12 +- .../request/async/DeferredResultTests.java | 12 +- .../StandardServletAsyncWebRequestTests.java | 10 +- .../async/WebAsyncManagerErrorTests.java | 10 +- .../request/async/WebAsyncManagerTests.java | 75 +++++----- .../async/WebAsyncManagerTimeoutTests.java | 14 +- .../support/ServletContextResourceTests.java | 2 +- .../filter/CharacterEncodingFilterTests.java | 28 ++-- .../filter/ForwardedHeaderFilterTests.java | 2 +- .../filter/RelativeRedirectFilterTests.java | 3 +- .../web/method/ControllerAdviceBeanTests.java | 4 +- .../ModelAttributeMethodProcessorTests.java | 16 +-- .../method/annotation/ModelFactoryTests.java | 8 +- ...questParamMethodArgumentResolverTests.java | 4 +- .../WebArgumentResolverAdapterTests.java | 34 +++-- ...ethodReturnValueHandlerCompositeTests.java | 30 ++-- .../ByteArrayMultipartFileEditorTests.java | 4 +- ...angeBeanRegistrationAotProcessorTests.java | 3 +- .../web/reactive/DispatcherHandlerTests.java | 4 +- .../DelegatingWebFluxConfigurationTests.java | 2 +- .../config/ResourceHandlerRegistryTests.java | 15 +- .../WebFluxConfigurationSupportTests.java | 2 +- .../DefaultClientRequestBuilderTests.java | 10 +- .../client/DefaultClientResponseTests.java | 9 +- .../client/DefaultWebClientTests.java | 8 +- .../client/ExchangeFilterFunctionsTests.java | 16 +-- .../client/WebClientObservationTests.java | 6 +- .../support/ClientResponseWrapperTests.java | 6 +- .../server/DefaultRenderingResponseTests.java | 18 +-- .../function/server/HeadersWrapperTests.java | 30 ++-- .../function/server/RouterFunctionsTests.java | 8 +- .../support/ServerRequestWrapperTests.java | 40 +++--- .../CachingResourceResolverTests.java | 8 +- .../CssLinkResourceTransformerTests.java | 12 +- .../resource/ResourceWebHandlerTests.java | 4 +- .../VersionResourceResolverTests.java | 51 +++---- .../WebJarsResourceResolverTests.java | 47 ++---- .../method/InvocableHandlerMethodTests.java | 2 +- .../annotation/ControllerAdviceTests.java | 2 +- .../annotation/ModelInitializerTests.java | 2 +- .../RequestMappingHandlerMappingTests.java | 26 ++-- ...nAttributeMethodArgumentResolverTests.java | 33 ++--- ...WebSessionMethodArgumentResolverTests.java | 2 +- .../ViewResolutionResultHandlerTests.java | 20 +-- .../view/script/JRubyScriptTemplateTests.java | 27 ++-- .../HandshakeWebSocketServiceTests.java | 6 +- ...WebSocketUpgradeHandlerPredicateTests.java | 2 +- .../servlet/HandlerExecutionChainTests.java | 52 +++---- .../DelegatingWebMvcConfigurationTests.java | 10 +- .../annotation/InterceptorRegistryTests.java | 4 +- .../ResourceHandlerRegistryTests.java | 14 +- ...MvcConfigurationSupportExtensionTests.java | 2 +- .../function/RouterFunctionsTests.java | 8 +- .../servlet/handler/HandlerMappingTests.java | 5 +- .../handler/MappedInterceptorTests.java | 16 +-- .../web/servlet/mvc/ControllerTests.java | 8 +- ...equestAttributesArgumentResolverTests.java | 2 +- .../HttpEntityMethodProcessorMockTests.java | 121 ++++++++-------- .../RequestMappingHandlerMappingTests.java | 2 +- ...equestPartMethodArgumentResolverTests.java | 76 +++++----- .../RequestResponseBodyAdviceChainTests.java | 51 +++---- ...tResponseBodyMethodProcessorMockTests.java | 78 +++++----- ...nseBodyEmitterReturnValueHandlerTests.java | 77 ++++------ .../annotation/ResponseBodyEmitterTests.java | 8 +- ...letRequestMethodArgumentResolverTests.java | 4 +- .../CachingResourceResolverTests.java | 8 +- .../CssLinkResourceTransformerTests.java | 12 +- .../ResourceHttpRequestHandlerTests.java | 4 +- .../resource/ResourceUrlProviderTests.java | 2 +- .../VersionResourceResolverTests.java | 49 +++---- .../WebJarsResourceResolverTests.java | 46 +++--- .../form/AbstractHtmlElementTagTests.java | 2 +- .../web/servlet/view/BaseViewTests.java | 10 +- .../ContentNegotiatingViewResolverTests.java | 36 ++--- .../view/InternalResourceViewTests.java | 2 +- .../web/servlet/view/RedirectViewTests.java | 4 +- .../view/freemarker/FreeMarkerViewTests.java | 6 +- .../view/groovy/GroovyMarkupViewTests.java | 56 ++++---- .../view/script/JRubyScriptTemplateTests.java | 37 +++-- .../script/JythonScriptTemplateTests.java | 35 +++-- .../script/KotlinScriptTemplateTests.java | 31 ++-- .../view/xml/MarshallingViewTests.java | 36 ++--- .../JettyWebSocketHandlerAdapterTests.java | 32 ++--- .../jetty/JettyWebSocketSessionTests.java | 32 ++--- .../StandardWebSocketHandlerAdapterTests.java | 27 ++-- .../StandardWebSocketSessionTests.java | 22 +-- .../StandardWebSocketClientTests.java | 2 +- .../WebSocketMessageBrokerStatsTests.java | 4 +- .../WebMvcStompEndpointRegistryTests.java | 8 +- ...ompWebSocketEndpointRegistrationTests.java | 10 +- .../WebSocketHandlerRegistrationTests.java | 2 +- ...essageBrokerConfigurationSupportTests.java | 3 +- ...ceptionWebSocketHandlerDecoratorTests.java | 31 ++-- .../socket/handler/TestWebSocketSession.java | 4 + .../StompSubProtocolHandlerTests.java | 31 ++-- ...etAnnotationMethodMessageHandlerTests.java | 5 +- .../messaging/WebSocketStompClientTests.java | 77 +++++----- .../server/DefaultHandshakeHandlerTests.java | 2 +- .../standard/ServerEndpointExporterTests.java | 33 ++--- .../HandshakeInterceptorChainTests.java | 44 ++---- .../HttpSessionHandshakeInterceptorTests.java | 2 +- .../OriginHandshakeInterceptorTests.java | 2 +- .../support/WebSocketHandlerMappingTests.java | 6 +- .../WebSocketHttpRequestHandlerTests.java | 12 +- .../client/ClientSockJsSessionTests.java | 23 ++- .../client/DefaultTransportRequestTests.java | 30 ++-- .../client/RestTemplateXhrTransportTests.java | 6 +- .../sockjs/client/SockJsClientTests.java | 9 +- .../socket/sockjs/client/TestTransport.java | 2 +- .../sockjs/client/XhrTransportTests.java | 4 +- .../sockjs/support/SockJsServiceTests.java | 4 +- .../handler/DefaultSockJsServiceTests.java | 38 ++--- .../HttpReceivingTransportHandlerTests.java | 8 +- .../HttpSendingTransportHandlerTests.java | 12 +- .../handler/SockJsWebSocketHandlerTests.java | 6 +- .../session/AbstractSockJsSessionTests.java | 4 +- .../transport/session/SockJsSessionTests.java | 2 +- 369 files changed, 2267 insertions(+), 2707 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java index 9062d6e3f6..75abe441c7 100644 --- a/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java @@ -151,7 +151,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests { @Bean PersistenceExceptionTranslator peTranslator() { - return mock(PersistenceExceptionTranslator.class); + return mock(); } @Bean diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index 40b038b457..9ce7f9c99c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -50,7 +50,7 @@ public class ThrowsAdviceInterceptorTests { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); Object ret = new Object(); - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.proceed()).willReturn(ret); assertThat(ti.invoke(mi)).isEqualTo(ret); assertThat(th.getCalls()).isEqualTo(0); @@ -62,7 +62,7 @@ public class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); assertThat(ti.getHandlerMethodCount()).isEqualTo(2); Exception ex = new Exception(); - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.proceed()).willThrow(ex); assertThatException().isThrownBy(() -> ti.invoke(mi)).isSameAs(ex); assertThat(th.getCalls()).isEqualTo(0); @@ -73,7 +73,7 @@ public class ThrowsAdviceInterceptorTests { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); FileNotFoundException ex = new FileNotFoundException(); - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(Object.class.getMethod("hashCode")); given(mi.getThis()).willReturn(new Object()); given(mi.proceed()).willThrow(ex); @@ -90,7 +90,7 @@ public class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); // Extends RemoteException ConnectException ex = new ConnectException(""); - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.proceed()).willThrow(ex); assertThatExceptionOfType(ConnectException.class).isThrownBy(() -> ti.invoke(mi)) @@ -115,7 +115,7 @@ public class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); // Extends RemoteException ConnectException ex = new ConnectException(""); - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.proceed()).willThrow(ex); assertThatExceptionOfType(Throwable.class).isThrownBy(() -> ti.invoke(mi)) diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java index ebf44f27fc..003e57f405 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java @@ -94,12 +94,11 @@ public class CustomizableTraceInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { - - MethodInvocation methodInvocation = mock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(); given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString")); given(methodInvocation.getThis()).willReturn(this); - Log log = mock(Log.class); + Log log = mock(); given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); @@ -110,15 +109,14 @@ public class CustomizableTraceInterceptorTests { @Test public void testExceptionPathLogsCorrectly() throws Throwable { - - MethodInvocation methodInvocation = mock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(); IllegalArgumentException exception = new IllegalArgumentException(); given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString")); given(methodInvocation.getThis()).willReturn(this); given(methodInvocation.proceed()).willThrow(exception); - Log log = mock(Log.class); + Log log = mock(); given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); @@ -131,15 +129,14 @@ public class CustomizableTraceInterceptorTests { @Test public void testSunnyDayPathLogsCorrectlyWithPrettyMuchAllPlaceholdersMatching() throws Throwable { - - MethodInvocation methodInvocation = mock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(); given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); given(methodInvocation.getThis()).willReturn(this); given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", 2L}); given(methodInvocation.proceed()).willReturn("Hello!"); - Log log = mock(Log.class); + Log log = mock(); given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java index 427b9cbf84..83ee064518 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java @@ -39,10 +39,9 @@ public class DebugInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { + MethodInvocation methodInvocation = mock(); - MethodInvocation methodInvocation = mock(MethodInvocation.class); - - Log log = mock(Log.class); + Log log = mock(); given(log.isTraceEnabled()).willReturn(true); DebugInterceptor interceptor = new StubDebugInterceptor(log); @@ -54,13 +53,12 @@ public class DebugInterceptorTests { @Test public void testExceptionPathStillLogsCorrectly() throws Throwable { - - MethodInvocation methodInvocation = mock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(); IllegalArgumentException exception = new IllegalArgumentException(); given(methodInvocation.proceed()).willThrow(exception); - Log log = mock(Log.class); + Log log = mock(); given(log.isTraceEnabled()).willReturn(true); DebugInterceptor interceptor = new StubDebugInterceptor(log); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java index c4c4f94737..ef9f3b3ef4 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java @@ -50,10 +50,10 @@ public class PerformanceMonitorInterceptorTests { @Test public void testSunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable { - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); - Log log = mock(Log.class); + Log log = mock(); PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true); interceptor.invokeUnderTrace(mi, log); @@ -63,11 +63,11 @@ public class PerformanceMonitorInterceptorTests { @Test public void testExceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable { - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); given(mi.proceed()).willThrow(new IllegalArgumentException()); - Log log = mock(Log.class); + Log log = mock(); PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true); assertThatIllegalArgumentException().isThrownBy(() -> diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java index f076e3136a..3336055a07 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java @@ -38,11 +38,11 @@ public class SimpleTraceInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); given(mi.getThis()).willReturn(this); - Log log = mock(Log.class); + Log log = mock(); SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true); interceptor.invokeUnderTrace(mi, log); @@ -52,13 +52,13 @@ public class SimpleTraceInterceptorTests { @Test public void testExceptionPathStillLogsCorrectly() throws Throwable { - MethodInvocation mi = mock(MethodInvocation.class); + MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); given(mi.getThis()).willReturn(this); IllegalArgumentException exception = new IllegalArgumentException(); given(mi.proceed()).willThrow(exception); - Log log = mock(Log.class); + Log log = mock(); final SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true); assertThatIllegalArgumentException().isThrownBy(() -> diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java index 296da8b659..7138fe8896 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java @@ -59,7 +59,7 @@ public class DefaultScopedObjectTests { } private static void testBadTargetBeanName(final String badTargetBeanName) { - ConfigurableBeanFactory factory = mock(ConfigurableBeanFactory.class); + ConfigurableBeanFactory factory = mock(); new DefaultScopedObject(factory, badTargetBeanName); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index b5100f719f..49e798c59f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -44,22 +44,22 @@ import static org.mockito.Mockito.mock; * @author Chris Beams * @since 13.05.2003 */ -public class DelegatingIntroductionInterceptorTests { +class DelegatingIntroductionInterceptorTests { @Test - public void testNullTarget() throws Exception { + void testNullTarget() throws Exception { // Shouldn't accept null target assertThatIllegalArgumentException().isThrownBy(() -> new DelegatingIntroductionInterceptor(null)); } @Test - public void testIntroductionInterceptorWithDelegation() throws Exception { + void testIntroductionInterceptorWithDelegation() throws Exception { TestBean raw = new TestBean(); assertThat(! (raw instanceof TimeStamped)).isTrue(); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = mock(TimeStamped.class); + TimeStamped ts = mock(); long timestamp = 111L; given(ts.getTimeStamp()).willReturn(timestamp); @@ -70,12 +70,12 @@ public class DelegatingIntroductionInterceptorTests { } @Test - public void testIntroductionInterceptorWithInterfaceHierarchy() throws Exception { + void testIntroductionInterceptorWithInterfaceHierarchy() throws Exception { TestBean raw = new TestBean(); assertThat(! (raw instanceof SubTimeStamped)).isTrue(); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = mock(SubTimeStamped.class); + SubTimeStamped ts = mock(); long timestamp = 111L; given(ts.getTimeStamp()).willReturn(timestamp); @@ -86,12 +86,12 @@ public class DelegatingIntroductionInterceptorTests { } @Test - public void testIntroductionInterceptorWithSuperInterface() throws Exception { + void testIntroductionInterceptorWithSuperInterface() throws Exception { TestBean raw = new TestBean(); assertThat(! (raw instanceof TimeStamped)).isTrue(); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = mock(SubTimeStamped.class); + SubTimeStamped ts = mock(); long timestamp = 111L; given(ts.getTimeStamp()).willReturn(timestamp); @@ -103,7 +103,7 @@ public class DelegatingIntroductionInterceptorTests { } @Test - public void testAutomaticInterfaceRecognitionInDelegate() throws Exception { + void testAutomaticInterfaceRecognitionInDelegate() throws Exception { final long t = 1001L; class Tester implements TimeStamped, ITester { @Override @@ -133,7 +133,7 @@ public class DelegatingIntroductionInterceptorTests { @Test - public void testAutomaticInterfaceRecognitionInSubclass() throws Exception { + void testAutomaticInterfaceRecognitionInSubclass() throws Exception { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester { @@ -179,7 +179,7 @@ public class DelegatingIntroductionInterceptorTests { @SuppressWarnings("serial") @Test - public void testIntroductionInterceptorDoesntReplaceToString() throws Exception { + void testIntroductionInterceptorDoesntReplaceToString() throws Exception { TestBean raw = new TestBean(); assertThat(! (raw instanceof TimeStamped)).isTrue(); ProxyFactory factory = new ProxyFactory(raw); @@ -200,7 +200,7 @@ public class DelegatingIntroductionInterceptorTests { } @Test - public void testDelegateReturnsThisIsMassagedToReturnProxy() { + void testDelegateReturnsThisIsMassagedToReturnProxy() { NestedTestBean target = new NestedTestBean(); String company = "Interface21"; target.setCompany(company); @@ -221,7 +221,7 @@ public class DelegatingIntroductionInterceptorTests { } @Test - public void testSerializableDelegatingIntroductionInterceptorSerializable() throws Exception { + void testSerializableDelegatingIntroductionInterceptorSerializable() throws Exception { SerializablePerson serializableTarget = new SerializablePerson(); String name = "Tony"; serializableTarget.setName("Tony"); @@ -246,7 +246,7 @@ public class DelegatingIntroductionInterceptorTests { // Test when target implements the interface: should get interceptor by preference. @Test - public void testIntroductionMasksTargetImplementation() throws Exception { + void testIntroductionMasksTargetImplementation() throws Exception { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index affdb618a6..f06f75360b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -1255,7 +1255,7 @@ class DefaultListableBeanFactoryTests { @Test void expressionInStringArray() { - BeanExpressionResolver beanExpressionResolver = mock(BeanExpressionResolver.class); + BeanExpressionResolver beanExpressionResolver = mock(); given(beanExpressionResolver.evaluate(eq("#{foo}"), any(BeanExpressionContext.class))) .willReturn("classpath:/org/springframework/beans/factory/xml/util.properties"); lbf.setBeanExpressionResolver(beanExpressionResolver); @@ -2618,9 +2618,9 @@ class DefaultListableBeanFactoryTests { @Test void resolveEmbeddedValue() { - StringValueResolver r1 = mock(StringValueResolver.class); - StringValueResolver r2 = mock(StringValueResolver.class); - StringValueResolver r3 = mock(StringValueResolver.class); + StringValueResolver r1 = mock(); + StringValueResolver r2 = mock(); + StringValueResolver r3 = mock(); lbf.addEmbeddedValueResolver(r1); lbf.addEmbeddedValueResolver(r2); lbf.addEmbeddedValueResolver(r3); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java index 9710d29c38..df7d31f6e7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java @@ -93,8 +93,8 @@ public class ParameterResolutionTests { @Test public void resolveDependencyPreconditionsForParameter() { - assertThatIllegalArgumentException().isThrownBy(() -> - ParameterResolutionDelegate.resolveDependency(null, 0, null, mock(AutowireCapableBeanFactory.class))) + assertThatIllegalArgumentException() + .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock())) .withMessageContaining("Parameter must not be null"); } @@ -121,7 +121,7 @@ public class ParameterResolutionTests { public void resolveDependencyForAnnotatedParametersInTopLevelClassConstructor() throws Exception { Constructor constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class); - AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class); + AutowireCapableBeanFactory beanFactory = mock(); // Configure the mocked BeanFactory to return the DependencyDescriptor for convenience and // to avoid using an ArgumentCaptor. given(beanFactory.resolveDependency(any(), isNull())).willAnswer(invocation -> invocation.getArgument(0)); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java index a4ddb202a5..7703d859ba 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java @@ -175,14 +175,14 @@ class AotServicesTests { AotServices loaded = AotServices.factoriesAndBeans(loader, beanFactory).load(TestService.class); assertThat(loaded.getSource(loaded.asList().get(0))).isEqualTo(Source.SPRING_FACTORIES_LOADER); assertThat(loaded.getSource(loaded.asList().get(1))).isEqualTo(Source.BEAN_FACTORY); - TestService missing = mock(TestService.class); + TestService missing = mock(); assertThatIllegalStateException().isThrownBy(()->loaded.getSource(missing)); } @Test void getSourceWhenMissingThrowsException() { AotServices loaded = AotServices.factories().load(TestService.class); - TestService missing = mock(TestService.class); + TestService missing = mock(); assertThatIllegalStateException().isThrownBy(()->loaded.getSource(missing)); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java index 857592f432..ead5fadf59 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java @@ -115,7 +115,7 @@ class AutowiredMethodArgumentsResolverTests { @Test void resolveRequiredWithMultipleDependenciesReturnsValue() { - Environment environment = mock(Environment.class); + Environment environment = mock(); this.beanFactory.registerSingleton("test", "testValue"); this.beanFactory.registerSingleton("environment", environment); RegisteredBean registeredBean = registerTestBean(this.beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java index 82e4a1184d..33be8083bf 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java @@ -110,13 +110,11 @@ class BeanDefinitionMethodGeneratorFactoryTests { @Test void getBeanDefinitionMethodGeneratorAddsContributionsFromProcessors() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - BeanRegistrationAotContribution beanContribution = mock( - BeanRegistrationAotContribution.class); + BeanRegistrationAotContribution beanContribution = mock(); BeanRegistrationAotProcessor processorBean = registeredBean -> beanContribution; beanFactory.registerSingleton("processorBean", processorBean); MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader(); - BeanRegistrationAotContribution loaderContribution = mock( - BeanRegistrationAotContribution.class); + BeanRegistrationAotContribution loaderContribution = mock(); BeanRegistrationAotProcessor loaderProcessor = registeredBean -> loaderContribution; springFactoriesLoader.addInstance(BeanRegistrationAotProcessor.class, loaderProcessor); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java index 85553b92cd..d998b0a40c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java @@ -425,7 +425,7 @@ class BeanInstanceSupplierTests { @ParameterizedResolverTest(Sources.MULTI_ARGS) void resolveArgumentsWithMultiArgsConstructor(Source source) { ResourceLoader resourceLoader = new DefaultResourceLoader(); - Environment environment = mock(Environment.class); + Environment environment = mock(); this.beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader); this.beanFactory.registerSingleton("environment", environment); @@ -442,7 +442,7 @@ class BeanInstanceSupplierTests { @ParameterizedResolverTest(Sources.MIXED_ARGS) void resolveArgumentsWithMixedArgsConstructorWithUserValue(Source source) { ResourceLoader resourceLoader = new DefaultResourceLoader(); - Environment environment = mock(Environment.class); + Environment environment = mock(); this.beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader); this.beanFactory.registerSingleton("environment", environment); @@ -463,7 +463,7 @@ class BeanInstanceSupplierTests { @ParameterizedResolverTest(Sources.MIXED_ARGS) void resolveArgumentsWithMixedArgsConstructorWithUserBeanReference(Source source) { ResourceLoader resourceLoader = new DefaultResourceLoader(); - Environment environment = mock(Environment.class); + Environment environment = mock(); this.beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader); this.beanFactory.registerSingleton("environment", environment); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java index c302652496..03d3e83d26 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java @@ -50,7 +50,7 @@ public class CustomScopeConfigurerTests { @Test public void testSunnyDayWithBonaFideScopeInstance() { - Scope scope = mock(Scope.class); + Scope scope = mock(); factory.registerScope(FOO_SCOPE, scope); Map scopes = new HashMap<>(); scopes.put(FOO_SCOPE, scope); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java index d55d48bb64..b2a24b997d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java @@ -109,7 +109,7 @@ public class ObjectFactoryCreatingFactoryBeanTests { final String targetBeanName = "singleton"; final String expectedSingleton = "Alicia Keys"; - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); given(beanFactory.getBean(targetBeanName)).willReturn(expectedSingleton); ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 5390acad40..822b4072bd 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -252,7 +252,7 @@ public class ServiceLocatorFactoryBeanTests { @Test public void testRequiresListableBeanFactoryAndChokesOnAnythingElse() throws Exception { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); try { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); factory.setBeanFactory(beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java index fdd7faed0e..27ab3b7fe7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java @@ -47,7 +47,7 @@ public class FailFastProblemReporterTests { Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")), null, new IllegalArgumentException()); - Log log = mock(Log.class); + Log log = mock(); FailFastProblemReporter reporter = new FailFastProblemReporter(); reporter.setLogger(log); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/RootBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/RootBeanDefinitionTests.java index ff39d5faeb..89d3b41678 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/RootBeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/RootBeanDefinitionTests.java @@ -36,7 +36,7 @@ class RootBeanDefinitionTests { @Test void setInstanceSetResolvedFactoryMethod() { - InstanceSupplier instanceSupplier = mock(InstanceSupplier.class); + InstanceSupplier instanceSupplier = mock(); Method method = ReflectionUtils.findMethod(String.class, "toString"); given(instanceSupplier.getFactoryMethod()).willReturn(method); RootBeanDefinition beanDefinition = new RootBeanDefinition(String.class); @@ -47,7 +47,7 @@ class RootBeanDefinitionTests { @Test void setInstanceDoesNotOverrideResolvedFactoryMethodWithNull() { - InstanceSupplier instanceSupplier = mock(InstanceSupplier.class); + InstanceSupplier instanceSupplier = mock(); given(instanceSupplier.getFactoryMethod()).willReturn(null); Method method = ReflectionUtils.findMethod(String.class, "toString"); RootBeanDefinition beanDefinition = new RootBeanDefinition(String.class); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java index 8ff2952fb1..da60daea42 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java @@ -18,7 +18,6 @@ package org.springframework.beans.factory.wiring; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.testfixture.beans.TestBean; @@ -37,16 +36,16 @@ import static org.mockito.Mockito.verify; public class BeanConfigurerSupportTests { @Test - public void supplyIncompatibleBeanFactoryImplementation() throws Exception { + public void supplyIncompatibleBeanFactoryImplementation() { assertThatIllegalArgumentException().isThrownBy(() -> - new StubBeanConfigurerSupport().setBeanFactory(mock(BeanFactory.class))); + new StubBeanConfigurerSupport().setBeanFactory(mock())); } @Test public void configureBeanDoesNothingIfBeanWiringInfoResolverResolvesToNull() throws Exception { TestBean beanInstance = new TestBean(); - BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); + BeanWiringInfoResolver resolver = mock(); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); configurer.setBeanWiringInfoResolver(resolver); @@ -90,7 +89,7 @@ public class BeanConfigurerSupportTests { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition("spouse", builder.getBeanDefinition()); - BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); + BeanWiringInfoResolver resolver = mock(); given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false)); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); @@ -110,7 +109,7 @@ public class BeanConfigurerSupportTests { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition("Mmm, I fancy a salad!", builder.getBeanDefinition()); - BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); + BeanWiringInfoResolver resolver = mock(); given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false)); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ResourceEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ResourceEntityResolverTests.java index 68662e6c48..3566347d7e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ResourceEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ResourceEntityResolverTests.java @@ -18,7 +18,6 @@ package org.springframework.beans.factory.xml; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.mockito.Mockito; import org.xml.sax.InputSource; import org.springframework.core.io.Resource; @@ -27,6 +26,7 @@ import org.springframework.lang.Nullable; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; /** * Unit tests for ResourceEntityResolver. @@ -68,7 +68,7 @@ class ResourceEntityResolverTests { @ParameterizedTest @ValueSource(strings = { "https://example.org/schema.dtd", "https://example.org/schema.xsd" }) void resolveEntityCallsFallbackThatReturnsInputSource(String systemId) throws Exception { - InputSource expected = Mockito.mock(InputSource.class); + InputSource expected = mock(); ConfigurableFallbackEntityResolver resolver = new ConfigurableFallbackEntityResolver(expected); assertThat(resolver.resolveEntity("testPublicId", systemId)).isSameAs(expected); diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java index f8c0de21f2..937ce4798a 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java @@ -156,7 +156,7 @@ public class CaffeineCacheManagerTests { Cache cache1 = cm.getCache("c1"); @SuppressWarnings("unchecked") - CacheLoader loader = mock(CacheLoader.class); + CacheLoader loader = mock(); cm.setCacheLoader(loader); Cache cache1x = cm.getCache("c1"); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java index 1184942736..e8a916572e 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java @@ -86,11 +86,10 @@ public class JCacheCacheManagerTests extends AbstractTransactionSupportingCacheM private final List cacheNames; - private final CacheManager cacheManager; + private final CacheManager cacheManager = mock(); private CacheManagerMock() { this.cacheNames = new ArrayList<>(); - this.cacheManager = mock(CacheManager.class); given(cacheManager.getCacheNames()).willReturn(cacheNames); } @@ -101,7 +100,7 @@ public class JCacheCacheManagerTests extends AbstractTransactionSupportingCacheM @SuppressWarnings({ "unchecked", "rawtypes" }) public void addCache(String name) { cacheNames.add(name); - Cache cache = mock(Cache.class); + Cache cache = mock(); given(cache.getName()).willReturn(name); given(cacheManager.getCache(name)).willReturn(cache); } diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java index 693db9b13c..0463aefd43 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java @@ -114,7 +114,7 @@ public class AnnotationCacheOperationSourceTests extends AbstractJCacheTests { @Test public void defaultCacheNameWithDefaults() { Method method = ReflectionUtils.findMethod(Object.class, "toString"); - CacheDefaults mock = mock(CacheDefaults.class); + CacheDefaults mock = mock(); given(mock.cacheName()).willReturn(""); assertThat(source.determineCacheName(method, mock, "")).isEqualTo("java.lang.Object.toString()"); } diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java index 8a5ad47f30..f83aceea8a 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java @@ -61,13 +61,13 @@ public class CacheResolverAdapterTests extends AbstractJCacheTests { @SuppressWarnings({ "rawtypes", "unchecked" }) protected CacheResolver getCacheResolver(CacheInvocationContext context, String cacheName) { - CacheResolver cacheResolver = mock(CacheResolver.class); + CacheResolver cacheResolver = mock(); javax.cache.Cache cache; if (cacheName == null) { cache = null; } else { - cache = mock(javax.cache.Cache.class); + cache = mock(); given(cache.getName()).willReturn(cacheName); } given(cacheResolver.resolveCache(context)).willReturn(cache); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java index 561c0af54d..0b54a11a2f 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java @@ -154,7 +154,7 @@ public class JCacheErrorHandlerTests { @Bean @Override public CacheErrorHandler errorHandler() { - return mock(CacheErrorHandler.class); + return mock(); } @Bean @@ -164,14 +164,14 @@ public class JCacheErrorHandlerTests { @Bean public Cache mockCache() { - Cache cache = mock(Cache.class); + Cache cache = mock(); given(cache.getName()).willReturn("test"); return cache; } @Bean public Cache mockErrorCache() { - Cache cache = mock(Cache.class); + Cache cache = mock(); given(cache.getName()).willReturn("error"); return cache; } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 9d461d2e40..5cc54a6941 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -68,7 +68,7 @@ class QuartzSupportTests { TestBean tb = new TestBean("tb", 99); StaticApplicationContext ac = new StaticApplicationContext(); - final Scheduler scheduler = mock(Scheduler.class); + final Scheduler scheduler = mock(); SchedulerContext schedulerContext = new SchedulerContext(); given(scheduler.getContext()).willReturn(schedulerContext); diff --git a/spring-context-support/src/testFixtures/java/org/springframework/contextsupport/testfixture/cache/TestableCacheResolver.java b/spring-context-support/src/testFixtures/java/org/springframework/contextsupport/testfixture/cache/TestableCacheResolver.java index 04567b1a84..54623021e9 100644 --- a/spring-context-support/src/testFixtures/java/org/springframework/contextsupport/testfixture/cache/TestableCacheResolver.java +++ b/spring-context-support/src/testFixtures/java/org/springframework/contextsupport/testfixture/cache/TestableCacheResolver.java @@ -34,7 +34,7 @@ public class TestableCacheResolver implements CacheResolver { public Cache resolveCache(CacheInvocationContext cacheInvocationContext) { String cacheName = cacheInvocationContext.getCacheName(); @SuppressWarnings("unchecked") - Cache mock = mock(Cache.class); + Cache mock = mock(); given(mock.getName()).willReturn(cacheName); return mock; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java index fee433ddd9..be58cc00ab 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java @@ -42,7 +42,7 @@ class AfterAdviceBindingTests { private ClassPathXmlApplicationContext ctx; - private AdviceBindingCollaborator mockCollaborator; + private AdviceBindingCollaborator mockCollaborator = mock(); private ITestBean testBeanProxy; @@ -60,7 +60,6 @@ class AfterAdviceBindingTests { // we need the real target too, not just the proxy... testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget(); - mockCollaborator = mock(AdviceBindingCollaborator.class); afterAdviceAspect.setCollaborator(mockCollaborator); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index 26f1513d11..34cac33179 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -50,7 +50,7 @@ class AfterReturningAdviceBindingTests { private TestBean testBeanTarget; - private AfterReturningAdviceBindingCollaborator mockCollaborator; + private AfterReturningAdviceBindingCollaborator mockCollaborator = mock(); @BeforeEach @@ -59,7 +59,6 @@ class AfterReturningAdviceBindingTests { afterAdviceAspect = (AfterReturningAdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = mock(AfterReturningAdviceBindingCollaborator.class); afterAdviceAspect.setCollaborator(mockCollaborator); testBeanProxy = (ITestBean) ctx.getBean("testBean"); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java index bd98c74fb9..3a017e8562 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java @@ -42,7 +42,7 @@ class AfterThrowingAdviceBindingTests { private AfterThrowingAdviceBindingTestAspect afterThrowingAdviceAspect; - private AfterThrowingAdviceBindingCollaborator mockCollaborator; + private AfterThrowingAdviceBindingCollaborator mockCollaborator = mock(); @BeforeEach @@ -52,7 +52,6 @@ class AfterThrowingAdviceBindingTests { testBean = (ITestBean) ctx.getBean("testBean"); afterThrowingAdviceAspect = (AfterThrowingAdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = mock(AfterThrowingAdviceBindingCollaborator.class); afterThrowingAdviceAspect.setCollaborator(mockCollaborator); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java index 267c82df47..cfa0c32de0 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify; */ public class AroundAdviceBindingTests { - private AroundAdviceBindingCollaborator mockCollaborator; + private AroundAdviceBindingCollaborator mockCollaborator = mock(); private ITestBean testBeanProxy; @@ -48,11 +48,12 @@ public class AroundAdviceBindingTests { protected ApplicationContext ctx; + @BeforeEach public void onSetUp() throws Exception { ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); - AroundAdviceBindingTestAspect aroundAdviceAspect = ((AroundAdviceBindingTestAspect) ctx.getBean("testAspect")); + AroundAdviceBindingTestAspect aroundAdviceAspect = (AroundAdviceBindingTestAspect) ctx.getBean("testAspect"); ITestBean injectedTestBean = (ITestBean) ctx.getBean("testBean"); assertThat(AopUtils.isAopProxy(injectedTestBean)).isTrue(); @@ -62,7 +63,6 @@ public class AroundAdviceBindingTests { this.testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget(); - mockCollaborator = mock(AroundAdviceBindingCollaborator.class); aroundAdviceAspect.setCollaborator(mockCollaborator); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java index 033290c3ac..57e4d20b21 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java @@ -42,7 +42,7 @@ class BeforeAdviceBindingTests { private ClassPathXmlApplicationContext ctx; - private AdviceBindingCollaborator mockCollaborator; + private AdviceBindingCollaborator mockCollaborator = mock(); private ITestBean testBeanProxy; @@ -61,7 +61,6 @@ class BeforeAdviceBindingTests { AdviceBindingTestAspect beforeAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = mock(AdviceBindingCollaborator.class); beforeAdviceAspect.setCollaborator(mockCollaborator); } diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 473855ba8a..b75edc4511 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -18,7 +18,6 @@ package org.springframework.aop.config; import java.lang.reflect.Method; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; @@ -36,14 +35,9 @@ import static org.mockito.Mockito.verify; public class MethodLocatingFactoryBeanTests { private static final String BEAN_NAME = "string"; - private MethodLocatingFactoryBean factory; - private BeanFactory beanFactory; + private MethodLocatingFactoryBean factory = new MethodLocatingFactoryBean(); + private BeanFactory beanFactory = mock(); - @BeforeEach - public void setUp() { - factory = new MethodLocatingFactoryBean(); - beanFactory = mock(BeanFactory.class); - } @Test public void testIsSingleton() { diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java index 283efdd247..49f2a0db75 100644 --- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java @@ -183,7 +183,7 @@ class CacheErrorHandlerTests { @Bean @Override public CacheErrorHandler errorHandler() { - return mock(CacheErrorHandler.class); + return mock(); } @Bean @@ -201,7 +201,7 @@ class CacheErrorHandlerTests { @Bean public Cache mockCache() { - Cache cache = mock(Cache.class); + Cache cache = mock(); given(cache.getName()).willReturn("test"); return cache; } diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java index b96e10b701..fa0308b06f 100644 --- a/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java @@ -42,7 +42,7 @@ class LoggingCacheErrorHandlerTests { private static final String KEY = "enigma"; - private final Log logger = mock(Log.class); + private final Log logger = mock(); private LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(this.logger, false); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DeferredImportSelectorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DeferredImportSelectorTests.java index 374ca4de2c..73ed6eac2f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/DeferredImportSelectorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/DeferredImportSelectorTests.java @@ -33,25 +33,25 @@ public class DeferredImportSelectorTests { @Test public void entryEqualsSameInstance() { - AnnotationMetadata metadata = mock(AnnotationMetadata.class); + AnnotationMetadata metadata = mock(); Group.Entry entry = new Group.Entry(metadata, "com.example.Test"); assertThat(entry).isEqualTo(entry); } @Test public void entryEqualsSameMetadataAndClassName() { - AnnotationMetadata metadata = mock(AnnotationMetadata.class); + AnnotationMetadata metadata = mock(); assertThat(new Group.Entry(metadata, "com.example.Test")).isEqualTo(new Group.Entry(metadata, "com.example.Test")); } @Test public void entryEqualDifferentMetadataAndSameClassName() { - assertThat(new Group.Entry(mock(AnnotationMetadata.class), "com.example.Test")).isNotEqualTo(new Group.Entry(mock(AnnotationMetadata.class), "com.example.Test")); + assertThat(new Group.Entry(mock(), "com.example.Test")).isNotEqualTo(new Group.Entry(mock(), "com.example.Test")); } @Test public void entryEqualSameMetadataAnDifferentClassName() { - AnnotationMetadata metadata = mock(AnnotationMetadata.class); + AnnotationMetadata metadata = mock(); assertThat(new Group.Entry(metadata, "com.example.AnotherTest")).isNotEqualTo(new Group.Entry(metadata, "com.example.Test")); } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java index 34d394bc8b..e0d100fcfe 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java @@ -84,7 +84,7 @@ class EnableLoadTimeWeavingTests { @Override public LoadTimeWeaver getLoadTimeWeaver() { - return mock(LoadTimeWeaver.class); + return mock(); } } @@ -94,7 +94,7 @@ class EnableLoadTimeWeavingTests { @Override public LoadTimeWeaver getLoadTimeWeaver() { - return mock(LoadTimeWeaver.class); + return mock(); } } @@ -104,7 +104,7 @@ class EnableLoadTimeWeavingTests { @Override public LoadTimeWeaver getLoadTimeWeaver() { - return mock(LoadTimeWeaver.class); + return mock(); } } diff --git a/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanFactoryInitializationAotProcessorTests.java b/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanFactoryInitializationAotProcessorTests.java index 649e156f13..62512797d8 100644 --- a/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanFactoryInitializationAotProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanFactoryInitializationAotProcessorTests.java @@ -28,7 +28,6 @@ import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.beans.factory.aot.AotServices; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor; -import org.springframework.beans.factory.aot.BeanFactoryInitializationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -76,7 +75,7 @@ class ReflectiveProcessorBeanFactoryInitializationAotProcessorTests { } BeanFactoryInitializationAotContribution contribution = this.processor.processAheadOfTime(beanFactory); assertThat(contribution).isNotNull(); - contribution.applyTo(this.generationContext, mock(BeanFactoryInitializationCode.class)); + contribution.applyTo(this.generationContext, mock()); } @Reflective diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index f56f419c4e..4afea6b5e0 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -136,7 +136,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen @Test public void simpleApplicationEventMulticasterWithTaskExecutor() { @SuppressWarnings("unchecked") - ApplicationListener listener = mock(ApplicationListener.class); + ApplicationListener listener = mock(); ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext()); SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster(); @@ -153,7 +153,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen @Test public void simpleApplicationEventMulticasterWithException() { @SuppressWarnings("unchecked") - ApplicationListener listener = mock(ApplicationListener.class); + ApplicationListener listener = mock(); ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext()); SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster(); @@ -169,7 +169,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen @Test public void simpleApplicationEventMulticasterWithErrorHandler() { @SuppressWarnings("unchecked") - ApplicationListener listener = mock(ApplicationListener.class); + ApplicationListener listener = mock(); ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext()); SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster(); @@ -246,8 +246,8 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen @Test public void testEventPublicationInterceptor() throws Throwable { - MethodInvocation invocation = mock(MethodInvocation.class); - ApplicationContext ctx = mock(ApplicationContext.class); + MethodInvocation invocation = mock(); + ApplicationContext ctx = mock(); EventPublicationInterceptor interceptor = new EventPublicationInterceptor(); interceptor.setApplicationEventClass(MyEvent.class); diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java index 83fea0f1e4..08cd3078d7 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java @@ -51,7 +51,7 @@ public class ApplicationListenerMethodAdapterTests extends AbstractApplicationEv private final SampleEvents sampleEvents = spy(new SampleEvents()); - private final ApplicationContext context = mock(ApplicationContext.class); + private final ApplicationContext context = mock(); @Test diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 8341207bfb..4faeeff3b4 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -47,7 +47,7 @@ class EventPublicationInterceptorTests { @BeforeEach void setup() { - ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class); + ApplicationEventPublisher publisher = mock(); this.interceptor.setApplicationEventPublisher(publisher); } diff --git a/spring-context/src/test/java/org/springframework/context/event/GenericApplicationListenerAdapterTests.java b/spring-context/src/test/java/org/springframework/context/event/GenericApplicationListenerAdapterTests.java index 7c0e299791..0cac99d022 100644 --- a/spring-context/src/test/java/org/springframework/context/event/GenericApplicationListenerAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/GenericApplicationListenerAdapterTests.java @@ -36,7 +36,7 @@ public class GenericApplicationListenerAdapterTests extends AbstractApplicationE @Test public void supportsEventTypeWithSmartApplicationListener() { - SmartApplicationListener smartListener = mock(SmartApplicationListener.class); + SmartApplicationListener smartListener = mock(); GenericApplicationListenerAdapter listener = new GenericApplicationListenerAdapter(smartListener); ResolvableType type = ResolvableType.forClass(ApplicationEvent.class); listener.supportsEventType(type); @@ -45,7 +45,7 @@ public class GenericApplicationListenerAdapterTests extends AbstractApplicationE @Test public void supportsSourceTypeWithSmartApplicationListener() { - SmartApplicationListener smartListener = mock(SmartApplicationListener.class); + SmartApplicationListener smartListener = mock(); GenericApplicationListenerAdapter listener = new GenericApplicationListenerAdapter(smartListener); listener.supportsSourceType(Object.class); verify(smartListener, times(1)).supportsSourceType(Object.class); diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java index 7af3bbc20c..29c20aab39 100644 --- a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java @@ -310,7 +310,7 @@ class GenericApplicationContextTests { @Test void refreshForAotRegistersEnvironment() { - ConfigurableEnvironment environment = mock(ConfigurableEnvironment.class); + ConfigurableEnvironment environment = mock(); GenericApplicationContext context = new GenericApplicationContext(); context.setEnvironment(environment); context.refreshForAotProcessing(new RuntimeHints()); @@ -363,7 +363,7 @@ class GenericApplicationContextTests { @Test void refreshForAotInvokesBeanFactoryPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); - BeanFactoryPostProcessor bfpp = mock(BeanFactoryPostProcessor.class); + BeanFactoryPostProcessor bfpp = mock(); context.addBeanFactoryPostProcessor(bfpp); context.refreshForAotProcessing(new RuntimeHints()); verify(bfpp).postProcessBeanFactory(context.getBeanFactory()); @@ -510,7 +510,7 @@ class GenericApplicationContextTests { } private MergedBeanDefinitionPostProcessor registerMockMergedBeanDefinitionPostProcessor(GenericApplicationContext context) { - MergedBeanDefinitionPostProcessor bpp = mock(MergedBeanDefinitionPostProcessor.class); + MergedBeanDefinitionPostProcessor bpp = mock(); context.registerBeanDefinition("bpp", BeanDefinitionBuilder.rootBeanDefinition( MergedBeanDefinitionPostProcessor.class, () -> bpp) .setRole(BeanDefinition.ROLE_INFRASTRUCTURE).getBeanDefinition()); diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index d04a8cf6cd..556ff327ec 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -372,7 +372,7 @@ public class JndiObjectFactoryBeanTests { public void testLookupWithExposeAccessContext() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); - final Context mockCtx = mock(Context.class); + final Context mockCtx = mock(); given(mockCtx.lookup("foo")).willReturn(tb); jof.setJndiTemplate(new JndiTemplate() { @Override diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java index 5cb91731ef..3a676edb6d 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -39,7 +39,7 @@ public class JndiTemplateTests { public void testLookupSucceeds() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); given(context.lookup(name)).willReturn(o); JndiTemplate jt = new JndiTemplate() { @@ -58,7 +58,7 @@ public class JndiTemplateTests { public void testLookupFails() throws Exception { NameNotFoundException ne = new NameNotFoundException(); String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); given(context.lookup(name)).willThrow(ne); JndiTemplate jt = new JndiTemplate() { @@ -76,7 +76,7 @@ public class JndiTemplateTests { @Test public void testLookupReturnsNull() throws Exception { String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); given(context.lookup(name)).willReturn(null); JndiTemplate jt = new JndiTemplate() { @@ -95,7 +95,7 @@ public class JndiTemplateTests { public void testLookupFailsWithTypeMismatch() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); given(context.lookup(name)).willReturn(o); JndiTemplate jt = new JndiTemplate() { @@ -114,7 +114,7 @@ public class JndiTemplateTests { public void testBind() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); JndiTemplate jt = new JndiTemplate() { @Override @@ -132,7 +132,7 @@ public class JndiTemplateTests { public void testRebind() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = mock(Context.class); + final Context context = mock(); JndiTemplate jt = new JndiTemplate() { @Override @@ -149,7 +149,7 @@ public class JndiTemplateTests { @Test public void testUnbind() throws Exception { String name = "something"; - final Context context = mock(Context.class); + final Context context = mock(); JndiTemplate jt = new JndiTemplate() { @Override diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java index eaaed1c9c3..87902754f0 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java @@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; @@ -57,6 +56,7 @@ import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; /** * Tests use of @EnableAsync on @Configuration classes. @@ -495,7 +495,7 @@ public class EnableAsyncTests { @Bean @Lazy public AsyncBean asyncBean() { - return Mockito.mock(AsyncBean.class); + return mock(); } } diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 140fe6ebf1..c218f7e020 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -49,7 +49,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @SuppressWarnings("serial") void shutdownNowIsPropagatedToTheExecutorOnDestroy() throws Exception { - final ScheduledExecutorService executor = mock(ScheduledExecutorService.class); + final ScheduledExecutorService executor = mock(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { @Override @@ -67,7 +67,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @SuppressWarnings("serial") void shutdownIsPropagatedToTheExecutorOnDestroy() throws Exception { - final ScheduledExecutorService executor = mock(ScheduledExecutorService.class); + final ScheduledExecutorService executor = mock(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { @Override @@ -86,7 +86,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @EnabledForTestGroups(LONG_RUNNING) void oneTimeExecutionIsSetUpAndFiresCorrectly() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean(); factory.setScheduledExecutorTasks(new ScheduledExecutorTask(runnable)); @@ -100,7 +100,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @EnabledForTestGroups(LONG_RUNNING) void fixedRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -118,7 +118,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @EnabledForTestGroups(LONG_RUNNING) void fixedRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); willThrow(new IllegalStateException()).given(runnable).run(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); @@ -138,7 +138,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @EnabledForTestGroups(LONG_RUNNING) void withInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -158,7 +158,7 @@ class ScheduledExecutorFactoryBeanTests { @Test @EnabledForTestGroups(LONG_RUNNING) void withInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); willThrow(new IllegalStateException()).given(runnable).run(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java index e09b87aa00..0f5b4de936 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java @@ -97,7 +97,7 @@ class ThreadPoolExecutorFactoryBeanTests { int corePoolSize, int maxPoolSize, int keepAliveSeconds, BlockingQueue queue, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { - return mock(ThreadPoolExecutor.class); + return mock(); } } diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java index 9b9828c90e..1be9df0c9a 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java @@ -50,28 +50,28 @@ class ScheduledTaskRegistrarTests { @Test void getTriggerTasks() { - TriggerTask mockTriggerTask = mock(TriggerTask.class); + TriggerTask mockTriggerTask = mock(); this.taskRegistrar.setTriggerTasksList(Collections.singletonList(mockTriggerTask)); assertThat(this.taskRegistrar.getTriggerTaskList()).containsExactly(mockTriggerTask); } @Test void getCronTasks() { - CronTask mockCronTask = mock(CronTask.class); + CronTask mockCronTask = mock(); this.taskRegistrar.setCronTasksList(Collections.singletonList(mockCronTask)); assertThat(this.taskRegistrar.getCronTaskList()).containsExactly(mockCronTask); } @Test void getFixedRateTasks() { - IntervalTask mockFixedRateTask = mock(IntervalTask.class); + IntervalTask mockFixedRateTask = mock(); this.taskRegistrar.setFixedRateTasksList(Collections.singletonList(mockFixedRateTask)); assertThat(this.taskRegistrar.getFixedRateTaskList()).containsExactly(mockFixedRateTask); } @Test void getFixedDelayTasks() { - IntervalTask mockFixedDelayTask = mock(IntervalTask.class); + IntervalTask mockFixedDelayTask = mock(); this.taskRegistrar.setFixedDelayTasksList(Collections.singletonList(mockFixedDelayTask)); assertThat(this.taskRegistrar.getFixedDelayTaskList()).containsExactly(mockFixedDelayTask); } diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index cbfdd77813..bda9f574af 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -213,7 +213,7 @@ class BshScriptFactoryTests { @Test void scriptThatCompilesButIsJustPlainBad() throws IOException { - ScriptSource script = mock(ScriptSource.class); + ScriptSource script = mock(); final String badScript = "String getMessage() { throw new IllegalArgumentException(); }"; given(script.getScriptAsString()).willReturn(badScript); given(script.isModified()).willReturn(true); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index fe3dd0baba..f2fb8d7e09 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -284,7 +284,7 @@ public class GroovyScriptFactoryTests { @Test public void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception { - ScriptSource script = mock(ScriptSource.class); + ScriptSource script = mock(); String badScript = "class Foo { public Foo(String foo) {}}"; given(script.getScriptAsString()).willReturn(badScript); given(script.suggestedClassName()).willReturn("someName"); @@ -297,7 +297,7 @@ public class GroovyScriptFactoryTests { @Test public void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception { - ScriptSource script = mock(ScriptSource.class); + ScriptSource script = mock(); String badScript = "class Foo { protected Foo() {} \n String toString() { 'X' }}"; given(script.getScriptAsString()).willReturn(badScript); given(script.suggestedClassName()).willReturn("someName"); @@ -352,7 +352,7 @@ public class GroovyScriptFactoryTests { @Test public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception { - ScriptSource script = mock(ScriptSource.class); + ScriptSource script = mock(); given(script.getScriptAsString()).willReturn("class Bar {}"); given(script.suggestedClassName()).willReturn("someName"); diff --git a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java index 2d81f5da26..c52be85800 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java @@ -18,8 +18,6 @@ package org.springframework.scripting.support; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.BeanFactory; - import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.mockito.Mockito.mock; @@ -31,7 +29,7 @@ public class RefreshableScriptTargetSourceTests { @Test public void createWithNullScriptSource() throws Exception { assertThatIllegalArgumentException().isThrownBy(() -> - new RefreshableScriptTargetSource(mock(BeanFactory.class), "a.bean", null, null, false)); + new RefreshableScriptTargetSource(mock(), "a.bean", null, null, false)); } } diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java index a06e143644..1d08f5afb5 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java @@ -36,7 +36,7 @@ public class ResourceScriptSourceTests { @Test public void doesNotPropagateFatalExceptionOnResourceThatCannotBeResolvedToAFile() throws Exception { - Resource resource = mock(Resource.class); + Resource resource = mock(); given(resource.lastModified()).willThrow(new IOException()); ResourceScriptSource scriptSource = new ResourceScriptSource(resource); @@ -46,14 +46,14 @@ public class ResourceScriptSourceTests { @Test public void beginsInModifiedState() throws Exception { - Resource resource = mock(Resource.class); + Resource resource = mock(); ResourceScriptSource scriptSource = new ResourceScriptSource(resource); assertThat(scriptSource.isModified()).isTrue(); } @Test public void lastModifiedWorksWithResourceThatDoesNotSupportFileBasedReading() throws Exception { - Resource resource = mock(Resource.class); + Resource resource = mock(); // underlying File is asked for so that the last modified time can be checked... // And then mock the file changing; i.e. the File says it has been modified given(resource.lastModified()).willReturn(100L, 100L, 200L); diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java index 11ad134829..f9601ab2c3 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java @@ -19,7 +19,6 @@ package org.springframework.scripting.support; import org.junit.jupiter.api.Test; import org.springframework.beans.FatalBeanException; -import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -88,7 +87,7 @@ class ScriptFactoryPostProcessorTests { @Test void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() { assertThatIllegalStateException().isThrownBy(() -> - new ScriptFactoryPostProcessor().setBeanFactory(mock(BeanFactory.class))); + new ScriptFactoryPostProcessor().setBeanFactory(mock())); } @Test diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java index f82a21f516..98a93ceed9 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java @@ -160,7 +160,7 @@ class GeneratedClassesTests { @Test @SuppressWarnings("unchecked") void writeToInvokeTypeSpecCustomizer() throws IOException { - Consumer typeSpecCustomizer = mock(Consumer.class); + Consumer typeSpecCustomizer = mock(); this.generatedClasses.addForFeatureComponent("one", TestComponent.class, typeSpecCustomizer); verifyNoInteractions(typeSpecCustomizer); InMemoryGeneratedFiles generatedFiles = new InMemoryGeneratedFiles(); diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java index 7f0749c9d1..a8c014f587 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java @@ -57,7 +57,7 @@ class ReflectionHintsTests { @Test @SuppressWarnings("unchecked") void registerTypeIfPresentIgnoresMissingClass() { - Consumer hintBuilder = mock(Consumer.class); + Consumer hintBuilder = mock(); this.reflectionHints.registerTypeIfPresent(null, "com.example.DoesNotExist", hintBuilder); assertThat(this.reflectionHints.typeHints()).isEmpty(); verifyNoInteractions(hintBuilder); diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java index ba19adea62..6f2048e5e2 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java @@ -134,7 +134,7 @@ class ResourceHintsTests { @Test @SuppressWarnings("unchecked") void registerIfPresentIgnoreMissingLocation() { - Consumer hintBuilder = mock(Consumer.class); + Consumer hintBuilder = mock(); this.resourceHints.registerPatternIfPresent(null, "location/does-not-exist/", hintBuilder); assertThat(this.resourceHints.resourcePatternHints()).isEmpty(); verifyNoInteractions(hintBuilder); diff --git a/spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java index 2ab6d86a7f..fd3becefd1 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java @@ -51,7 +51,7 @@ class ReflectiveRuntimeHintsRegistrarTests { @Test void shouldIgnoreNonAnnotatedType() { - RuntimeHints mock = mock(RuntimeHints.class); + RuntimeHints mock = mock(); this.registrar.registerRuntimeHints(mock, String.class); verifyNoInteractions(mock); } diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 43548a3edd..f13d8d6cb1 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -869,7 +869,7 @@ class ResolvableTypeTests { @Test void resolveTypeWithCustomVariableResolver() throws Exception { - VariableResolver variableResolver = mock(VariableResolver.class); + VariableResolver variableResolver = mock(); given(variableResolver.getSource()).willReturn(this); ResolvableType longType = ResolvableType.forClass(Long.class); given(variableResolver.resolveVariable(any())).willReturn(longType); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AttributeMethodsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AttributeMethodsTests.java index a15ff7fa51..c977c8c595 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AttributeMethodsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AttributeMethodsTests.java @@ -118,7 +118,7 @@ class AttributeMethodsTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) void isValidWhenDoesNotHaveTypeNotPresentExceptionReturnsTrue() { - ClassValue annotation = mock(ClassValue.class); + ClassValue annotation = mock(); given(annotation.value()).willReturn((Class) InputStream.class); AttributeMethods attributes = AttributeMethods.forAnnotationType(annotation.annotationType()); assertThat(attributes.isValid(annotation)).isTrue(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsCollectionTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsCollectionTests.java index 90fd6321f6..6495347fde 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsCollectionTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsCollectionTests.java @@ -53,7 +53,7 @@ class MergedAnnotationsCollectionTests { @Test void createWhenAnnotationIsNotDirectlyPresentThrowsException() { - MergedAnnotation annotation = mock(MergedAnnotation.class); + MergedAnnotation annotation = mock(); given(annotation.isDirectlyPresent()).willReturn(false); assertThatIllegalArgumentException().isThrownBy(() -> MergedAnnotationsCollection.of(Collections.singleton(annotation))) @@ -62,7 +62,7 @@ class MergedAnnotationsCollectionTests { @Test void createWhenAnnotationAggregateIndexIsNotZeroThrowsException() { - MergedAnnotation annotation = mock(MergedAnnotation.class); + MergedAnnotation annotation = mock(); given(annotation.isDirectlyPresent()).willReturn(true); given(annotation.getAggregateIndex()).willReturn(1); assertThatIllegalArgumentException().isThrownBy(() -> diff --git a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java index 3ce05addf0..45a4fbc10d 100644 --- a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java @@ -193,7 +193,7 @@ class PathResourceTests { @Test void getFileUnsupported() throws IOException { - Path path = mock(Path.class); + Path path = mock(); given(path.normalize()).willReturn(path); given(path.toFile()).willThrow(new UnsupportedOperationException()); PathResource resource = new PathResource(path); diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java index 05a0d91ed7..629f34273c 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java @@ -101,7 +101,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { void readByteChannelError(DataBufferFactory bufferFactory) throws Exception { super.bufferFactory = bufferFactory; - ReadableByteChannel channel = mock(ReadableByteChannel.class); + ReadableByteChannel channel = mock(); given(channel.read(any())) .willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); @@ -166,7 +166,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { void readAsynchronousFileChannelError(DataBufferFactory bufferFactory) throws Exception { super.bufferFactory = bufferFactory; - AsynchronousFileChannel channel = mock(AsynchronousFileChannel.class); + AsynchronousFileChannel channel = mock(); willAnswer(invocation -> { ByteBuffer byteBuffer = invocation.getArgument(0); byteBuffer.put("foo".getBytes(StandardCharsets.UTF_8)); @@ -360,7 +360,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { DataBuffer bar = stringBuffer("bar"); Flux flux = Flux.just(foo, bar); - WritableByteChannel channel = mock(WritableByteChannel.class); + WritableByteChannel channel = mock(); given(channel.write(any())) .willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); @@ -470,7 +470,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { DataBuffer bar = stringBuffer("bar"); Flux flux = Flux.just(foo, bar); - AsynchronousFileChannel channel = mock(AsynchronousFileChannel.class); + AsynchronousFileChannel channel = mock(); willAnswer(invocation -> { ByteBuffer buffer = invocation.getArgument(0); long pos = invocation.getArgument(1); @@ -777,7 +777,7 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests { void SPR16070(DataBufferFactory bufferFactory) throws Exception { super.bufferFactory = bufferFactory; - ReadableByteChannel channel = mock(ReadableByteChannel.class); + ReadableByteChannel channel = mock(); given(channel.read(any())) .willAnswer(putByte('a')) .willAnswer(putByte('b')) diff --git a/spring-core/src/test/java/org/springframework/core/io/support/ResourceRegionTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceRegionTests.java index d7d00bea0d..a688f1d811 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/ResourceRegionTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/ResourceRegionTests.java @@ -18,8 +18,6 @@ package org.springframework.core.io.support; import org.junit.jupiter.api.Test; -import org.springframework.core.io.Resource; - import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.mockito.Mockito.mock; @@ -32,20 +30,20 @@ class ResourceRegionTests { @Test void shouldThrowExceptionWithNullResource() { - assertThatIllegalArgumentException().isThrownBy(() -> - new ResourceRegion(null, 0, 1)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new ResourceRegion(null, 0, 1)); } @Test void shouldThrowExceptionForNegativePosition() { - assertThatIllegalArgumentException().isThrownBy(() -> - new ResourceRegion(mock(Resource.class), -1, 1)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new ResourceRegion(mock(), -1, 1)); } @Test void shouldThrowExceptionForNegativeCount() { - assertThatIllegalArgumentException().isThrownBy(() -> - new ResourceRegion(mock(Resource.class), 0, -1)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new ResourceRegion(mock(), 0, -1)); } } diff --git a/spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java b/spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java index 5cde6c22c0..f3ef93840b 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java @@ -107,7 +107,7 @@ class SpringFactoriesLoaderTests { @Test void loadWithLoggingFailureHandlerWhenIncompatibleTypeReturnsEmptyList() { - Log logger = mock(Log.class); + Log logger = mock(); FailureHandler failureHandler = FailureHandler.logging(logger); List factories = SpringFactoriesLoader.forDefaultResourceLocation().load(String.class, failureHandler); assertThat(factories).isEmpty(); @@ -138,7 +138,7 @@ class SpringFactoriesLoaderTests { @Test void loadWithLoggingFailureHandlerWhenMissingArgumentDropsItem() { - Log logger = mock(Log.class); + Log logger = mock(); FailureHandler failureHandler = FailureHandler.logging(logger); List factories = SpringFactoriesLoader.forDefaultResourceLocation(LimitedClassLoader.multipleArgumentFactories) .load(DummyFactory.class, failureHandler); @@ -202,7 +202,7 @@ class SpringFactoriesLoaderTests { @Test void loggingReturnsHandlerThatLogs() { - Log logger = mock(Log.class); + Log logger = mock(); FailureHandler handler = FailureHandler.logging(logger); RuntimeException cause = new RuntimeException(); handler.handleFailure(DummyFactory.class, MyDummyFactory1.class.getName(), cause); diff --git a/spring-core/src/test/java/org/springframework/core/log/CompositeLogTests.java b/spring-core/src/test/java/org/springframework/core/log/CompositeLogTests.java index a15bfd3844..3488076f59 100644 --- a/spring-core/src/test/java/org/springframework/core/log/CompositeLogTests.java +++ b/spring-core/src/test/java/org/springframework/core/log/CompositeLogTests.java @@ -33,9 +33,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; */ public class CompositeLogTests { - private final Log logger1 = mock(Log.class); + private final Log logger1 = mock(); - private final Log logger2 = mock(Log.class); + private final Log logger2 = mock(); private final CompositeLog compositeLog = new CompositeLog(Arrays.asList(logger1, logger2)); diff --git a/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java index fad81878e7..24522ed0e4 100644 --- a/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java @@ -100,7 +100,7 @@ class StreamUtilsTests { @Test void nonClosingInputStream() throws Exception { - InputStream source = mock(InputStream.class); + InputStream source = mock(); InputStream nonClosing = StreamUtils.nonClosing(source); nonClosing.read(); nonClosing.read(bytes); @@ -115,7 +115,7 @@ class StreamUtilsTests { @Test void nonClosingOutputStream() throws Exception { - OutputStream source = mock(OutputStream.class); + OutputStream source = mock(); OutputStream nonClosing = StreamUtils.nonClosing(source); nonClosing.write(1); nonClosing.write(bytes); diff --git a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java index 7573793f95..45ba63f0a3 100644 --- a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java @@ -43,7 +43,7 @@ class UnmodifiableMultiValueMapTests { @Test @SuppressWarnings("unchecked") void delegation() { - MultiValueMap mock = mock(MultiValueMap.class); + MultiValueMap mock = mock(); UnmodifiableMultiValueMap map = new UnmodifiableMultiValueMap<>(mock); given(mock.size()).willReturn(1); @@ -101,8 +101,8 @@ class UnmodifiableMultiValueMapTests { @Test @SuppressWarnings("unchecked") void entrySetDelegation() { - MultiValueMap mockMap = mock(MultiValueMap.class); - Set>> mockSet = mock(Set.class); + MultiValueMap mockMap = mock(); + Set>> mockSet = mock(); given(mockMap.entrySet()).willReturn(mockSet); Set>> set = new UnmodifiableMultiValueMap<>(mockMap).entrySet(); @@ -112,7 +112,7 @@ class UnmodifiableMultiValueMapTests { given(mockSet.isEmpty()).willReturn(false); assertThat(set.isEmpty()).isFalse(); - Map.Entry> mockedEntry = mock(Map.Entry.class); + Map.Entry> mockedEntry = mock(); given(mockSet.contains(mockedEntry)).willReturn(true); assertThat(set.contains(mockedEntry)).isTrue(); @@ -120,7 +120,7 @@ class UnmodifiableMultiValueMapTests { given(mockSet.containsAll(mockEntries)).willReturn(true); assertThat(set.containsAll(mockEntries)).isTrue(); - Iterator>> mockIterator = mock(Iterator.class); + Iterator>> mockIterator = mock(); given(mockSet.iterator()).willReturn(mockIterator); given(mockIterator.hasNext()).willReturn(false); assertThat(set.iterator()).isExhausted(); @@ -143,8 +143,8 @@ class UnmodifiableMultiValueMapTests { @Test @SuppressWarnings("unchecked") void valuesDelegation() { - MultiValueMap mockMap = mock(MultiValueMap.class); - Collection> mockValues = mock(Collection.class); + MultiValueMap mockMap = mock(); + Collection> mockValues = mock(); given(mockMap.values()).willReturn(mockValues); Collection> values = new UnmodifiableMultiValueMap<>(mockMap).values(); diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java index a81adaae62..76c661104c 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -33,22 +32,17 @@ import static org.mockito.Mockito.mock; @SuppressWarnings("deprecation") class FutureAdapterTests { - private FutureAdapter adapter; - - private Future adaptee; - - - @BeforeEach @SuppressWarnings("unchecked") - void setUp() { - adaptee = mock(Future.class); - adapter = new FutureAdapter<>(adaptee) { - @Override - protected String adapt(Integer adapteeResult) throws ExecutionException { - return adapteeResult.toString(); - } - }; - } + private Future adaptee = mock(); + + private FutureAdapter adapter = new FutureAdapter<>(adaptee) { + @Override + protected String adapt(Integer adapteeResult) throws ExecutionException { + return adapteeResult.toString(); + } + }; + + @Test void cancel() { diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java index 75381f18d9..ea3b0fdd9f 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java @@ -94,8 +94,8 @@ class ListenableFutureTaskTests { final String s = "Hello World"; Callable callable = () -> s; - SuccessCallback successCallback = mock(SuccessCallback.class); - FailureCallback failureCallback = mock(FailureCallback.class); + SuccessCallback successCallback = mock(); + FailureCallback failureCallback = mock(); ListenableFutureTask task = new ListenableFutureTask<>(callable); task.addCallback(successCallback, failureCallback); task.run(); @@ -115,20 +115,22 @@ class ListenableFutureTaskTests { throw ex; }; - SuccessCallback successCallback = mock(SuccessCallback.class); - FailureCallback failureCallback = mock(FailureCallback.class); + SuccessCallback successCallback = mock(); + FailureCallback failureCallback = mock(); ListenableFutureTask task = new ListenableFutureTask<>(callable); task.addCallback(successCallback, failureCallback); task.run(); verify(failureCallback).onFailure(ex); verifyNoInteractions(successCallback); - assertThatExceptionOfType(ExecutionException.class).isThrownBy( - task::get) - .satisfies(e -> assertThat(e.getCause().getMessage()).isEqualTo(s)); - assertThatExceptionOfType(ExecutionException.class).isThrownBy( - task.completable()::get) - .satisfies(e -> assertThat(e.getCause().getMessage()).isEqualTo(s)); + assertThatExceptionOfType(ExecutionException.class) + .isThrownBy(task::get) + .havingCause() + .withMessage(s); + assertThatExceptionOfType(ExecutionException.class) + .isThrownBy(task.completable()::get) + .havingCause() + .withMessage(s); } } diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java index 300dd6c775..4614c86304 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java @@ -361,7 +361,7 @@ class SettableListenableFutureTests { @Test @SuppressWarnings({"rawtypes", "unchecked"}) public void cancelDoesNotNotifyCallbacksOnSet() { - ListenableFutureCallback callback = mock(ListenableFutureCallback.class); + ListenableFutureCallback callback = mock(); settableListenableFuture.addCallback(callback); settableListenableFuture.cancel(true); @@ -378,7 +378,7 @@ class SettableListenableFutureTests { @Test @SuppressWarnings({"rawtypes", "unchecked"}) public void cancelDoesNotNotifyCallbacksOnSetException() { - ListenableFutureCallback callback = mock(ListenableFutureCallback.class); + ListenableFutureCallback callback = mock(); settableListenableFuture.addCallback(callback); settableListenableFuture.cancel(true); diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java index 3eb66addcd..196be02c9d 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java @@ -170,7 +170,7 @@ abstract class AbstractStaxXMLReaderTests { private LexicalHandler mockLexicalHandler() throws Exception { - LexicalHandler lexicalHandler = mock(LexicalHandler.class); + LexicalHandler lexicalHandler = mock(); willAnswer(new CopyCharsAnswer()).given(lexicalHandler).comment(any(char[].class), anyInt(), anyInt()); return lexicalHandler; } @@ -180,7 +180,7 @@ abstract class AbstractStaxXMLReaderTests { } protected final ContentHandler mockContentHandler() throws Exception { - ContentHandler contentHandler = mock(ContentHandler.class); + ContentHandler contentHandler = mock(); willAnswer(new CopyCharsAnswer()).given(contentHandler).characters(any(char[].class), anyInt(), anyInt()); willAnswer(new CopyCharsAnswer()).given(contentHandler).ignorableWhitespace(any(char[].class), anyInt(), anyInt()); willAnswer(invocation -> { diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java index 6acf48e623..f9a34043a9 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java @@ -48,7 +48,7 @@ class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTests { XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(CONTENT)); eventReader.nextTag(); // skip to root StaxEventXMLReader xmlReader = new StaxEventXMLReader(eventReader); - ContentHandler contentHandler = mock(ContentHandler.class); + ContentHandler contentHandler = mock(); xmlReader.setContentHandler(contentHandler); xmlReader.parse(new InputSource()); verify(contentHandler).startDocument(); diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java index 26b136765d..8f4a8d36f7 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java @@ -55,7 +55,7 @@ class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTests { assertThat(streamReader.getName()).as("Invalid element").isEqualTo(new QName("http://springframework.org/spring-ws", "child")); StaxStreamXMLReader xmlReader = new StaxStreamXMLReader(streamReader); - ContentHandler contentHandler = mock(ContentHandler.class); + ContentHandler contentHandler = mock(); xmlReader.setContentHandler(contentHandler); xmlReader.parse(new InputSource()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index 9618f3e0a5..19ef1bac52 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -120,27 +120,23 @@ public abstract class AbstractRowMapperTests { protected static class Mock { - private Connection connection; + private Connection connection = mock(); - private ResultSetMetaData resultSetMetaData; + private ResultSetMetaData resultSetMetaData = mock(); - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private Statement statement; + private Statement statement = mock(); private JdbcTemplate jdbcTemplate; + public Mock() throws Exception { this(MockType.ONE); } @SuppressWarnings("unchecked") public Mock(MockType type) throws Exception { - connection = mock(Connection.class); - statement = mock(Statement.class); - resultSet = mock(ResultSet.class); - resultSetMetaData = mock(ResultSetMetaData.class); - given(connection.createStatement()).willReturn(statement); given(statement.executeQuery(anyString())).willReturn(resultSet); given(resultSet.getMetaData()).willReturn(resultSetMetaData); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index 8f0cf9d8ca..f4ca764516 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -50,30 +50,23 @@ import static org.mockito.Mockito.verify; */ public class JdbcTemplateQueryTests { - private Connection connection; + private Connection connection = mock(); - private DataSource dataSource; + private DataSource dataSource = mock(); - private Statement statement; + private Statement statement = mock(); - private PreparedStatement preparedStatement; + private PreparedStatement preparedStatement = mock(); - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private ResultSetMetaData resultSetMetaData; + private ResultSetMetaData resultSetMetaData = mock(); - private JdbcTemplate template; + private JdbcTemplate template = new JdbcTemplate(this.dataSource); @BeforeEach public void setUp() throws Exception { - this.connection = mock(Connection.class); - this.dataSource = mock(DataSource.class); - this.statement = mock(Statement.class); - this.preparedStatement = mock(PreparedStatement.class); - this.resultSet = mock(ResultSet.class); - this.resultSetMetaData = mock(ResultSetMetaData.class); - this.template = new JdbcTemplate(this.dataSource); given(this.dataSource.getConnection()).willReturn(this.connection); given(this.resultSet.getMetaData()).willReturn(this.resultSetMetaData); given(this.resultSetMetaData.getColumnCount()).willReturn(1); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 3e85f82634..fd8f3e6ee2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -75,30 +75,23 @@ import static org.mockito.Mockito.verify; */ public class JdbcTemplateTests { - private Connection connection; + private Connection connection = mock(); - private DataSource dataSource; + private DataSource dataSource = mock(); - private PreparedStatement preparedStatement; + private Statement statement = mock(); - private Statement statement; + private PreparedStatement preparedStatement = mock(); - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private JdbcTemplate template; + private CallableStatement callableStatement = mock(); - private CallableStatement callableStatement; + private JdbcTemplate template = new JdbcTemplate(this.dataSource); @BeforeEach public void setup() throws Exception { - this.connection = mock(Connection.class); - this.dataSource = mock(DataSource.class); - this.preparedStatement = mock(PreparedStatement.class); - this.statement = mock(Statement.class); - this.resultSet = mock(ResultSet.class); - this.template = new JdbcTemplate(this.dataSource); - this.callableStatement = mock(CallableStatement.class); given(this.dataSource.getConnection()).willReturn(this.connection); given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement); given(this.preparedStatement.executeQuery()).willReturn(this.resultSet); @@ -779,7 +772,6 @@ public class JdbcTemplateTests { @Test public void testCouldNotGetConnectionForOperationOrExceptionTranslator() throws SQLException { SQLException sqlException = new SQLException("foo", "07xxx"); - this.dataSource = mock(DataSource.class); given(this.dataSource.getConnection()).willThrow(sqlException); JdbcTemplate template = new JdbcTemplate(this.dataSource, false); RowCountCallbackHandler rcch = new RowCountCallbackHandler(); @@ -792,7 +784,6 @@ public class JdbcTemplateTests { @Test public void testCouldNotGetConnectionForOperationWithLazyExceptionTranslator() throws SQLException { SQLException sqlException = new SQLException("foo", "07xxx"); - this.dataSource = mock(DataSource.class); given(this.dataSource.getConnection()).willThrow(sqlException); this.template = new JdbcTemplate(); this.template.setDataSource(this.dataSource); @@ -826,7 +817,6 @@ public class JdbcTemplateTests { throws SQLException { SQLException sqlException = new SQLException("foo", "07xxx"); - this.dataSource = mock(DataSource.class); given(this.dataSource.getConnection()).willThrow(sqlException); this.template = new JdbcTemplate(); this.template.setDataSource(this.dataSource); @@ -1008,7 +998,7 @@ public class JdbcTemplateTests { @Test public void testStaticResultSetClosed() throws Exception { - ResultSet resultSet2 = mock(ResultSet.class); + ResultSet resultSet2 = mock(); reset(this.preparedStatement); given(this.preparedStatement.executeQuery()).willReturn(resultSet2); given(this.connection.createStatement()).willReturn(this.statement); @@ -1071,7 +1061,7 @@ public class JdbcTemplateTests { public void testEquallyNamedColumn() throws SQLException { given(this.connection.createStatement()).willReturn(this.statement); - ResultSetMetaData metaData = mock(ResultSetMetaData.class); + ResultSetMetaData metaData = mock(); given(metaData.getColumnCount()).willReturn(2); given(metaData.getColumnLabel(1)).willReturn("x"); given(metaData.getColumnLabel(2)).willReturn("X"); @@ -1088,7 +1078,7 @@ public class JdbcTemplateTests { private void mockDatabaseMetaData(boolean supportsBatchUpdates) throws SQLException { - DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + DatabaseMetaData databaseMetaData = mock(); given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL"); given(databaseMetaData.supportsBatchUpdates()).willReturn(supportsBatchUpdates); given(this.connection.getMetaData()).willReturn(databaseMetaData); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index 3f55c8983a..fae873115b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -45,13 +45,13 @@ import static org.mockito.Mockito.verify; */ public class RowMapperTests { - private final Connection connection = mock(Connection.class); + private final Connection connection = mock(); - private final Statement statement = mock(Statement.class); + private final Statement statement = mock(); - private final PreparedStatement preparedStatement = mock(PreparedStatement.class); + private final PreparedStatement preparedStatement = mock(); - private final ResultSet resultSet = mock(ResultSet.class); + private final ResultSet resultSet = mock(); private final JdbcTemplate template = new JdbcTemplate(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SingleColumnRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SingleColumnRowMapperTests.java index 24f8413abd..3b79264de8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SingleColumnRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SingleColumnRowMapperTests.java @@ -47,8 +47,8 @@ public class SingleColumnRowMapperTests { SingleColumnRowMapper rowMapper = SingleColumnRowMapper.newInstance(LocalDateTime.class); - ResultSet resultSet = mock(ResultSet.class); - ResultSetMetaData metaData = mock(ResultSetMetaData.class); + ResultSet resultSet = mock(); + ResultSetMetaData metaData = mock(); given(metaData.getColumnCount()).willReturn(1); given(resultSet.getMetaData()).willReturn(metaData); given(resultSet.getObject(1, LocalDateTime.class)) @@ -70,8 +70,8 @@ public class SingleColumnRowMapperTests { SingleColumnRowMapper rowMapper = SingleColumnRowMapper.newInstance(MyLocalDateTime.class, myConversionService); - ResultSet resultSet = mock(ResultSet.class); - ResultSetMetaData metaData = mock(ResultSetMetaData.class); + ResultSet resultSet = mock(); + ResultSetMetaData metaData = mock(); given(metaData.getColumnCount()).willReturn(1); given(resultSet.getMetaData()).willReturn(metaData); given(resultSet.getObject(1, MyLocalDateTime.class)) @@ -89,8 +89,8 @@ public class SingleColumnRowMapperTests { SingleColumnRowMapper rowMapper = SingleColumnRowMapper.newInstance(LocalDateTime.class, null); - ResultSet resultSet = mock(ResultSet.class); - ResultSetMetaData metaData = mock(ResultSetMetaData.class); + ResultSet resultSet = mock(); + ResultSetMetaData metaData = mock(); given(metaData.getColumnCount()).willReturn(1); given(resultSet.getMetaData()).willReturn(metaData); given(resultSet.getObject(1, LocalDateTime.class)) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java index 7588a754d7..e25c239d70 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java @@ -24,7 +24,6 @@ import java.sql.SQLException; import java.sql.Types; import java.util.GregorianCalendar; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.mockito.BDDMockito.given; @@ -38,13 +37,7 @@ import static org.mockito.Mockito.verify; */ public class StatementCreatorUtilsTests { - private PreparedStatement preparedStatement; - - - @BeforeEach - public void setUp() { - preparedStatement = mock(PreparedStatement.class); - } + private PreparedStatement preparedStatement = mock(); @Test @@ -62,8 +55,8 @@ public class StatementCreatorUtilsTests { @Test public void testSetParameterValueWithNullAndUnknownType() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; - Connection con = mock(Connection.class); - DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con = mock(); + DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); given(dbmd.getDatabaseProductName()).willReturn("Oracle"); given(dbmd.getDriverName()).willReturn("Oracle Driver"); @@ -76,8 +69,8 @@ public class StatementCreatorUtilsTests { @Test public void testSetParameterValueWithNullAndUnknownTypeOnInformix() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; - Connection con = mock(Connection.class); - DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con = mock(); + DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); given(con.getMetaData()).willReturn(dbmd); given(dbmd.getDatabaseProductName()).willReturn("Informix Dynamic Server"); @@ -92,8 +85,8 @@ public class StatementCreatorUtilsTests { @Test public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; - Connection con = mock(Connection.class); - DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con = mock(); + DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); given(con.getMetaData()).willReturn(dbmd); given(dbmd.getDatabaseProductName()).willReturn("Apache Derby"); @@ -107,7 +100,7 @@ public class StatementCreatorUtilsTests { @Test public void testSetParameterValueWithNullAndGetParameterTypeWorking() throws SQLException { - ParameterMetaData pmd = mock(ParameterMetaData.class); + ParameterMetaData pmd = mock(); given(preparedStatement.getParameterMetaData()).willReturn(pmd); given(pmd.getParameterType(1)).willReturn(Types.SMALLINT); StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); @@ -212,8 +205,8 @@ public class StatementCreatorUtilsTests { @Test // SPR-8571 public void testSetParameterValueWithStringAndVendorSpecificType() throws SQLException { - Connection con = mock(Connection.class); - DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con = mock(); + DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); given(dbmd.getDatabaseProductName()).willReturn("Oracle"); given(con.getMetaData()).willReturn(dbmd); @@ -224,8 +217,8 @@ public class StatementCreatorUtilsTests { @Test // SPR-8571 public void testSetParameterValueWithNullAndVendorSpecificType() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; - Connection con = mock(Connection.class); - DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con = mock(); + DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); given(dbmd.getDatabaseProductName()).willReturn("Oracle"); given(dbmd.getDriverName()).willReturn("Oracle Driver"); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index 88e9b799c1..b3f69c77e6 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -83,29 +83,23 @@ public class NamedParameterJdbcTemplateTests { private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; - private Connection connection; + private Connection connection = mock(); - private DataSource dataSource; + private DataSource dataSource = mock(); - private PreparedStatement preparedStatement; + private PreparedStatement preparedStatement = mock(); - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private DatabaseMetaData databaseMetaData; + private DatabaseMetaData databaseMetaData = mock(); + + private NamedParameterJdbcTemplate namedParameterTemplate = new NamedParameterJdbcTemplate(dataSource); private Map params = new HashMap<>(); - private NamedParameterJdbcTemplate namedParameterTemplate; - @BeforeEach public void setup() throws Exception { - connection = mock(Connection.class); - dataSource = mock(DataSource.class); - preparedStatement = mock(PreparedStatement.class); - resultSet = mock(ResultSet.class); - namedParameterTemplate = new NamedParameterJdbcTemplate(dataSource); - databaseMetaData = mock(DatabaseMetaData.class); given(dataSource.getConnection()).willReturn(connection); given(connection.prepareStatement(anyString())).willReturn(preparedStatement); given(preparedStatement.getConnection()).willReturn(connection); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java index 68f6876d62..eb0d359f3b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java @@ -48,27 +48,21 @@ import static org.mockito.Mockito.verify; */ public class NamedParameterQueryTests { - private DataSource dataSource; + private Connection connection = mock(); - private Connection connection; + private DataSource dataSource = mock(); - private PreparedStatement preparedStatement; + private PreparedStatement preparedStatement = mock(); - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private ResultSetMetaData resultSetMetaData; + private ResultSetMetaData resultSetMetaData = mock(); - private NamedParameterJdbcTemplate template; + private NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(dataSource); @BeforeEach public void setup() throws Exception { - connection = mock(Connection.class); - dataSource = mock(DataSource.class); - preparedStatement = mock(PreparedStatement.class); - resultSet = mock(ResultSet.class); - resultSetMetaData = mock(ResultSetMetaData.class); - template = new NamedParameterJdbcTemplate(dataSource); given(dataSource.getConnection()).willReturn(connection); given(resultSetMetaData.getColumnCount()).willReturn(1); given(resultSetMetaData.getColumnLabel(1)).willReturn("age"); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index 260b85f737..c3f9d01929 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -47,21 +47,18 @@ import static org.mockito.Mockito.verify; */ public class CallMetaDataContextTests { - private DataSource dataSource; + private DataSource dataSource = mock(); - private Connection connection; + private Connection connection = mock(); - private DatabaseMetaData databaseMetaData; + private DatabaseMetaData databaseMetaData = mock(); private CallMetaDataContext context = new CallMetaDataContext(); @BeforeEach public void setUp() throws Exception { - connection = mock(Connection.class); - databaseMetaData = mock(DatabaseMetaData.class); given(connection.getMetaData()).willReturn(databaseMetaData); - dataSource = mock(DataSource.class); given(dataSource.getConnection()).willReturn(connection); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index 42df459520..0165826ce6 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -50,13 +50,13 @@ import static org.mockito.Mockito.verify; */ class SimpleJdbcCallTests { - private final Connection connection = mock(Connection.class); + private final Connection connection = mock(); - private final DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + private final DatabaseMetaData databaseMetaData = mock(); - private final DataSource dataSource = mock(DataSource.class); + private final DataSource dataSource = mock(); - private final CallableStatement callableStatement = mock(CallableStatement.class); + private final CallableStatement callableStatement = mock(); @BeforeEach @@ -233,8 +233,8 @@ class SimpleJdbcCallTests { */ @Test // gh-26486 void exceptionThrownWhileRetrievingColumnNamesFromMetadata() throws Exception { - ResultSet proceduresResultSet = mock(ResultSet.class); - ResultSet procedureColumnsResultSet = mock(ResultSet.class); + ResultSet proceduresResultSet = mock(); + ResultSet procedureColumnsResultSet = mock(); given(databaseMetaData.getDatabaseProductName()).willReturn("Oracle"); given(databaseMetaData.getUserName()).willReturn("ME"); @@ -301,8 +301,8 @@ class SimpleJdbcCallTests { } private void initializeAddInvoiceWithMetaData(boolean isFunction) throws SQLException { - ResultSet proceduresResultSet = mock(ResultSet.class); - ResultSet procedureColumnsResultSet = mock(ResultSet.class); + ResultSet proceduresResultSet = mock(); + ResultSet procedureColumnsResultSet = mock(); given(databaseMetaData.getDatabaseProductName()).willReturn("Oracle"); given(databaseMetaData.getUserName()).willReturn("ME"); given(databaseMetaData.storesUpperCaseIdentifiers()).willReturn(true); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java index d965d598f0..c50a545682 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java @@ -45,11 +45,11 @@ import static org.mockito.Mockito.verify; */ class SimpleJdbcInsertTests { - private final Connection connection = mock(Connection.class); + private final Connection connection = mock(); - private final DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + private final DatabaseMetaData databaseMetaData = mock(); - private final DataSource dataSource = mock(DataSource.class); + private final DataSource dataSource = mock(); @BeforeEach @@ -66,7 +66,7 @@ class SimpleJdbcInsertTests { @Test void noSuchTable() throws Exception { - ResultSet resultSet = mock(ResultSet.class); + ResultSet resultSet = mock(); given(resultSet.next()).willReturn(false); given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); @@ -86,13 +86,13 @@ class SimpleJdbcInsertTests { @Test // gh-26486 void retrieveColumnNamesFromMetadata() throws Exception { - ResultSet tableResultSet = mock(ResultSet.class); + ResultSet tableResultSet = mock(); given(tableResultSet.next()).willReturn(true, false); given(databaseMetaData.getUserName()).willReturn("me"); given(databaseMetaData.getTables(null, null, "me", null)).willReturn(tableResultSet); - ResultSet columnResultSet = mock(ResultSet.class); + ResultSet columnResultSet = mock(); given(databaseMetaData.getColumns(null, "me", null, null)).willReturn(columnResultSet); given(columnResultSet.next()).willReturn(true, true, false); given(columnResultSet.getString("COLUMN_NAME")).willReturn("col1", "col2"); @@ -109,13 +109,13 @@ class SimpleJdbcInsertTests { @Test // gh-26486 void exceptionThrownWhileRetrievingColumnNamesFromMetadata() throws Exception { - ResultSet tableResultSet = mock(ResultSet.class); + ResultSet tableResultSet = mock(); given(tableResultSet.next()).willReturn(true, false); given(databaseMetaData.getUserName()).willReturn("me"); given(databaseMetaData.getTables(null, null, "me", null)).willReturn(tableResultSet); - ResultSet columnResultSet = mock(ResultSet.class); + ResultSet columnResultSet = mock(); given(databaseMetaData.getColumns(null, "me", null, null)).willReturn(columnResultSet); // true, true, false --> simulates processing of two columns given(columnResultSet.next()).willReturn(true, true, false); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index f49e69ee85..5ae2b0f5d5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -44,22 +44,19 @@ import static org.mockito.Mockito.verify; * * @author Thomas Risberg */ -public class TableMetaDataContextTests { +public class TableMetaDataContextTests { - private Connection connection; + private DataSource dataSource = mock(); - private DataSource dataSource; + private Connection connection = mock(); - private DatabaseMetaData databaseMetaData; + private DatabaseMetaData databaseMetaData = mock(); private TableMetaDataContext context = new TableMetaDataContext(); @BeforeEach public void setUp() throws Exception { - connection = mock(Connection.class); - dataSource = mock(DataSource.class); - databaseMetaData = mock(DatabaseMetaData.class); given(connection.getMetaData()).willReturn(databaseMetaData); given(dataSource.getConnection()).willReturn(connection); } @@ -70,13 +67,13 @@ public class TableMetaDataContextTests { final String TABLE = "customers"; final String USER = "me"; - ResultSet metaDataResultSet = mock(ResultSet.class); + ResultSet metaDataResultSet = mock(); given(metaDataResultSet.next()).willReturn(true, false); given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER); given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE); given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE"); - ResultSet columnsResultSet = mock(ResultSet.class); + ResultSet columnsResultSet = mock(); given(columnsResultSet.next()).willReturn( true, true, true, true, false); given(columnsResultSet.getString("COLUMN_NAME")).willReturn( @@ -126,13 +123,13 @@ public class TableMetaDataContextTests { final String TABLE = "customers"; final String USER = "me"; - ResultSet metaDataResultSet = mock(ResultSet.class); + ResultSet metaDataResultSet = mock(); given(metaDataResultSet.next()).willReturn(true, false); given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER); given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE); given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE"); - ResultSet columnsResultSet = mock(ResultSet.class); + ResultSet columnsResultSet = mock(); given(columnsResultSet.next()).willReturn(true, false); given(columnsResultSet.getString("COLUMN_NAME")).willReturn("id"); given(columnsResultSet.getInt("DATA_TYPE")).willReturn(Types.INTEGER); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java index f6452be3b1..e596724c30 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java @@ -42,17 +42,17 @@ class JdbcBeanDefinitionReaderTests { void readBeanDefinitionFromMockedDataSource() throws Exception { String sql = "SELECT NAME AS NAME, PROPERTY AS PROPERTY, VALUE AS VALUE FROM T"; - Connection connection = mock(Connection.class); - DataSource dataSource = mock(DataSource.class); + Connection connection = mock(); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); - ResultSet resultSet = mock(ResultSet.class); + ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getString(1)).willReturn("one", "one"); given(resultSet.getString(2)).willReturn("(class)", "age"); given(resultSet.getString(3)).willReturn("org.springframework.beans.testfixture.beans.TestBean", "53"); - Statement statement = mock(Statement.class); + Statement statement = mock(); given(statement.executeQuery(sql)).willReturn(resultSet); given(connection.createStatement()).willReturn(statement); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java index 8f95cf8d84..25af1852c4 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java @@ -36,7 +36,7 @@ public class JdbcDaoSupportTests { @Test public void testJdbcDaoSupportWithDataSource() throws Exception { - DataSource ds = mock(DataSource.class); + DataSource ds = mock(); final List test = new ArrayList<>(); JdbcDaoSupport dao = new JdbcDaoSupport() { @Override diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java index 1100dd748d..faff7936bd 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java @@ -42,9 +42,9 @@ public class LobSupportTests { @Test public void testCreatingPreparedStatementCallback() throws SQLException { - LobHandler handler = mock(LobHandler.class); - LobCreator creator = mock(LobCreator.class); - PreparedStatement ps = mock(PreparedStatement.class); + LobHandler handler = mock(); + LobCreator creator = mock(); + PreparedStatement ps = mock(); given(handler.getLobCreator()).willReturn(creator); given(ps.executeUpdate()).willReturn(3); @@ -73,7 +73,7 @@ public class LobSupportTests { @Test public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException { - ResultSet rset = mock(ResultSet.class); + ResultSet rset = mock(); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(() -> lobRse.extractData(rset)); @@ -82,7 +82,7 @@ public class LobSupportTests { @Test public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException { - ResultSet rset = mock(ResultSet.class); + ResultSet rset = mock(); given(rset.next()).willReturn(true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); lobRse.extractData(rset); @@ -92,7 +92,7 @@ public class LobSupportTests { @Test public void testAbstractLobStreamingResultSetExtractorMultipleRows() throws SQLException { - ResultSet rset = mock(ResultSet.class); + ResultSet rset = mock(); given(rset.next()).willReturn(true, true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(() -> @@ -103,7 +103,7 @@ public class LobSupportTests { @Test public void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException { - ResultSet rset = mock(ResultSet.class); + ResultSet rset = mock(); given(rset.next()).willReturn(true); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(true); assertThatExceptionOfType(LobRetrievalFailureException.class).isThrownBy(() -> diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index dfd6726839..189d1eaa3a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -63,19 +63,18 @@ import static org.mockito.Mockito.verify; */ public class DataSourceJtaTransactionTests { - private Connection connection; - private DataSource dataSource; - private UserTransaction userTransaction; - private TransactionManager transactionManager; - private Transaction transaction; + private DataSource dataSource = mock(); + + private Connection connection = mock(); + + private UserTransaction userTransaction = mock(); + + private TransactionManager transactionManager = mock(); + + private Transaction transaction = mock(); @BeforeEach public void setup() throws Exception { - connection =mock(Connection.class); - dataSource = mock(DataSource.class); - userTransaction = mock(UserTransaction.class); - transactionManager = mock(TransactionManager.class); - transaction = mock(Transaction.class); given(dataSource.getConnection()).willReturn(connection); } @@ -365,9 +364,9 @@ public class DataSourceJtaTransactionTests { Status.STATUS_ACTIVE); } - final DataSource dataSource = mock(DataSource.class); - final Connection connection1 = mock(Connection.class); - final Connection connection2 = mock(Connection.class); + final DataSource dataSource = mock(); + final Connection connection1 = mock(); + final Connection connection2 = mock(); given(dataSource.getConnection()).willReturn(connection1, connection2); final JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager); @@ -686,14 +685,15 @@ public class DataSourceJtaTransactionTests { } private void doTestJtaTransactionWithIsolationLevelDataSourceRouter(boolean dataSourceLookup) throws Exception { -given( userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); + given(userTransaction.getStatus()) + .willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); - final DataSource dataSource1 = mock(DataSource.class); - final Connection connection1 = mock(Connection.class); + final DataSource dataSource1 = mock(); + final Connection connection1 = mock(); given(dataSource1.getConnection()).willReturn(connection1); - final DataSource dataSource2 = mock(DataSource.class); - final Connection connection2 = mock(Connection.class); + final DataSource dataSource2 = mock(); + final Connection connection2 = mock(); given(dataSource2.getConnection()).willReturn(connection2); final IsolationLevelDataSourceRouter dsToUse = new IsolationLevelDataSourceRouter(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index d8298174cf..842f8343f2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -67,21 +67,18 @@ import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING; * @since 04.07.2003 * @see org.springframework.jdbc.support.JdbcTransactionManagerTests */ -public class DataSourceTransactionManagerTests { +public class DataSourceTransactionManagerTests { - private DataSource ds; + private DataSource ds = mock(); - private Connection con; + private Connection con = mock(); - private DataSourceTransactionManager tm; + private DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); @BeforeEach public void setup() throws Exception { - ds = mock(DataSource.class); - con = mock(Connection.class); given(ds.getConnection()).willReturn(con); - tm = new DataSourceTransactionManager(ds); } @AfterEach @@ -515,8 +512,8 @@ public class DataSourceTransactionManagerTests { @Test public void testParticipatingTransactionWithDifferentConnectionObtainedFromSynch() throws Exception { - DataSource ds2 = mock(DataSource.class); - final Connection con2 = mock(Connection.class); + DataSource ds2 = mock(); + final Connection con2 = mock(); given(ds2.getConnection()).willReturn(con2); boolean condition2 = !TransactionSynchronizationManager.hasResource(ds); @@ -651,8 +648,8 @@ public class DataSourceTransactionManagerTests { @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedDataSource() throws Exception { - Connection con2 = mock(Connection.class); - final DataSource ds2 = mock(DataSource.class); + Connection con2 = mock(); + final DataSource ds2 = mock(); given(ds2.getConnection()).willReturn(con2); final TransactionTemplate tt = new TransactionTemplate(tm); @@ -705,7 +702,7 @@ public class DataSourceTransactionManagerTests { @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource() throws Exception { - final DataSource ds2 = mock(DataSource.class); + final DataSource ds2 = mock(); SQLException failure = new SQLException(); given(ds2.getConnection()).willThrow(failure); @@ -857,8 +854,8 @@ public class DataSourceTransactionManagerTests { @Test public void testPropagationSupportsAndRequiresNewWithEarlyAccess() throws Exception { - final Connection con1 = mock(Connection.class); - final Connection con2 = mock(Connection.class); + final Connection con1 = mock(); + final Connection con2 = mock(); given(ds.getConnection()).willReturn(con1, con2); final @@ -936,7 +933,7 @@ public class DataSourceTransactionManagerTests { tm.setEnforceReadOnly(true); given(con.getAutoCommit()).willReturn(true); - Statement stmt = mock(Statement.class); + Statement stmt = mock(); given(con.createStatement()).willReturn(stmt); TransactionTemplate tt = new TransactionTemplate(tm); @@ -970,7 +967,7 @@ public class DataSourceTransactionManagerTests { @ValueSource(ints = {1, 10}) @EnabledForTestGroups(LONG_RUNNING) public void transactionWithTimeout(int timeout) throws Exception { - PreparedStatement ps = mock(PreparedStatement.class); + PreparedStatement ps = mock(); given(con.getAutoCommit()).willReturn(true); given(con.prepareStatement("some SQL statement")).willReturn(ps); @@ -1342,8 +1339,8 @@ public class DataSourceTransactionManagerTests { } private void doTestExistingTransactionWithPropagationNested(final int count) throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1391,8 +1388,8 @@ public class DataSourceTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1438,8 +1435,8 @@ public class DataSourceTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRequiredRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1498,8 +1495,8 @@ public class DataSourceTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRequiredRollbackOnly() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1558,8 +1555,8 @@ public class DataSourceTransactionManagerTests { @Test public void testExistingTransactionWithManualSavepoint() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1592,8 +1589,8 @@ public class DataSourceTransactionManagerTests { @Test public void testExistingTransactionWithManualSavepointAndRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java index 399b6894bc..06e1a9571d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceUtilsTests.java @@ -38,7 +38,7 @@ class DataSourceUtilsTests { @Test void testConnectionNotAcquiredExceptionIsPropagated() throws SQLException { - DataSource dataSource = mock(DataSource.class); + DataSource dataSource = mock(); when(dataSource.getConnection()).thenReturn(null); assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) .isInstanceOf(CannotGetJdbcConnectionException.class) @@ -48,7 +48,7 @@ class DataSourceUtilsTests { @Test void testConnectionSQLExceptionIsPropagated() throws SQLException { - DataSource dataSource = mock(DataSource.class); + DataSource dataSource = mock(); when(dataSource.getConnection()).thenThrow(new SQLException("my dummy exception")); assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) .isInstanceOf(CannotGetJdbcConnectionException.class) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java index 94a1e1a79d..113765b462 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java @@ -36,20 +36,20 @@ import static org.mockito.Mockito.verify; */ public class DelegatingDataSourceTests { - private final DataSource delegate = mock(DataSource.class); + private final DataSource delegate = mock(); private DelegatingDataSource dataSource = new DelegatingDataSource(delegate); @Test public void shouldDelegateGetConnection() throws Exception { - Connection connection = mock(Connection.class); + Connection connection = mock(); given(delegate.getConnection()).willReturn(connection); assertThat(dataSource.getConnection()).isEqualTo(connection); } @Test public void shouldDelegateGetConnectionWithUsernameAndPassword() throws Exception { - Connection connection = mock(Connection.class); + Connection connection = mock(); String username = "username"; String password = "password"; given(delegate.getConnection(username, password)).willReturn(connection); @@ -86,7 +86,7 @@ public class DelegatingDataSourceTests { @Test public void shouldDelegateUnwrapWithoutImplementing() throws Exception { - ExampleWrapper wrapper = mock(ExampleWrapper.class); + ExampleWrapper wrapper = mock(); given(delegate.unwrap(ExampleWrapper.class)).willReturn(wrapper); assertThat(dataSource.unwrap(ExampleWrapper.class)).isEqualTo(wrapper); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index 3b5ecbe893..e77a4cec2c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; */ public class DriverManagerDataSourceTests { - private Connection connection = mock(Connection.class); + private Connection connection = mock(); @Test public void testStandardUsage() throws Exception { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java index ff047ccf8b..eaff789590 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java @@ -35,8 +35,8 @@ public class UserCredentialsDataSourceAdapterTests { @Test public void testStaticCredentials() throws SQLException { - DataSource dataSource = mock(DataSource.class); - Connection connection = mock(Connection.class); + DataSource dataSource = mock(); + Connection connection = mock(); given(dataSource.getConnection("user", "pw")).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); @@ -48,8 +48,8 @@ public class UserCredentialsDataSourceAdapterTests { @Test public void testNoCredentials() throws SQLException { - DataSource dataSource = mock(DataSource.class); - Connection connection = mock(Connection.class); + DataSource dataSource = mock(); + Connection connection = mock(); given(dataSource.getConnection()).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); adapter.setTargetDataSource(dataSource); @@ -58,8 +58,8 @@ public class UserCredentialsDataSourceAdapterTests { @Test public void testThreadBoundCredentials() throws SQLException { - DataSource dataSource = mock(DataSource.class); - Connection connection = mock(Connection.class); + DataSource dataSource = mock(); + Connection connection = mock(); given(dataSource.getConnection("user", "pw")).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java index 8c6c681455..788bf51010 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java @@ -169,7 +169,7 @@ abstract class AbstractDatabasePopulatorTests extends AbstractDatabaseInitializa void usesBoundConnectionIfAvailable() throws SQLException { TransactionSynchronizationManager.initSynchronization(); Connection connection = DataSourceUtils.getConnection(db); - DatabasePopulator populator = mock(DatabasePopulator.class); + DatabasePopulator populator = mock(); DatabasePopulatorUtils.execute(populator, db); verify(populator).populate(connection); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulatorTests.java index 0745c5cada..f9b52cfb25 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulatorTests.java @@ -36,11 +36,11 @@ import static org.mockito.Mockito.verify; */ class CompositeDatabasePopulatorTests { - private final Connection mockedConnection = mock(Connection.class); + private final Connection mockedConnection = mock(); - private final DatabasePopulator mockedDatabasePopulator1 = mock(DatabasePopulator.class); + private final DatabasePopulator mockedDatabasePopulator1 = mock(); - private final DatabasePopulator mockedDatabasePopulator2 = mock(DatabasePopulator.class); + private final DatabasePopulator mockedDatabasePopulator2 = mock(); @Test diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulatorUnitTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulatorUnitTests.java index f01c7c0901..631e9fd09f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulatorUnitTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulatorUnitTests.java @@ -33,9 +33,9 @@ import static org.mockito.BDDMockito.mock; */ class ResourceDatabasePopulatorUnitTests { - private static final Resource script1 = mock(Resource.class); - private static final Resource script2 = mock(Resource.class); - private static final Resource script3 = mock(Resource.class); + private static final Resource script1 = mock(); + private static final Resource script2 = mock(); + private static final Resource script3 = mock(); @Test diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java index 5c6a203b49..58378d3613 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java @@ -41,7 +41,7 @@ public class BeanFactoryDataSourceLookupTests { @Test public void testLookupSunnyDay() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); StubDataSource expectedDataSource = new StubDataSource(); given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willReturn(expectedDataSource); @@ -56,7 +56,7 @@ public class BeanFactoryDataSourceLookupTests { @Test public void testLookupWhereBeanFactoryYieldsNonDataSourceType() throws Exception { - final BeanFactory beanFactory = mock(BeanFactory.class); + final BeanFactory beanFactory = mock(); given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willThrow( new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java index 010add2dc9..e6c5fef24f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java @@ -54,14 +54,14 @@ public class BatchSqlUpdateTests { final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - Connection connection = mock(Connection.class); - DataSource dataSource = mock(DataSource.class); + Connection connection = mock(); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); - PreparedStatement preparedStatement = mock(PreparedStatement.class); + PreparedStatement preparedStatement = mock(); given(preparedStatement.getConnection()).willReturn(connection); given(preparedStatement.executeBatch()).willReturn(rowsAffected); - DatabaseMetaData mockDatabaseMetaData = mock(DatabaseMetaData.class); + DatabaseMetaData mockDatabaseMetaData = mock(); given(mockDatabaseMetaData.supportsBatchUpdates()).willReturn(true); given(connection.prepareStatement(sql)).willReturn(preparedStatement); given(connection.getMetaData()).willReturn(mockDatabaseMetaData); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java index 62ee26896a..fed63cefaa 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java @@ -50,24 +50,21 @@ public class GenericSqlQueryTests { private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED = "select id, forename from custmr where id = ? and country = ?"; - private DefaultListableBeanFactory beanFactory; - private Connection connection; + private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - private PreparedStatement preparedStatement; + private Connection connection = mock(); - private ResultSet resultSet; + private PreparedStatement preparedStatement = mock(); + + private ResultSet resultSet = mock(); @BeforeEach public void setUp() throws Exception { - this.beanFactory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions( new ClassPathResource("org/springframework/jdbc/object/GenericSqlQueryTests-context.xml")); - DataSource dataSource = mock(DataSource.class); - this.connection = mock(Connection.class); - this.preparedStatement = mock(PreparedStatement.class); - this.resultSet = mock(ResultSet.class); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) beanFactory.getBean("dataSource"); testDataSource.setTarget(dataSource); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java index 149c792911..b073596c13 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java @@ -46,10 +46,10 @@ public class GenericStoredProcedureTests { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml")); - Connection connection = mock(Connection.class); - DataSource dataSource = mock(DataSource.class); + Connection connection = mock(); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); - CallableStatement callableStatement = mock(CallableStatement.class); + CallableStatement callableStatement = mock(); TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource"); testDataSource.setTarget(dataSource); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 9b18659c0f..63a8aa3e43 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -85,18 +85,18 @@ public class SqlQueryTests { private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; private static final int[] COLUMN_TYPES = new int[] {Types.INTEGER, Types.VARCHAR}; - private Connection connection; - private DataSource dataSource; - private PreparedStatement preparedStatement; - private ResultSet resultSet; + + private Connection connection = mock(); + + private DataSource dataSource = mock(); + + private PreparedStatement preparedStatement = mock(); + + private ResultSet resultSet = mock(); @BeforeEach public void setUp() throws Exception { - this.connection = mock(Connection.class); - this.dataSource = mock(DataSource.class); - this.preparedStatement = mock(PreparedStatement.class); - this.resultSet = mock(ResultSet.class); given(this.dataSource.getConnection()).willReturn(this.connection); given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement); given(preparedStatement.executeQuery()).willReturn(resultSet); @@ -273,8 +273,8 @@ public class SqlQueryTests { @Test public void testFindCustomerMixed() throws SQLException { reset(connection); - PreparedStatement preparedStatement2 = mock(PreparedStatement.class); - ResultSet resultSet2 = mock(ResultSet.class); + PreparedStatement preparedStatement2 = mock(); + ResultSet resultSet2 = mock(); given(preparedStatement2.executeQuery()).willReturn(resultSet2); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 6b1f0ab3a5..b0a7150dae 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -70,24 +70,20 @@ public class SqlUpdateTests { private static final String INSERT_GENERATE_KEYS = "insert into show (name) values(?)"; - private DataSource dataSource; - private Connection connection; + private Connection connection = mock(); - private PreparedStatement preparedStatement; + private DataSource dataSource = mock(); - private ResultSet resultSet; + private PreparedStatement preparedStatement = mock(); - private ResultSetMetaData resultSetMetaData; + private ResultSet resultSet = mock(); + + private ResultSetMetaData resultSetMetaData = mock(); @BeforeEach public void setUp() throws Exception { - dataSource = mock(DataSource.class); - connection = mock(Connection.class); - preparedStatement = mock(PreparedStatement.class); - resultSet = mock(ResultSet.class); - resultSetMetaData = mock(ResultSetMetaData.class); given(dataSource.getConnection()).willReturn(connection); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index e946eb2fe2..eb20b5c8d2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -66,17 +66,17 @@ import static org.mockito.Mockito.verify; */ public class StoredProcedureTests { - private DataSource dataSource; - private Connection connection; - private CallableStatement callableStatement; + private Connection connection = mock(); + + private DataSource dataSource = mock(); + + private CallableStatement callableStatement = mock(); private boolean verifyClosedAfter = true; + @BeforeEach public void setup() throws Exception { - dataSource = mock(DataSource.class); - connection = mock(Connection.class); - callableStatement = mock(CallableStatement.class); given(dataSource.getConnection()).willReturn(connection); given(callableStatement.getConnection()).willReturn(connection); } @@ -251,7 +251,7 @@ public class StoredProcedureTests { @Test public void testStoredProcedureWithResultSet() throws Exception { - ResultSet resultSet = mock(ResultSet.class); + ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(callableStatement.execute()).willReturn(true); given(callableStatement.getUpdateCount()).willReturn(-1); @@ -267,7 +267,7 @@ public class StoredProcedureTests { @Test @SuppressWarnings("unchecked") public void testStoredProcedureWithResultSetMapped() throws Exception { - ResultSet resultSet = mock(ResultSet.class); + ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getString(2)).willReturn("Foo", "Bar"); given(callableStatement.execute()).willReturn(true); @@ -286,16 +286,16 @@ public class StoredProcedureTests { @Test @SuppressWarnings("unchecked") public void testStoredProcedureWithUndeclaredResults() throws Exception { - ResultSet resultSet1 = mock(ResultSet.class); + ResultSet resultSet1 = mock(); given(resultSet1.next()).willReturn(true, true, false); given(resultSet1.getString(2)).willReturn("Foo", "Bar"); - ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); + ResultSetMetaData resultSetMetaData = mock(); given(resultSetMetaData.getColumnCount()).willReturn(2); given(resultSetMetaData.getColumnLabel(1)).willReturn("spam"); given(resultSetMetaData.getColumnLabel(2)).willReturn("eggs"); - ResultSet resultSet2 = mock(ResultSet.class); + ResultSet resultSet2 = mock(); given(resultSet2.getMetaData()).willReturn(resultSetMetaData); given(resultSet2.next()).willReturn(true, false); given(resultSet2.getObject(1)).willReturn("Spam"); @@ -345,7 +345,7 @@ public class StoredProcedureTests { @Test @SuppressWarnings("unchecked") public void testStoredProcedureSkippingUndeclaredResults() throws Exception { - ResultSet resultSet = mock(ResultSet.class); + ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getString(2)).willReturn("Foo", "Bar"); given(callableStatement.execute()).willReturn(true); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java index f10f949dc6..d5a0df1c15 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java @@ -41,9 +41,9 @@ import static org.mockito.Mockito.verify; */ class DatabaseStartupValidatorTests { - private final DataSource dataSource = mock(DataSource.class); + private final DataSource dataSource = mock(); - private final Connection connection = mock(Connection.class); + private final Connection connection = mock(); private final DatabaseStartupValidator validator = new DatabaseStartupValidator(); @@ -103,7 +103,7 @@ class DatabaseStartupValidatorTests { @SuppressWarnings("deprecation") void useValidationQueryInsteadOfIsValid() throws Exception { String validationQuery = "SELECT NOW() FROM DUAL"; - Statement statement = mock(Statement.class); + Statement statement = mock(); given(connection.createStatement()).willReturn(statement); given(statement.execute(validationQuery)).willReturn(true); @@ -120,7 +120,7 @@ class DatabaseStartupValidatorTests { @SuppressWarnings("deprecation") void shouldExecuteValidationTwiceOnError() throws Exception { String validationQuery = "SELECT NOW() FROM DUAL"; - Statement statement = mock(Statement.class); + Statement statement = mock(); given(connection.createStatement()).willReturn(statement); given(statement.execute(validationQuery)) .willThrow(new SQLException("Test")) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java index 6343ffad42..15c80bb03c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java @@ -40,9 +40,9 @@ import static org.mockito.Mockito.verify; */ public class DefaultLobHandlerTests { - private ResultSet rs = mock(ResultSet.class); + private ResultSet rs = mock(); - private PreparedStatement ps = mock(PreparedStatement.class); + private PreparedStatement ps = mock(); private LobHandler lobHandler = new DefaultLobHandler(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java index a3deb9a1a9..fba771c539 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java @@ -75,19 +75,16 @@ import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING; */ public class JdbcTransactionManagerTests { - private DataSource ds; + private DataSource ds = mock(); - private Connection con; + private Connection con = mock(); - private JdbcTransactionManager tm; + private JdbcTransactionManager tm = new JdbcTransactionManager(ds); @BeforeEach public void setup() throws Exception { - ds = mock(DataSource.class); - con = mock(Connection.class); given(ds.getConnection()).willReturn(con); - tm = new JdbcTransactionManager(ds); } @AfterEach @@ -491,8 +488,8 @@ public class JdbcTransactionManagerTests { @Test public void testParticipatingTransactionWithDifferentConnectionObtainedFromSynch() throws Exception { - DataSource ds2 = mock(DataSource.class); - final Connection con2 = mock(Connection.class); + DataSource ds2 = mock(); + final Connection con2 = mock(); given(ds2.getConnection()).willReturn(con2); assertThat(!TransactionSynchronizationManager.hasResource(ds)).as("Hasn't thread connection").isTrue(); @@ -615,8 +612,8 @@ public class JdbcTransactionManagerTests { @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedDataSource() throws Exception { - Connection con2 = mock(Connection.class); - final DataSource ds2 = mock(DataSource.class); + Connection con2 = mock(); + final DataSource ds2 = mock(); given(ds2.getConnection()).willReturn(con2); final TransactionTemplate tt = new TransactionTemplate(tm); @@ -664,7 +661,7 @@ public class JdbcTransactionManagerTests { @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource() throws Exception { - final DataSource ds2 = mock(DataSource.class); + final DataSource ds2 = mock(); SQLException failure = new SQLException(); given(ds2.getConnection()).willThrow(failure); @@ -800,8 +797,8 @@ public class JdbcTransactionManagerTests { @Test public void testPropagationSupportsAndRequiresNewWithEarlyAccess() throws Exception { - final Connection con1 = mock(Connection.class); - final Connection con2 = mock(Connection.class); + final Connection con1 = mock(); + final Connection con2 = mock(); given(ds.getConnection()).willReturn(con1, con2); final @@ -874,7 +871,7 @@ public class JdbcTransactionManagerTests { tm.setEnforceReadOnly(true); given(con.getAutoCommit()).willReturn(true); - Statement stmt = mock(Statement.class); + Statement stmt = mock(); given(con.createStatement()).willReturn(stmt); TransactionTemplate tt = new TransactionTemplate(tm); @@ -906,7 +903,7 @@ public class JdbcTransactionManagerTests { @ValueSource(ints = {1, 10}) @EnabledForTestGroups(LONG_RUNNING) public void transactionWithTimeout(int timeout) throws Exception { - PreparedStatement ps = mock(PreparedStatement.class); + PreparedStatement ps = mock(); given(con.getAutoCommit()).willReturn(true); given(con.prepareStatement("some SQL statement")).willReturn(ps); @@ -1334,8 +1331,8 @@ public class JdbcTransactionManagerTests { } private void doTestExistingTransactionWithPropagationNested(final int count) throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1377,8 +1374,8 @@ public class JdbcTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1418,8 +1415,8 @@ public class JdbcTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRequiredRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1470,8 +1467,8 @@ public class JdbcTransactionManagerTests { @Test public void testExistingTransactionWithPropagationNestedAndRequiredRollbackOnly() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1522,8 +1519,8 @@ public class JdbcTransactionManagerTests { @Test public void testExistingTransactionWithManualSavepoint() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); @@ -1553,8 +1550,8 @@ public class JdbcTransactionManagerTests { @Test public void testExistingTransactionWithManualSavepointAndRollback() throws Exception { - DatabaseMetaData md = mock(DatabaseMetaData.class); - Savepoint sp = mock(Savepoint.class); + DatabaseMetaData md = mock(); + Savepoint sp = mock(); given(md.supportsSavepoints()).willReturn(true); given(con.getMetaData()).willReturn(md); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java index d185cfaa74..0baa25275e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java @@ -189,16 +189,16 @@ public class SQLErrorCodeSQLExceptionTranslatorTests { SQLException connectionException = new SQLException(); SQLException duplicateKeyException = new SQLException("test", "", 1); - DataSource dataSource = mock(DataSource.class); + DataSource dataSource = mock(); given(dataSource.getConnection()).willThrow(connectionException); SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator(dataSource); assertThat(sext.translate("test", null, duplicateKeyException)).isNull(); - DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + DatabaseMetaData databaseMetaData = mock(); given(databaseMetaData.getDatabaseProductName()).willReturn("Oracle"); - Connection connection = mock(Connection.class); + Connection connection = mock(); given(connection.getMetaData()).willReturn(databaseMetaData); Mockito.reset(dataSource); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index cd3d78c3a4..e41fdba029 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -235,8 +235,8 @@ public class SQLErrorCodesFactoryTests { @Test public void testDataSourceWithNullMetadata() throws Exception { - Connection connection = mock(Connection.class); - DataSource dataSource = mock(DataSource.class); + Connection connection = mock(); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource); @@ -253,7 +253,7 @@ public class SQLErrorCodesFactoryTests { public void testGetFromDataSourceWithSQLException() throws Exception { SQLException expectedSQLException = new SQLException(); - DataSource dataSource = mock(DataSource.class); + DataSource dataSource = mock(); given(dataSource.getConnection()).willThrow(expectedSQLException); SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource); @@ -264,13 +264,13 @@ public class SQLErrorCodesFactoryTests { } private SQLErrorCodes getErrorCodesFromDataSource(String productName, SQLErrorCodesFactory factory) throws Exception { - DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + DatabaseMetaData databaseMetaData = mock(); given(databaseMetaData.getDatabaseProductName()).willReturn(productName); - Connection connection = mock(Connection.class); + Connection connection = mock(); given(connection.getMetaData()).willReturn(databaseMetaData); - DataSource dataSource = mock(DataSource.class); + DataSource dataSource = mock(); given(dataSource.getConnection()).willReturn(connection); SQLErrorCodesFactory secf = (factory != null ? factory : SQLErrorCodesFactory.getInstance()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementerTests.java index 6e99fe8b34..acf6226744 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/DataFieldMaxValueIncrementerTests.java @@ -41,13 +41,13 @@ import static org.mockito.Mockito.verify; */ class DataFieldMaxValueIncrementerTests { - private final DataSource dataSource = mock(DataSource.class); + private final DataSource dataSource = mock(); - private final Connection connection = mock(Connection.class); + private final Connection connection = mock(); - private final Statement statement = mock(Statement.class); + private final Statement statement = mock(); - private final ResultSet resultSet = mock(ResultSet.class); + private final ResultSet resultSet = mock(); @Test diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java index 06ca494659..69350a2aac 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java @@ -25,7 +25,6 @@ import java.sql.SQLException; import java.sql.Time; import java.sql.Timestamp; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.jdbc.InvalidResultSetAccessException; @@ -40,16 +39,9 @@ import static org.mockito.Mockito.mock; */ public class ResultSetWrappingRowSetTests { - private ResultSet resultSet; + private ResultSet resultSet = mock(); - private ResultSetWrappingSqlRowSet rowSet; - - - @BeforeEach - public void setup() throws Exception { - resultSet = mock(ResultSet.class); - rowSet = new ResultSetWrappingSqlRowSet(resultSet); - } + private ResultSetWrappingSqlRowSet rowSet = new ResultSetWrappingSqlRowSet(resultSet); @Test diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java index bb3840f1a6..bf09d2cb87 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java @@ -19,7 +19,6 @@ package org.springframework.jms.annotation; import java.lang.reflect.Method; import jakarta.jms.JMSException; -import jakarta.jms.Session; import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; @@ -172,7 +171,7 @@ abstract class AbstractJmsAnnotationDrivenTests { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(); endpoint.setupListenerContainer(container); MessagingMessageListenerAdapter listener = (MessagingMessageListenerAdapter) container.getMessageListener(); - listener.onMessage(new StubTextMessage("failValidation"), mock(Session.class)); + listener.onMessage(new StubTextMessage("failValidation"), mock()); } /** diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java index 2c893899c7..70e9f51eb8 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java @@ -204,7 +204,7 @@ class JmsListenerAnnotationBeanPostProcessorTests { @Bean public PlatformTransactionManager transactionManager() { - return mock(PlatformTransactionManager.class); + return mock(); } } diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java index b84fb7060c..259e8bb867 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java @@ -127,7 +127,7 @@ public class JmsListenerContainerFactoryIntegrationTests { DefaultMessageListenerContainer messageListenerContainer = containerFactory.createListenerContainer(endpoint); Object listener = messageListenerContainer.getMessageListener(); if (listener instanceof SessionAwareMessageListener) { - ((SessionAwareMessageListener) listener).onMessage(message, mock(Session.class)); + ((SessionAwareMessageListener) listener).onMessage(message, mock()); } else { ((MessageListener) listener).onMessage(message); diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java index 1f67d793d6..af5f859a78 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java @@ -54,7 +54,7 @@ public class JmsListenerContainerFactoryTests { private final MessageConverter messageConverter = new SimpleMessageConverter(); - private final TransactionManager transactionManager = mock(TransactionManager.class); + private final TransactionManager transactionManager = mock(); @Test diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java index 0f66f2393a..e4a150c5b1 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java @@ -100,7 +100,7 @@ public class JmsListenerEndpointTests { @Test public void setupMessageContainerUnsupportedContainer() { - MessageListenerContainer container = mock(MessageListenerContainer.class); + MessageListenerContainer container = mock(); SimpleJmsListenerEndpoint endpoint = new SimpleJmsListenerEndpoint(); endpoint.setMessageListener(new MessageListenerAdapter()); diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java index 4744a0ddf9..5e67458301 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java @@ -181,21 +181,21 @@ public class JmsNamespaceHandlerTests { assertThat(testBean2.getName()).isNull(); assertThat(testBean3.message).isNull(); - TextMessage message1 = mock(TextMessage.class); + TextMessage message1 = mock(); given(message1.getText()).willReturn("Test1"); MessageListener listener1 = getListener("listener1"); listener1.onMessage(message1); assertThat(testBean1.getName()).isEqualTo("Test1"); - TextMessage message2 = mock(TextMessage.class); + TextMessage message2 = mock(); given(message2.getText()).willReturn("Test2"); MessageListener listener2 = getListener("listener2"); listener2.onMessage(message2); assertThat(testBean2.getName()).isEqualTo("Test2"); - TextMessage message3 = mock(TextMessage.class); + TextMessage message3 = mock(); MessageListener listener3 = getListener(DefaultMessageListenerContainer.class.getName() + "#0"); listener3.onMessage(message3); diff --git a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java index d63495f464..5d1dd532ac 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java @@ -113,8 +113,8 @@ class MethodJmsListenerEndpointTests { @Test void setExtraCollaborators() { - MessageConverter messageConverter = mock(MessageConverter.class); - DestinationResolver destinationResolver = mock(DestinationResolver.class); + MessageConverter messageConverter = mock(); + DestinationResolver destinationResolver = mock(); this.container.setMessageConverter(messageConverter); this.container.setDestinationResolver(destinationResolver); @@ -129,7 +129,7 @@ class MethodJmsListenerEndpointTests { void resolveMessageAndSession() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(jakarta.jms.Message.class, Session.class); - Session session = mock(Session.class); + Session session = mock(); listener.onMessage(createSimpleJmsTextMessage("test"), session); assertDefaultListenerMethodInvocation(); } @@ -138,7 +138,7 @@ class MethodJmsListenerEndpointTests { void resolveGenericMessage() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(Message.class); - Session session = mock(Session.class); + Session session = mock(); listener.onMessage(createSimpleJmsTextMessage("test"), session); assertDefaultListenerMethodInvocation(); } @@ -147,7 +147,7 @@ class MethodJmsListenerEndpointTests { void resolveHeaderAndPayload() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(String.class, int.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setIntProperty("myCounter", 55); listener.onMessage(message, session); @@ -158,7 +158,7 @@ class MethodJmsListenerEndpointTests { void resolveCustomHeaderNameAndPayload() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(String.class, int.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setIntProperty("myCounter", 24); listener.onMessage(message, session); @@ -169,7 +169,7 @@ class MethodJmsListenerEndpointTests { void resolveCustomHeaderNameAndPayloadWithHeaderNameSet() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(String.class, int.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setIntProperty("myCounter", 24); listener.onMessage(message, session); @@ -180,7 +180,7 @@ class MethodJmsListenerEndpointTests { void resolveHeaders() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(String.class, Map.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setIntProperty("customInt", 1234); message.setJMSMessageID("abcd-1234"); @@ -192,7 +192,7 @@ class MethodJmsListenerEndpointTests { void resolveMessageHeaders() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(MessageHeaders.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setLongProperty("customLong", 4567L); message.setJMSType("myMessageType"); @@ -204,7 +204,7 @@ class MethodJmsListenerEndpointTests { void resolveJmsMessageHeaderAccessor() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(JmsMessageHeaderAccessor.class); - Session session = mock(Session.class); + Session session = mock(); StubTextMessage message = createSimpleJmsTextMessage("my payload"); message.setBooleanProperty("customBoolean", true); message.setJMSPriority(9); @@ -218,8 +218,8 @@ class MethodJmsListenerEndpointTests { MyBean myBean = new MyBean(); myBean.name = "myBean name"; - Session session = mock(Session.class); - ObjectMessage message = mock(ObjectMessage.class); + Session session = mock(); + ObjectMessage message = mock(); given(message.getObject()).willReturn(myBean); listener.onMessage(message, session); @@ -230,7 +230,7 @@ class MethodJmsListenerEndpointTests { void resolveConvertedPayload() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(Integer.class); - Session session = mock(Session.class); + Session session = mock(); listener.onMessage(createSimpleJmsTextMessage("33"), session); assertDefaultListenerMethodInvocation(); @@ -243,9 +243,9 @@ class MethodJmsListenerEndpointTests { String correlationId = "link-1234"; Destination replyDestination = new Destination() {}; - TextMessage reply = mock(TextMessage.class); - QueueSender queueSender = mock(QueueSender.class); - Session session = mock(Session.class); + TextMessage reply = mock(); + QueueSender queueSender = mock(); + Session session = mock(); given(session.createTextMessage(body)).willReturn(reply); given(session.createProducer(replyDestination)).willReturn(queueSender); @@ -346,10 +346,10 @@ class MethodJmsListenerEndpointTests { String correlationId = "link-1234"; Destination replyDestination = new Destination() {}; - DestinationResolver destinationResolver = mock(DestinationResolver.class); - TextMessage reply = mock(TextMessage.class); - QueueSender queueSender = mock(QueueSender.class); - Session session = mock(Session.class); + DestinationResolver destinationResolver = mock(); + TextMessage reply = mock(); + QueueSender queueSender = mock(); + Session session = mock(); given(destinationResolver.resolveDestinationName(session, replyDestinationName, pubSubDomain)) .willReturn(replyDestination); @@ -377,8 +377,8 @@ class MethodJmsListenerEndpointTests { void emptySendTo() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(String.class); - TextMessage reply = mock(TextMessage.class); - Session session = mock(Session.class); + TextMessage reply = mock(); + Session session = mock(); given(session.createTextMessage("content")).willReturn(reply); assertThatExceptionOfType(ReplyFailureException.class).isThrownBy(() -> @@ -404,7 +404,7 @@ class MethodJmsListenerEndpointTests { Method method = getListenerMethod(methodName, String.class); MessagingMessageListenerAdapter listener = createInstance(customFactory, method); - Session session = mock(Session.class); + Session session = mock(); listener.onMessage(createSimpleJmsTextMessage("test"), session); // test is a valid value assertListenerMethodInvocation(this.sample, methodName); } @@ -416,7 +416,7 @@ class MethodJmsListenerEndpointTests { Method method = getListenerMethod("validatePayload", String.class); MessagingMessageListenerAdapter listener = createInstance(customFactory, method); - Session session = mock(Session.class); + Session session = mock(); // test is an invalid value assertThatExceptionOfType(ListenerExecutionFailedException.class).isThrownBy(() -> @@ -429,7 +429,7 @@ class MethodJmsListenerEndpointTests { @Test void invalidPayloadType() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(Integer.class); - Session session = mock(Session.class); + Session session = mock(); // test is not a valid integer assertThatExceptionOfType(ListenerExecutionFailedException.class).isThrownBy(() -> @@ -441,7 +441,7 @@ class MethodJmsListenerEndpointTests { @Test void invalidMessagePayloadType() throws JMSException { MessagingMessageListenerAdapter listener = createDefaultInstance(Message.class); - Session session = mock(Session.class); + Session session = mock(); // Message as Message assertThatExceptionOfType(ListenerExecutionFailedException.class).isThrownBy(() -> diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java index 3b9897df3f..8c24cf86c3 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java @@ -59,9 +59,9 @@ public class JmsTransactionManagerTests { @Test public void testTransactionCommit() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -82,9 +82,9 @@ public class JmsTransactionManagerTests { @Test public void testTransactionRollback() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -105,9 +105,9 @@ public class JmsTransactionManagerTests { @Test public void testParticipatingTransactionWithCommit() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -138,9 +138,9 @@ public class JmsTransactionManagerTests { @Test public void testParticipatingTransactionWithRollbackOnly() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -173,10 +173,10 @@ public class JmsTransactionManagerTests { @Test public void testSuspendedTransaction() throws JMSException { - final ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); - final Session session2 = mock(Session.class); + final ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); + final Session session2 = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -214,10 +214,10 @@ public class JmsTransactionManagerTests { @Test public void testTransactionSuspension() throws JMSException { - final ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); - final Session session2 = mock(Session.class); + final ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); + final Session session2 = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session, session2); @@ -257,11 +257,11 @@ public class JmsTransactionManagerTests { public void testTransactionCommitWithMessageProducer() throws JMSException { Destination dest = new StubQueue(); - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - Session session = mock(Session.class); - MessageProducer producer = mock(MessageProducer.class); - final Message message = mock(Message.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + Session session = mock(); + MessageProducer producer = mock(); + final Message message = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(session); @@ -283,9 +283,9 @@ public class JmsTransactionManagerTests { @Test public void testLazyTransactionalSession() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - final Session session = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + final Session session = mock(); JmsTransactionManager tm = new JmsTransactionManager(cf); tm.setLazyResourceRetrieval(true); @@ -308,7 +308,7 @@ public class JmsTransactionManagerTests { @Test public void testLazyWithoutSessionAccess() { - ConnectionFactory cf = mock(ConnectionFactory.class); + ConnectionFactory cf = mock(); JmsTransactionManager tm = new JmsTransactionManager(cf); tm.setLazyResourceRetrieval(true); diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java index 110ffa2b10..be57336f09 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java @@ -44,7 +44,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnection() throws JMSException { - Connection con = mock(Connection.class); + Connection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); Connection con1 = scf.createConnection(); @@ -65,7 +65,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithQueueConnection() throws JMSException { - Connection con = mock(QueueConnection.class); + QueueConnection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); QueueConnection con1 = scf.createQueueConnection(); @@ -86,7 +86,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithTopicConnection() throws JMSException { - Connection con = mock(TopicConnection.class); + TopicConnection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); TopicConnection con1 = scf.createTopicConnection(); @@ -107,8 +107,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactory() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); + ConnectionFactory cf = mock(); + Connection con = mock(); given(cf.createConnection()).willReturn(con); @@ -129,8 +129,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithQueueConnectionFactoryAndJms11Usage() throws JMSException { - QueueConnectionFactory cf = mock(QueueConnectionFactory.class); - QueueConnection con = mock(QueueConnection.class); + QueueConnectionFactory cf = mock(); + QueueConnection con = mock(); given(cf.createConnection()).willReturn(con); @@ -151,8 +151,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithQueueConnectionFactoryAndJms102Usage() throws JMSException { - QueueConnectionFactory cf = mock(QueueConnectionFactory.class); - QueueConnection con = mock(QueueConnection.class); + QueueConnectionFactory cf = mock(); + QueueConnection con = mock(); given(cf.createQueueConnection()).willReturn(con); @@ -173,8 +173,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithTopicConnectionFactoryAndJms11Usage() throws JMSException { - TopicConnectionFactory cf = mock(TopicConnectionFactory.class); - TopicConnection con = mock(TopicConnection.class); + TopicConnectionFactory cf = mock(); + TopicConnection con = mock(); given(cf.createConnection()).willReturn(con); @@ -195,8 +195,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithTopicConnectionFactoryAndJms102Usage() throws JMSException { - TopicConnectionFactory cf = mock(TopicConnectionFactory.class); - TopicConnection con = mock(TopicConnection.class); + TopicConnectionFactory cf = mock(); + TopicConnection con = mock(); given(cf.createTopicConnection()).willReturn(con); @@ -217,7 +217,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionAggregatedStartStop() throws JMSException { - Connection con = mock(Connection.class); + Connection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); Connection con1 = scf.createConnection(); @@ -249,8 +249,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndClientId() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); + ConnectionFactory cf = mock(); + Connection con = mock(); given(cf.createConnection()).willReturn(con); SingleConnectionFactory scf = new SingleConnectionFactory(cf); @@ -272,8 +272,8 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndExceptionListener() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); + ConnectionFactory cf = mock(); + Connection con = mock(); ExceptionListener listener = new ChainedExceptionListener(); given(cf.createConnection()).willReturn(con); @@ -300,7 +300,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndReconnectOnException() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); + ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -320,7 +320,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndExceptionListenerAndReconnectOnException() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); + ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -343,7 +343,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndLocalExceptionListenerWithCleanup() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); + ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -381,7 +381,7 @@ public class SingleConnectionFactoryTests { @Test public void testWithConnectionFactoryAndLocalExceptionListenerWithReconnect() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); + ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -415,10 +415,10 @@ public class SingleConnectionFactoryTests { @Test public void testCachingConnectionFactory() throws JMSException { - ConnectionFactory cf = mock(ConnectionFactory.class); - Connection con = mock(Connection.class); - Session txSession = mock(Session.class); - Session nonTxSession = mock(Session.class); + ConnectionFactory cf = mock(); + Connection con = mock(); + Session txSession = mock(); + Session nonTxSession = mock(); given(cf.createConnection()).willReturn(con); given(con.createSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(txSession); @@ -455,10 +455,10 @@ public class SingleConnectionFactoryTests { @Test public void testCachingConnectionFactoryWithQueueConnectionFactoryAndJms102Usage() throws JMSException { - QueueConnectionFactory cf = mock(QueueConnectionFactory.class); - QueueConnection con = mock(QueueConnection.class); - QueueSession txSession = mock(QueueSession.class); - QueueSession nonTxSession = mock(QueueSession.class); + QueueConnectionFactory cf = mock(); + QueueConnection con = mock(); + QueueSession txSession = mock(); + QueueSession nonTxSession = mock(); given(cf.createQueueConnection()).willReturn(con); given(con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(txSession); @@ -495,10 +495,10 @@ public class SingleConnectionFactoryTests { @Test public void testCachingConnectionFactoryWithTopicConnectionFactoryAndJms102Usage() throws JMSException { - TopicConnectionFactory cf = mock(TopicConnectionFactory.class); - TopicConnection con = mock(TopicConnection.class); - TopicSession txSession = mock(TopicSession.class); - TopicSession nonTxSession = mock(TopicSession.class); + TopicConnectionFactory cf = mock(); + TopicConnection con = mock(); + TopicSession txSession = mock(); + TopicSession nonTxSession = mock(); given(cf.createTopicConnection()).willReturn(con); given(con.createTopicSession(true, Session.AUTO_ACKNOWLEDGE)).willReturn(txSession); diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java index 10b6332946..d00b7b1ac7 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java @@ -89,7 +89,7 @@ public class JmsMessagingTemplateTests { @Test public void payloadConverterIsConsistentConstructor() { - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); given(this.jmsTemplate.getMessageConverter()).willReturn(messageConverter); JmsMessagingTemplate messagingTemplate = new JmsMessagingTemplate(this.jmsTemplate); messagingTemplate.afterPropertiesSet(); @@ -98,7 +98,7 @@ public class JmsMessagingTemplateTests { @Test public void payloadConverterIsConsistentSetter() { - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); given(this.jmsTemplate.getMessageConverter()).willReturn(messageConverter); JmsMessagingTemplate messagingTemplate = new JmsMessagingTemplate(); messagingTemplate.setJmsTemplate(this.jmsTemplate); @@ -108,7 +108,7 @@ public class JmsMessagingTemplateTests { @Test public void customConverterAlwaysTakesPrecedence() { - MessageConverter customMessageConverter = mock(MessageConverter.class); + MessageConverter customMessageConverter = mock(); JmsMessagingTemplate messagingTemplate = new JmsMessagingTemplate(); messagingTemplate.setJmsMessageConverter( new MessagingMessageConverter(customMessageConverter)); @@ -246,7 +246,7 @@ public class JmsMessagingTemplateTests { verify(this.jmsTemplate).send(eq("myQueue"), this.messageCreator.capture()); assertThatExceptionOfType(org.springframework.messaging.converter.MessageConversionException.class).isThrownBy(() -> - this.messageCreator.getValue().createMessage(mock(Session.class))) + this.messageCreator.getValue().createMessage(mock())) .withMessageContaining("Test exception"); } @@ -502,7 +502,7 @@ public class JmsMessagingTemplateTests { @Test public void convertMessageConversionExceptionOnSend() throws JMSException { Message message = createTextMessage(); - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); willThrow(org.springframework.jms.support.converter.MessageConversionException.class) .given(messageConverter).toMessage(eq(message), any()); this.messagingTemplate.setJmsMessageConverter(messageConverter); @@ -515,7 +515,7 @@ public class JmsMessagingTemplateTests { @Test public void convertMessageConversionExceptionOnReceive() throws JMSException { jakarta.jms.Message message = createJmsTextMessage(); - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); willThrow(org.springframework.jms.support.converter.MessageConversionException.class) .given(messageConverter).fromMessage(message); this.messagingTemplate.setJmsMessageConverter(messageConverter); @@ -554,7 +554,7 @@ public class JmsMessagingTemplateTests { @Test public void convertMessageFormatException() throws JMSException { Message message = createTextMessage(); - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); willThrow(MessageFormatException.class).given(messageConverter).toMessage(eq(message), any()); this.messagingTemplate.setJmsMessageConverter(messageConverter); invokeMessageCreator(); @@ -566,7 +566,7 @@ public class JmsMessagingTemplateTests { @Test public void convertMessageNotWritableException() throws JMSException { Message message = createTextMessage(); - MessageConverter messageConverter = mock(MessageConverter.class); + MessageConverter messageConverter = mock(); willThrow(MessageNotWriteableException.class).given(messageConverter).toMessage(eq(message), any()); this.messagingTemplate.setJmsMessageConverter(messageConverter); invokeMessageCreator(); @@ -645,7 +645,7 @@ public class JmsMessagingTemplateTests { protected TextMessage createTextMessage(MessageCreator creator) throws JMSException { - Session mock = mock(Session.class); + Session mock = mock(); given(mock.createTextMessage(any())).willAnswer( (Answer) invocation -> new StubTextMessage((String) invocation.getArguments()[0])); diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index e2c5ccf927..724b9748b0 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -25,7 +25,6 @@ import javax.naming.Context; import jakarta.jms.Connection; import jakarta.jms.ConnectionFactory; import jakarta.jms.DeliveryMode; -import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.MessageConsumer; @@ -78,15 +77,15 @@ import static org.mockito.Mockito.verify; */ class JmsTemplateTests { - private Context jndiContext; + private Context jndiContext = mock(); - private ConnectionFactory connectionFactory; + private ConnectionFactory connectionFactory = mock(); - protected Connection connection; + protected Connection connection = mock(); - private Session session; + private Session session = mock(); - private Destination queue; + private Queue queue = mock(); private QosSettings qosSettings = new QosSettings(DeliveryMode.PERSISTENT, 9, 10000); @@ -96,12 +95,6 @@ class JmsTemplateTests { */ @BeforeEach void setupMocks() throws Exception { - this.jndiContext = mock(Context.class); - this.connectionFactory = mock(ConnectionFactory.class); - this.connection = mock(Connection.class); - this.session = mock(Session.class); - this.queue = mock(Queue.class); - given(this.connectionFactory.createConnection()).willReturn(this.connection); given(this.connection.createSession(useTransactedTemplate(), Session.AUTO_ACKNOWLEDGE)).willReturn(this.session); given(this.session.getTransacted()).willReturn(useTransactedSession()); @@ -153,7 +146,7 @@ class JmsTemplateTests { JmsTemplate template = createTemplate(); template.setConnectionFactory(this.connectionFactory); - MessageProducer messageProducer = mock(MessageProducer.class); + MessageProducer messageProducer = mock(); given(this.session.createProducer(null)).willReturn(messageProducer); given(messageProducer.getPriority()).willReturn(4); @@ -175,7 +168,7 @@ class JmsTemplateTests { template.setMessageIdEnabled(false); template.setMessageTimestampEnabled(false); - MessageProducer messageProducer = mock(MessageProducer.class); + MessageProducer messageProducer = mock(); given(this.session.createProducer(null)).willReturn(messageProducer); given(messageProducer.getPriority()).willReturn(4); @@ -354,8 +347,8 @@ class JmsTemplateTests { template.setMessageTimestampEnabled(false); } - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage textMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage textMessage = mock(); given(this.session.createProducer(this.queue)).willReturn(messageProducer); given(this.session.createTextMessage("just testing")).willReturn(textMessage); @@ -404,8 +397,8 @@ class JmsTemplateTests { template.setMessageConverter(new SimpleMessageConverter()); String s = "Hello world"; - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage textMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage textMessage = mock(); given(this.session.createProducer(this.queue)).willReturn(messageProducer); given(this.session.createTextMessage("Hello world")).willReturn(textMessage); @@ -529,7 +522,7 @@ class JmsTemplateTests { } template.setReceiveTimeout(timeout); - MessageConsumer messageConsumer = mock(MessageConsumer.class); + MessageConsumer messageConsumer = mock(); String selectorString = "selector"; given(this.session.createConsumer(this.queue, @@ -541,7 +534,7 @@ class JmsTemplateTests { : Session.AUTO_ACKNOWLEDGE); } - TextMessage textMessage = mock(TextMessage.class); + TextMessage textMessage = mock(); if (testConverter) { given(textMessage.getText()).willReturn("Hello World!"); @@ -650,20 +643,20 @@ class JmsTemplateTests { template.setReceiveTimeout(timeout); Session localSession = getLocalSession(); - TemporaryQueue replyDestination = mock(TemporaryQueue.class); - MessageProducer messageProducer = mock(MessageProducer.class); + TemporaryQueue replyDestination = mock(); + MessageProducer messageProducer = mock(); given(localSession.createProducer(this.queue)).willReturn(messageProducer); given(localSession.createTemporaryQueue()).willReturn(replyDestination); - MessageConsumer messageConsumer = mock(MessageConsumer.class); + MessageConsumer messageConsumer = mock(); given(localSession.createConsumer(replyDestination)).willReturn(messageConsumer); - TextMessage request = mock(TextMessage.class); - MessageCreator messageCreator = mock(MessageCreator.class); + TextMessage request = mock(); + MessageCreator messageCreator = mock(); given(messageCreator.createMessage(localSession)).willReturn(request); - TextMessage reply = mock(TextMessage.class); + TextMessage reply = mock(); if (timeout == JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT) { given(messageConsumer.receiveNoWait()).willReturn(reply); } @@ -766,8 +759,8 @@ class JmsTemplateTests { template.setMessageConverter(new SimpleMessageConverter()); String s = "Hello world"; - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage textMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage textMessage = mock(); reset(this.session); given(this.session.createProducer(this.queue)).willReturn(messageProducer); diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java index e23fe83228..80fd48d294 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java @@ -29,14 +29,13 @@ import static org.mockito.Mockito.mock; */ class JmsTemplateTransactedTests extends JmsTemplateTests { - private Session localSession; + private Session localSession = mock(); @Override @BeforeEach void setupMocks() throws Exception { super.setupMocks(); - this.localSession = mock(Session.class); given(this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE)).willReturn(this.localSession); } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java index aa7910e829..ee9086c51d 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java @@ -35,7 +35,7 @@ class JmsGatewaySupportTests { @Test void testJmsGatewaySupportWithConnectionFactory() throws Exception { - ConnectionFactory mockConnectionFactory = mock(ConnectionFactory.class); + ConnectionFactory mockConnectionFactory = mock(); final List test = new ArrayList<>(1); JmsGatewaySupport gateway = new JmsGatewaySupport() { @Override diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java index c16158153e..6af576620a 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java @@ -43,8 +43,8 @@ public class DefaultMessageListenerContainerTests { @Test public void applyBackOff() { - BackOff backOff = mock(BackOff.class); - BackOffExecution execution = mock(BackOffExecution.class); + BackOff backOff = mock(); + BackOffExecution execution = mock(); given(execution.nextBackOff()).willReturn(BackOffExecution.STOP); given(backOff.start()).willReturn(execution); @@ -62,8 +62,8 @@ public class DefaultMessageListenerContainerTests { @Test public void applyBackOffRetry() { - BackOff backOff = mock(BackOff.class); - BackOffExecution execution = mock(BackOffExecution.class); + BackOff backOff = mock(); + BackOffExecution execution = mock(); given(execution.nextBackOff()).willReturn(50L, BackOffExecution.STOP); given(backOff.start()).willReturn(execution); @@ -79,8 +79,8 @@ public class DefaultMessageListenerContainerTests { @Test public void recoverResetBackOff() { - BackOff backOff = mock(BackOff.class); - BackOffExecution execution = mock(BackOffExecution.class); + BackOff backOff = mock(); + BackOffExecution execution = mock(); given(execution.nextBackOff()).willReturn(50L, 50L, 50L); // 3 attempts max given(backOff.start()).willReturn(execution); @@ -125,7 +125,7 @@ public class DefaultMessageListenerContainerTests { private ConnectionFactory createFailingContainerFactory() { try { - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).will(invocation -> { throw new JMSException("Test exception"); }); @@ -138,7 +138,7 @@ public class DefaultMessageListenerContainerTests { private ConnectionFactory createRecoverableContainerFactory(final int failingAttempts) { try { - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).will(new Answer() { int currentAttempts = 0; @Override @@ -161,8 +161,8 @@ public class DefaultMessageListenerContainerTests { private ConnectionFactory createSuccessfulConnectionFactory() { try { - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); - given(connectionFactory.createConnection()).willReturn(mock(Connection.class)); + ConnectionFactory connectionFactory = mock(); + given(connectionFactory.createConnection()).willReturn(mock()); return connectionFactory; } catch (JMSException ex) { diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java index 9e73146610..00ef7a04bb 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java @@ -94,19 +94,19 @@ public class SimpleMessageListenerContainerTests { @Test public void testContextRefreshedEventDoesNotStartTheConnectionIfAutoStartIsSetToFalse() throws Exception { - MessageConsumer messageConsumer = mock(MessageConsumer.class); - Session session = mock(Session.class); + MessageConsumer messageConsumer = mock(); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... given(session.createConsumer(QUEUE_DESTINATION, null)).willReturn(messageConsumer); // no MessageSelector... - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); this.container.setConnectionFactory(connectionFactory); @@ -125,20 +125,20 @@ public class SimpleMessageListenerContainerTests { @Test public void testContextRefreshedEventStartsTheConnectionByDefault() throws Exception { - MessageConsumer messageConsumer = mock(MessageConsumer.class); - Session session = mock(Session.class); + MessageConsumer messageConsumer = mock(); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... given(session.createConsumer(QUEUE_DESTINATION, null)).willReturn(messageConsumer); // no MessageSelector... - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); this.container.setConnectionFactory(connectionFactory); @@ -159,7 +159,7 @@ public class SimpleMessageListenerContainerTests { public void testCorrectSessionExposedForSessionAwareMessageListenerInvocation() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - final Session session = mock(Session.class); + final Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... @@ -168,13 +168,13 @@ public class SimpleMessageListenerContainerTests { given(session.getTransacted()).willReturn(false); given(session.getAcknowledgeMode()).willReturn(Session.AUTO_ACKNOWLEDGE); - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - final ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + final ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); final Set failure = new HashSet<>(1); @@ -194,7 +194,7 @@ public class SimpleMessageListenerContainerTests { this.container.afterPropertiesSet(); this.container.start(); - final Message message = mock(Message.class); + final Message message = mock(); messageConsumer.sendMessage(message); if (!failure.isEmpty()) { @@ -209,17 +209,17 @@ public class SimpleMessageListenerContainerTests { public void testTaskExecutorCorrectlyInvokedWhenSpecified() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - final Session session = mock(Session.class); + final Session session = mock(); given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); given(session.createConsumer(QUEUE_DESTINATION, null)).willReturn(messageConsumer); // no MessageSelector... given(session.getTransacted()).willReturn(false); given(session.getAcknowledgeMode()).willReturn(Session.AUTO_ACKNOWLEDGE); - Connection connection = mock(Connection.class); + Connection connection = mock(); given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); - final ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + final ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); final TestMessageListener listener = new TestMessageListener(); @@ -236,7 +236,7 @@ public class SimpleMessageListenerContainerTests { this.container.afterPropertiesSet(); this.container.start(); - final Message message = mock(Message.class); + final Message message = mock(); messageConsumer.sendMessage(message); assertThat(listener.executorInvoked).isTrue(); @@ -250,7 +250,7 @@ public class SimpleMessageListenerContainerTests { public void testRegisteredExceptionListenerIsInvokedOnException() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - Session session = mock(Session.class); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... @@ -258,13 +258,13 @@ public class SimpleMessageListenerContainerTests { // an exception is thrown, so the rollback logic is being applied here... given(session.getTransacted()).willReturn(false); - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); final JMSException theException = new JMSException(EXCEPTION_MESSAGE); @@ -275,14 +275,14 @@ public class SimpleMessageListenerContainerTests { throw theException; }); - ExceptionListener exceptionListener = mock(ExceptionListener.class); + ExceptionListener exceptionListener = mock(); this.container.setExceptionListener(exceptionListener); this.container.afterPropertiesSet(); this.container.start(); // manually trigger an Exception with the above bad MessageListener... - final Message message = mock(Message.class); + final Message message = mock(); // a Throwable from a MessageListener MUST simply be swallowed... messageConsumer.sendMessage(message); @@ -297,7 +297,7 @@ public class SimpleMessageListenerContainerTests { public void testRegisteredErrorHandlerIsInvokedOnException() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - Session session = mock(Session.class); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); @@ -306,12 +306,12 @@ public class SimpleMessageListenerContainerTests { // an exception is thrown, so the rollback logic is being applied here... given(session.getTransacted()).willReturn(false); - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); final IllegalStateException theException = new IllegalStateException("intentional test failure"); @@ -322,13 +322,13 @@ public class SimpleMessageListenerContainerTests { throw theException; }); - ErrorHandler errorHandler = mock(ErrorHandler.class); + ErrorHandler errorHandler = mock(); this.container.setErrorHandler(errorHandler); this.container.afterPropertiesSet(); this.container.start(); // manually trigger an Exception with the above bad MessageListener... - Message message = mock(Message.class); + Message message = mock(); // a Throwable from a MessageListener MUST simply be swallowed... messageConsumer.sendMessage(message); @@ -342,7 +342,7 @@ public class SimpleMessageListenerContainerTests { public void testNoRollbackOccursIfSessionIsNotTransactedAndThatExceptionsDo_NOT_Propagate() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - Session session = mock(Session.class); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... @@ -350,13 +350,13 @@ public class SimpleMessageListenerContainerTests { // an exception is thrown, so the rollback logic is being applied here... given(session.getTransacted()).willReturn(false); - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); this.container.setConnectionFactory(connectionFactory); @@ -368,7 +368,7 @@ public class SimpleMessageListenerContainerTests { this.container.start(); // manually trigger an Exception with the above bad MessageListener... - final Message message = mock(Message.class); + final Message message = mock(); // a Throwable from a MessageListener MUST simply be swallowed... messageConsumer.sendMessage(message); @@ -383,7 +383,7 @@ public class SimpleMessageListenerContainerTests { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); - Session session = mock(Session.class); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... @@ -391,13 +391,13 @@ public class SimpleMessageListenerContainerTests { // an exception is thrown, so the rollback logic is being applied here... given(session.getTransacted()).willReturn(true); - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); this.container.setConnectionFactory(connectionFactory); @@ -409,7 +409,7 @@ public class SimpleMessageListenerContainerTests { this.container.start(); // manually trigger an Exception with the above bad MessageListener... - final Message message = mock(Message.class); + final Message message = mock(); // a Throwable from a MessageListener MUST simply be swallowed... messageConsumer.sendMessage(message); @@ -422,20 +422,20 @@ public class SimpleMessageListenerContainerTests { @Test public void testDestroyClosesConsumersSessionsAndConnectionInThatOrder() throws Exception { - MessageConsumer messageConsumer = mock(MessageConsumer.class); - Session session = mock(Session.class); + MessageConsumer messageConsumer = mock(); + Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... given(session.createQueue(DESTINATION_NAME)).willReturn(QUEUE_DESTINATION); // and then the MessageConsumer gets created... given(session.createConsumer(QUEUE_DESTINATION, null)).willReturn(messageConsumer); // no MessageSelector... - Connection connection = mock(Connection.class); + Connection connection = mock(); // session gets created in order to register MessageListener... given(connection.createSession(this.container.isSessionTransacted(), this.container.getSessionAcknowledgeMode())).willReturn(session); // and the connection is start()ed after the listener is registered... - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); given(connectionFactory.createConnection()).willReturn(connection); this.container.setConnectionFactory(connectionFactory); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java index c32fc0dd14..1d172feb56 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java @@ -35,16 +35,16 @@ public class JmsResponseTests { @Test public void destinationDoesNotUseDestinationResolver() throws JMSException { - Destination destination = mock(Destination.class); + Destination destination = mock(); Destination actual = JmsResponse.forDestination("foo", destination).resolveDestination(null, null); assertThat(actual).isSameAs(destination); } @Test public void resolveDestinationForQueue() throws JMSException { - Session session = mock(Session.class); - DestinationResolver destinationResolver = mock(DestinationResolver.class); - Destination destination = mock(Destination.class); + Session session = mock(); + DestinationResolver destinationResolver = mock(); + Destination destination = mock(); given(destinationResolver.resolveDestinationName(session, "myQueue", false)).willReturn(destination); JmsResponse jmsResponse = JmsResponse.forQueue("foo", "myQueue"); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index 751ca9c27a..fccbc272d8 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -64,11 +64,11 @@ class MessageListenerAdapterTests { @Test void testWithMessageContentsDelegateForTextMessage() throws Exception { - TextMessage textMessage = mock(TextMessage.class); + TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); - MessageContentsDelegate delegate = mock(MessageContentsDelegate.class); + MessageContentsDelegate delegate = mock(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); adapter.onMessage(textMessage); @@ -78,7 +78,7 @@ class MessageListenerAdapterTests { @Test void testWithMessageContentsDelegateForBytesMessage() throws Exception { - BytesMessage bytesMessage = mock(BytesMessage.class); + BytesMessage bytesMessage = mock(); // BytesMessage contents must be unwrapped... given(bytesMessage.getBodyLength()).willReturn(Long.valueOf(TEXT.getBytes().length)); given(bytesMessage.readBytes(any(byte[].class))).willAnswer((Answer) invocation -> { @@ -87,7 +87,7 @@ class MessageListenerAdapterTests { return inputStream.read(bytes); }); - MessageContentsDelegate delegate = mock(MessageContentsDelegate.class); + MessageContentsDelegate delegate = mock(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); adapter.onMessage(bytesMessage); @@ -97,10 +97,10 @@ class MessageListenerAdapterTests { @Test void testWithMessageContentsDelegateForObjectMessage() throws Exception { - ObjectMessage objectMessage = mock(ObjectMessage.class); + ObjectMessage objectMessage = mock(); given(objectMessage.getObject()).willReturn(NUMBER); - MessageContentsDelegate delegate = mock(MessageContentsDelegate.class); + MessageContentsDelegate delegate = mock(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); adapter.onMessage(objectMessage); @@ -110,10 +110,10 @@ class MessageListenerAdapterTests { @Test void testWithMessageContentsDelegateForObjectMessageWithPlainObject() throws Exception { - ObjectMessage objectMessage = mock(ObjectMessage.class); + ObjectMessage objectMessage = mock(); given(objectMessage.getObject()).willReturn(OBJECT); - MessageContentsDelegate delegate = mock(MessageContentsDelegate.class); + MessageContentsDelegate delegate = mock(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); adapter.onMessage(objectMessage); @@ -123,9 +123,9 @@ class MessageListenerAdapterTests { @Test void testWithMessageDelegate() throws Exception { - TextMessage textMessage = mock(TextMessage.class); + TextMessage textMessage = mock(); - MessageDelegate delegate = mock(MessageDelegate.class); + MessageDelegate delegate = mock(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); // we DON'T want the default SimpleMessageConversion happening... @@ -137,7 +137,7 @@ class MessageListenerAdapterTests { @Test void testWhenTheAdapterItselfIsTheDelegate() throws Exception { - TextMessage textMessage = mock(TextMessage.class); + TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); @@ -148,7 +148,7 @@ class MessageListenerAdapterTests { @Test void testRainyDayWithNoApplicableHandlingMethods() throws Exception { - TextMessage textMessage = mock(TextMessage.class); + TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); @@ -162,8 +162,8 @@ class MessageListenerAdapterTests { void testThatAnExceptionThrownFromTheHandlingMethodIsSimplySwallowedByDefault() throws Exception { final IllegalArgumentException exception = new IllegalArgumentException(); - TextMessage textMessage = mock(TextMessage.class); - MessageDelegate delegate = mock(MessageDelegate.class); + TextMessage textMessage = mock(); + MessageDelegate delegate = mock(); willThrow(exception).given(delegate).handleMessage(textMessage); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -205,8 +205,8 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSessionSupplied() throws Exception { - TextMessage textMessage = mock(TextMessage.class); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + TextMessage textMessage = mock(); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(textMessage)).willReturn(TEXT); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate); @@ -217,22 +217,22 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateWithDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { - Queue destination = mock(Queue.class); - TextMessage sentTextMessage = mock(TextMessage.class); + Queue destination = mock(); + TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn( CORRELATION_ID); // Reply-To is queried when response is being created... given(sentTextMessage.getJMSReplyTo()).willReturn(null); // we want to fall back to the default... - TextMessage responseTextMessage = mock(TextMessage.class); + TextMessage responseTextMessage = mock(); - QueueSender queueSender = mock(QueueSender.class); - Session session = mock(Session.class); + QueueSender queueSender = mock(); + Session session = mock(); given(session.createTextMessage(RESPONSE_TEXT)).willReturn(responseTextMessage); given(session.createProducer(destination)).willReturn(queueSender); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(RESPONSE_TEXT); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -252,21 +252,21 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { - Queue destination = mock(Queue.class); - TextMessage sentTextMessage = mock(TextMessage.class); + Queue destination = mock(); + TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn(null); given(sentTextMessage.getJMSMessageID()).willReturn(CORRELATION_ID); // Reply-To is queried when response is being created... given(sentTextMessage.getJMSReplyTo()).willReturn(destination); - TextMessage responseTextMessage = mock(TextMessage.class); - MessageProducer messageProducer = mock(MessageProducer.class); - Session session = mock(Session.class); + TextMessage responseTextMessage = mock(); + MessageProducer messageProducer = mock(); + Session session = mock(); given(session.createTextMessage(RESPONSE_TEXT)).willReturn(responseTextMessage); given(session.createProducer(destination)).willReturn(messageProducer); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(RESPONSE_TEXT); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -285,17 +285,17 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateNoDefaultDestinationAndNoReplyToDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { - final TextMessage sentTextMessage = mock(TextMessage.class); + final TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn(CORRELATION_ID); // Reply-To is queried when response is being created... given(sentTextMessage.getJMSReplyTo()).willReturn(null); - TextMessage responseTextMessage = mock(TextMessage.class); - final QueueSession session = mock(QueueSession.class); + TextMessage responseTextMessage = mock(); + final QueueSession session = mock(); given(session.createTextMessage(RESPONSE_TEXT)).willReturn(responseTextMessage); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(RESPONSE_TEXT); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -314,23 +314,23 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied_AndSendingThrowsJMSException() throws Exception { - Queue destination = mock(Queue.class); + Queue destination = mock(); - final TextMessage sentTextMessage = mock(TextMessage.class); + final TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn(CORRELATION_ID); // Reply-To is queried when response is being created... given(sentTextMessage.getJMSReplyTo()).willReturn(destination); - TextMessage responseTextMessage = mock(TextMessage.class); - MessageProducer messageProducer = mock(MessageProducer.class); + TextMessage responseTextMessage = mock(); + MessageProducer messageProducer = mock(); willThrow(new JMSException("Doe!")).given(messageProducer).send(responseTextMessage); - final QueueSession session = mock(QueueSession.class); + final QueueSession session = mock(); given(session.createTextMessage(RESPONSE_TEXT)).willReturn(responseTextMessage); given(session.createProducer(destination)).willReturn(messageProducer); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(RESPONSE_TEXT); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -350,10 +350,10 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateDoesNotSendReturnTextMessageWhenSessionSupplied_AndListenerMethodThrowsException() throws Exception { - final TextMessage message = mock(TextMessage.class); - final QueueSession session = mock(QueueSession.class); + final TextMessage message = mock(); + final QueueSession session = mock(); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + ResponsiveMessageDelegate delegate = mock(); willThrow(new IllegalArgumentException("Doe!")).given(delegate).handleMessage(message); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -368,9 +368,9 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateWhenReturnTypeIsNotAJMSMessageAndNoMessageConverterIsSupplied() throws Exception { - final TextMessage sentTextMessage = mock(TextMessage.class); - final Session session = mock(Session.class); - ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class); + final TextMessage sentTextMessage = mock(); + final Session session = mock(); + ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(RESPONSE_TEXT); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { @@ -387,20 +387,20 @@ class MessageListenerAdapterTests { @Test void testWithResponsiveMessageDelegateWhenReturnTypeIsAJMSMessageAndNoMessageConverterIsSupplied() throws Exception { - Queue destination = mock(Queue.class); - final TextMessage sentTextMessage = mock(TextMessage.class); + Queue destination = mock(); + final TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn(CORRELATION_ID); // Reply-To is queried when response is being created... given(sentTextMessage.getJMSReplyTo()).willReturn(destination); - TextMessage responseMessage = mock(TextMessage.class); - QueueSender queueSender = mock(QueueSender.class); + TextMessage responseMessage = mock(); + QueueSender queueSender = mock(); - Session session = mock(Session.class); + Session session = mock(); given(session.createProducer(destination)).willReturn(queueSender); - ResponsiveJmsTextMessageReturningMessageDelegate delegate = mock(ResponsiveJmsTextMessageReturningMessageDelegate.class); + ResponsiveJmsTextMessageReturningMessageDelegate delegate = mock(); given(delegate.handleMessage(sentTextMessage)).willReturn(responseMessage); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java index 5f07ad640d..b235635bb6 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java @@ -60,7 +60,7 @@ import static org.mockito.Mockito.verify; */ public class MessagingMessageListenerAdapterTests { - private static final Destination sharedReplyDestination = mock(Destination.class); + private static final Destination sharedReplyDestination = mock(); private final DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory(); @@ -81,7 +81,7 @@ public class MessagingMessageListenerAdapterTests { .setHeader(JmsHeaders.REPLY_TO, replyTo) .build(); - Session session = mock(Session.class); + Session session = mock(); given(session.createTextMessage("Response")).willReturn(new StubTextMessage("Response")); MessagingMessageListenerAdapter listener = getSimpleInstance("echo", Message.class); jakarta.jms.Message replyMessage = listener.buildMessage(session, result); @@ -97,7 +97,7 @@ public class MessagingMessageListenerAdapterTests { @Test public void exceptionInListener() { jakarta.jms.Message message = new StubTextMessage("foo"); - Session session = mock(Session.class); + Session session = mock(); MessagingMessageListenerAdapter listener = getSimpleInstance("fail", String.class); assertThatExceptionOfType(ListenerExecutionFailedException.class) .isThrownBy(() -> listener.onMessage(message, session)) @@ -109,7 +109,7 @@ public class MessagingMessageListenerAdapterTests { @Test public void exceptionInInvocation() { jakarta.jms.Message message = new StubTextMessage("foo"); - Session session = mock(Session.class); + Session session = mock(); MessagingMessageListenerAdapter listener = getSimpleInstance("wrongParam", Integer.class); assertThatExceptionOfType(ListenerExecutionFailedException.class).isThrownBy(() -> @@ -119,8 +119,8 @@ public class MessagingMessageListenerAdapterTests { @Test public void payloadConversionLazilyInvoked() throws JMSException { - jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class); - MessageConverter messageConverter = mock(MessageConverter.class); + jakarta.jms.Message jmsMessage = mock(); + MessageConverter messageConverter = mock(); given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar"); MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class); listener.setMessageConverter(messageConverter); @@ -132,7 +132,7 @@ public class MessagingMessageListenerAdapterTests { @Test public void headerConversionLazilyInvoked() throws JMSException { - jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class); + jakarta.jms.Message jmsMessage = mock(); given(jmsMessage.getPropertyNames()).willThrow(new IllegalArgumentException("Header failure")); MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class); Message message = listener.toMessagingMessage(jmsMessage); @@ -145,9 +145,9 @@ public class MessagingMessageListenerAdapterTests { @Test public void incomingMessageUsesMessageConverter() throws JMSException { - jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class); - Session session = mock(Session.class); - MessageConverter messageConverter = mock(MessageConverter.class); + jakarta.jms.Message jmsMessage = mock(); + Session session = mock(); + MessageConverter messageConverter = mock(); given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar"); MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class); listener.setMessageConverter(messageConverter); @@ -159,8 +159,8 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyUsesMessageConverterForPayload() throws JMSException { - Session session = mock(Session.class); - MessageConverter messageConverter = mock(MessageConverter.class); + Session session = mock(); + MessageConverter messageConverter = mock(); given(messageConverter.toMessage("Response", session)).willReturn(new StubTextMessage("Response")); Message result = MessageBuilder.withPayload("Response").build(); @@ -175,17 +175,17 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyPayloadToQueue() throws JMSException { - Session session = mock(Session.class); - Queue replyDestination = mock(Queue.class); + Session session = mock(); + Queue replyDestination = mock(); given(session.createQueue("queueOut")).willReturn(replyDestination); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session).createQueue("queueOut"); verify(session).createTextMessage("Response"); @@ -195,12 +195,12 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyWithCustomTimeToLive() throws JMSException { - Session session = mock(Session.class); - Queue replyDestination = mock(Queue.class); + Session session = mock(); + Queue replyDestination = mock(); given(session.createQueue("queueOut")).willReturn(replyDestination); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); @@ -208,7 +208,7 @@ public class MessagingMessageListenerAdapterTests { QosSettings settings = new QosSettings(); settings.setTimeToLive(6000); listener.setResponseQosSettings(settings); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session).createQueue("queueOut"); verify(session).createTextMessage("Response"); verify(messageProducer).send(responseMessage, jakarta.jms.Message.DEFAULT_DELIVERY_MODE, @@ -218,19 +218,19 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyWithFullQoS() throws JMSException { - Session session = mock(Session.class); - Queue replyDestination = mock(Queue.class); + Session session = mock(); + Queue replyDestination = mock(); given(session.createQueue("queueOut")).willReturn(replyDestination); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class); QosSettings settings = new QosSettings(DeliveryMode.NON_PERSISTENT, 6, 6000); listener.setResponseQosSettings(settings); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session).createQueue("queueOut"); verify(session).createTextMessage("Response"); verify(messageProducer).send(responseMessage, DeliveryMode.NON_PERSISTENT, 6, 6000); @@ -239,17 +239,17 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyPayloadToTopic() throws JMSException { - Session session = mock(Session.class); - Topic replyDestination = mock(Topic.class); + Session session = mock(); + Topic replyDestination = mock(); given(session.createTopic("topicOut")).willReturn(replyDestination); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToTopic", Message.class); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session).createTopic("topicOut"); verify(session).createTextMessage("Response"); @@ -259,14 +259,14 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyPayloadToDestination() throws JMSException { - Session session = mock(Session.class); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + Session session = mock(); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(sharedReplyDestination)).willReturn(messageProducer); MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToDestination", Message.class); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session, times(0)).createQueue(anyString()); verify(session).createTextMessage("Response"); @@ -276,18 +276,18 @@ public class MessagingMessageListenerAdapterTests { @Test public void replyPayloadNoDestination() throws JMSException { - Queue replyDestination = mock(Queue.class); + Queue replyDestination = mock(); - Session session = mock(Session.class); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + Session session = mock(); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage("Response")).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadNoDestination", Message.class); listener.setDefaultResponseDestination(replyDestination); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session, times(0)).createQueue(anyString()); verify(session).createTextMessage("Response"); @@ -317,11 +317,11 @@ public class MessagingMessageListenerAdapterTests { } public TextMessage testReplyWithJackson(String methodName, String replyContent) throws JMSException { - Queue replyDestination = mock(Queue.class); + Queue replyDestination = mock(); - Session session = mock(Session.class); - MessageProducer messageProducer = mock(MessageProducer.class); - TextMessage responseMessage = mock(TextMessage.class); + Session session = mock(); + MessageProducer messageProducer = mock(); + TextMessage responseMessage = mock(); given(session.createTextMessage(replyContent)).willReturn(responseMessage); given(session.createProducer(replyDestination)).willReturn(messageProducer); @@ -330,7 +330,7 @@ public class MessagingMessageListenerAdapterTests { messageConverter.setTargetType(MessageType.TEXT); listener.setMessageConverter(messageConverter); listener.setDefaultResponseDestination(replyDestination); - listener.onMessage(mock(jakarta.jms.Message.class), session); + listener.onMessage(mock(), session); verify(session, times(0)).createQueue(anyString()); verify(session).createTextMessage(replyContent); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java index 0540c97ea3..f1cfe0e63f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java @@ -61,7 +61,7 @@ public class DefaultJmsActivationSpecFactoryTests { public void webSphereResourceAdapterSetup() throws Exception { Destination destination = new StubQueue(); - DestinationResolver destinationResolver = mock(DestinationResolver.class); + DestinationResolver destinationResolver = mock(); given(destinationResolver.resolveDestinationName(null, "destinationname", false)).willReturn(destination); DefaultJmsActivationSpecFactory activationSpecFactory = new DefaultJmsActivationSpecFactory(); diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index bcda55eeab..ec24fde71e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -51,8 +51,8 @@ public class SimpleMessageConverterTests { @Test public void testStringConversion() throws JMSException { - Session session = mock(Session.class); - TextMessage message = mock(TextMessage.class); + Session session = mock(); + TextMessage message = mock(); String content = "test"; @@ -66,8 +66,8 @@ public class SimpleMessageConverterTests { @Test public void testByteArrayConversion() throws JMSException { - Session session = mock(Session.class); - BytesMessage message = mock(BytesMessage.class); + Session session = mock(); + BytesMessage message = mock(); byte[] content = "test".getBytes(); final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content); @@ -86,8 +86,8 @@ public class SimpleMessageConverterTests { @Test public void testMapConversion() throws JMSException { - Session session = mock(Session.class); - MapMessage message = mock(MapMessage.class); + Session session = mock(); + MapMessage message = mock(); Map content = new HashMap<>(2); content.put("key1", "value1"); @@ -108,8 +108,8 @@ public class SimpleMessageConverterTests { @Test public void testSerializableConversion() throws JMSException { - Session session = mock(Session.class); - ObjectMessage message = mock(ObjectMessage.class); + Session session = mock(); + ObjectMessage message = mock(); Integer content = 5; @@ -135,8 +135,8 @@ public class SimpleMessageConverterTests { @Test public void testToMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { - Session session = mock(Session.class); - ObjectMessage message = mock(ObjectMessage.class); + Session session = mock(); + ObjectMessage message = mock(); SimpleMessageConverter converter = new SimpleMessageConverter(); Message msg = converter.toMessage(message, session); @@ -145,7 +145,7 @@ public class SimpleMessageConverterTests { @Test public void testFromMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { - Message message = mock(Message.class); + Message message = mock(); SimpleMessageConverter converter = new SimpleMessageConverter(); Object msg = converter.fromMessage(message); @@ -154,8 +154,8 @@ public class SimpleMessageConverterTests { @Test public void testMapConversionWhereMapHasNonStringTypesForKeys() throws JMSException { - MapMessage message = mock(MapMessage.class); - Session session = mock(Session.class); + MapMessage message = mock(); + Session session = mock(); given(session.createMapMessage()).willReturn(message); Map content = new HashMap<>(1); @@ -168,8 +168,8 @@ public class SimpleMessageConverterTests { @Test public void testMapConversionWhereMapHasNNullForKey() throws JMSException { - MapMessage message = mock(MapMessage.class); - Session session = mock(Session.class); + MapMessage message = mock(); + Session session = mock(); given(session.createMapMessage()).willReturn(message); Map content = new HashMap<>(1); diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java index 287cd620c6..dff9ac1228 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java @@ -49,15 +49,13 @@ import static org.mockito.Mockito.verify; */ class MappingJackson2MessageConverterTests { - private MappingJackson2MessageConverter converter; + private MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(); - private Session sessionMock; + private Session sessionMock = mock(); @BeforeEach public void setup() { - sessionMock = mock(Session.class); - converter = new MappingJackson2MessageConverter(); converter.setEncodingPropertyName("__encoding__"); converter.setTypeIdPropertyName("__typeid__"); } @@ -65,7 +63,7 @@ class MappingJackson2MessageConverterTests { @Test void toBytesMessage() throws Exception { - BytesMessage bytesMessageMock = mock(BytesMessage.class); + BytesMessage bytesMessageMock = mock(); Date toBeMarshalled = new Date(); given(sessionMock.createBytesMessage()).willReturn(bytesMessageMock); @@ -79,7 +77,7 @@ class MappingJackson2MessageConverterTests { @Test void fromBytesMessage() throws Exception { - BytesMessage bytesMessageMock = mock(BytesMessage.class); + BytesMessage bytesMessageMock = mock(); Map unmarshalled = Collections.singletonMap("foo", "bar"); byte[] bytes = "{\"foo\":\"bar\"}".getBytes(); @@ -98,7 +96,7 @@ class MappingJackson2MessageConverterTests { @Test void toTextMessageWithObject() throws Exception { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Date toBeMarshalled = new Date(); given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock); @@ -110,7 +108,7 @@ class MappingJackson2MessageConverterTests { @Test void toTextMessageWithMap() throws Exception { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Map toBeMarshalled = new HashMap<>(); toBeMarshalled.put("foo", "bar"); @@ -122,7 +120,7 @@ class MappingJackson2MessageConverterTests { @Test void fromTextMessage() throws Exception { - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); MyBean unmarshalled = new MyBean("bar"); String text = "{\"foo\":\"bar\"}"; @@ -135,7 +133,7 @@ class MappingJackson2MessageConverterTests { @Test void fromTextMessageWithUnknownProperty() throws Exception { - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); MyBean unmarshalled = new MyBean("bar"); String text = "{\"foo\":\"bar\", \"unknownProperty\":\"value\"}"; @@ -148,7 +146,7 @@ class MappingJackson2MessageConverterTests { @Test void fromTextMessageAsObject() throws Exception { - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Map unmarshalled = Collections.singletonMap("foo", "bar"); String text = "{\"foo\":\"bar\"}"; @@ -161,7 +159,7 @@ class MappingJackson2MessageConverterTests { @Test void fromTextMessageAsMap() throws Exception { - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Map unmarshalled = Collections.singletonMap("foo", "bar"); String text = "{\"foo\":\"bar\"}"; @@ -206,7 +204,7 @@ class MappingJackson2MessageConverterTests { private void testToTextMessageWithReturnType(MethodParameter returnType) throws JMSException, NoSuchMethodException { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); MyAnotherBean bean = new MyAnotherBean("test", "lengthy description"); given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock); @@ -217,7 +215,7 @@ class MappingJackson2MessageConverterTests { @Test void toTextMessageWithJsonViewClass() throws JMSException { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); MyAnotherBean bean = new MyAnotherBean("test", "lengthy description"); given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock); @@ -231,7 +229,7 @@ class MappingJackson2MessageConverterTests { @Test void toTextMessageWithAnotherJsonViewClass() throws JMSException { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); MyAnotherBean bean = new MyAnotherBean("test", "lengthy description"); given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock); diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java index a0c37d1745..c3a457a041 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java @@ -22,7 +22,6 @@ import javax.xml.transform.Source; import jakarta.jms.BytesMessage; import jakarta.jms.Session; import jakarta.jms.TextMessage; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.oxm.Marshaller; @@ -40,27 +39,18 @@ import static org.mockito.Mockito.verify; */ public class MarshallingMessageConverterTests { - private MarshallingMessageConverter converter; + private Marshaller marshallerMock = mock(); - private Marshaller marshallerMock; + private Unmarshaller unmarshallerMock = mock(); - private Unmarshaller unmarshallerMock; + private Session sessionMock = mock(); - private Session sessionMock; - - - @BeforeEach - public void setup() throws Exception { - marshallerMock = mock(Marshaller.class); - unmarshallerMock = mock(Unmarshaller.class); - sessionMock = mock(Session.class); - converter = new MarshallingMessageConverter(marshallerMock, unmarshallerMock); - } + private MarshallingMessageConverter converter = new MarshallingMessageConverter(marshallerMock, unmarshallerMock); @Test public void toBytesMessage() throws Exception { - BytesMessage bytesMessageMock = mock(BytesMessage.class); + BytesMessage bytesMessageMock = mock(); Object toBeMarshalled = new Object(); given(sessionMock.createBytesMessage()).willReturn(bytesMessageMock); @@ -72,7 +62,7 @@ public class MarshallingMessageConverterTests { @Test public void fromBytesMessage() throws Exception { - BytesMessage bytesMessageMock = mock(BytesMessage.class); + BytesMessage bytesMessageMock = mock(); Object unmarshalled = new Object(); given(bytesMessageMock.getBodyLength()).willReturn(10L); @@ -86,7 +76,7 @@ public class MarshallingMessageConverterTests { @Test public void toTextMessage() throws Exception { converter.setTargetType(MessageType.TEXT); - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Object toBeMarshalled = new Object(); given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock); @@ -98,7 +88,7 @@ public class MarshallingMessageConverterTests { @Test public void fromTextMessage() throws Exception { - TextMessage textMessageMock = mock(TextMessage.class); + TextMessage textMessageMock = mock(); Object unmarshalled = new Object(); String text = "foo"; diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java index e5e5a26bb4..600937fc3f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java @@ -45,14 +45,14 @@ public class MessagingMessageConverterTests { @Test public void onlyHandlesMessage() throws JMSException { assertThatIllegalArgumentException().isThrownBy(() -> - this.converter.toMessage(new Object(), mock(Session.class))); + this.converter.toMessage(new Object(), mock())); } @Test public void simpleObject() throws Exception { - Session session = mock(Session.class); - Serializable payload = mock(Serializable.class); - ObjectMessage jmsMessage = mock(ObjectMessage.class); + Session session = mock(); + Serializable payload = mock(); + ObjectMessage jmsMessage = mock(); given(session.createObjectMessage(payload)).willReturn(jmsMessage); this.converter.toMessage(MessageBuilder.withPayload(payload).build(), session); diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java index 841cb96bd5..656c2d23bf 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java @@ -43,7 +43,7 @@ public class DynamicDestinationResolverTests { @Test public void resolveWithPubSubTopicSession() throws Exception { Topic expectedDestination = new StubTopic(); - TopicSession session = mock(TopicSession.class); + TopicSession session = mock(); given(session.createTopic(DESTINATION_NAME)).willReturn(expectedDestination); testResolveDestination(session, expectedDestination, true); } @@ -51,7 +51,7 @@ public class DynamicDestinationResolverTests { @Test public void resolveWithPubSubVanillaSession() throws Exception { Topic expectedDestination = new StubTopic(); - Session session = mock(Session.class); + Session session = mock(); given(session.createTopic(DESTINATION_NAME)).willReturn(expectedDestination); testResolveDestination(session, expectedDestination, true); } @@ -59,7 +59,7 @@ public class DynamicDestinationResolverTests { @Test public void resolveWithPointToPointQueueSession() throws Exception { Queue expectedDestination = new StubQueue(); - Session session = mock(QueueSession.class); + QueueSession session = mock(); given(session.createQueue(DESTINATION_NAME)).willReturn(expectedDestination); testResolveDestination(session, expectedDestination, false); } @@ -67,7 +67,7 @@ public class DynamicDestinationResolverTests { @Test public void resolveWithPointToPointVanillaSession() throws Exception { Queue expectedDestination = new StubQueue(); - Session session = mock(Session.class); + Session session = mock(); given(session.createQueue(DESTINATION_NAME)).willReturn(expectedDestination); testResolveDestination(session, expectedDestination, false); } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java index 3e02eabc4e..af3823e635 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java @@ -31,7 +31,7 @@ public class JmsDestinationAccessorTests { @Test public void testChokesIfDestinationResolverIsetToNullExplicitly() throws Exception { - ConnectionFactory connectionFactory = mock(ConnectionFactory.class); + ConnectionFactory connectionFactory = mock(); JmsDestinationAccessor accessor = new StubJmsDestinationAccessor(); accessor.setConnectionFactory(connectionFactory); diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java index 895373eab5..5c80874b83 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java @@ -43,7 +43,7 @@ public class JndiDestinationResolverTests { @Test public void testHitsCacheSecondTimeThrough() throws Exception { - Session session = mock(Session.class); + Session session = mock(); JndiDestinationResolver resolver = new OneTimeLookupJndiDestinationResolver(); Destination destination = resolver.resolveDestinationName(session, DESTINATION_NAME, true); @@ -54,7 +54,7 @@ public class JndiDestinationResolverTests { @Test public void testDoesNotUseCacheIfCachingIsTurnedOff() throws Exception { - Session session = mock(Session.class); + Session session = mock(); CountingCannedJndiDestinationResolver resolver = new CountingCannedJndiDestinationResolver(); @@ -72,9 +72,9 @@ public class JndiDestinationResolverTests { @Test public void testDelegatesToFallbackIfNotResolvedInJndi() throws Exception { - Session session = mock(Session.class); + Session session = mock(); - DestinationResolver dynamicResolver = mock(DestinationResolver.class); + DestinationResolver dynamicResolver = mock(); given(dynamicResolver.resolveDestinationName(session, DESTINATION_NAME, true)).willReturn(DESTINATION); @@ -94,8 +94,8 @@ public class JndiDestinationResolverTests { @Test public void testDoesNotDelegateToFallbackIfNotResolvedInJndi() throws Exception { - final Session session = mock(Session.class); - DestinationResolver dynamicResolver = mock(DestinationResolver.class); + final Session session = mock(); + DestinationResolver dynamicResolver = mock(); final JndiDestinationResolver resolver = new JndiDestinationResolver() { @Override diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/ProtobufMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/ProtobufMessageConverterTests.java index 5e3d2ea880..508a462516 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/ProtobufMessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/ProtobufMessageConverterTests.java @@ -18,7 +18,6 @@ package org.springframework.messaging.converter; import java.util.Map; -import com.google.protobuf.ExtensionRegistry; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -108,7 +107,7 @@ class ProtobufMessageConverterTests { void jsonWithGoogleProtobuf() throws Exception { ProtobufMessageConverter converter = new ProtobufMessageConverter( new ProtobufMessageConverter.ProtobufJavaUtilSupport(null, null), - mock(ExtensionRegistry.class)); + mock()); //convertTo Message message = converter.toMessage(testMsg, new MessageHeaders(Map.of(CONTENT_TYPE, APPLICATION_JSON))); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/CachingDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/CachingDestinationResolverTests.java index 9d2140889b..d89681801c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/CachingDestinationResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/CachingDestinationResolverTests.java @@ -36,7 +36,7 @@ public class CachingDestinationResolverTests { @Test public void cachedDestination() { @SuppressWarnings("unchecked") - DestinationResolver resolver = mock(DestinationResolver.class); + DestinationResolver resolver = mock(); CachingDestinationResolverProxy resolverProxy = new CachingDestinationResolverProxy<>(resolver); given(resolver.resolveDestination("abcd")).willReturn("dcba"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java index 0ef6a33168..e484f1ddc1 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java @@ -72,7 +72,7 @@ public class GenericMessagingTemplateTests { @Test public void sendWithTimeout() { - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); final AtomicReference> sent = new AtomicReference<>(); willAnswer(invocation -> { sent.set(invocation.getArgument(0)); @@ -91,7 +91,7 @@ public class GenericMessagingTemplateTests { @Test public void sendWithTimeoutMutable() { - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); final AtomicReference> sent = new AtomicReference<>(); willAnswer(invocation -> { sent.set(invocation.getArgument(0)); @@ -129,7 +129,7 @@ public class GenericMessagingTemplateTests { this.template.setSendTimeout(30_000L); this.template.setThrowExceptionOnLateReply(true); - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); MessageHandler handler = createLateReplier(latch, failure); willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); @@ -155,7 +155,7 @@ public class GenericMessagingTemplateTests { this.template.setReceiveTimeout(10_000); this.template.setThrowExceptionOnLateReply(true); - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); MessageHandler handler = createLateReplier(latch, failure); willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); @@ -187,7 +187,7 @@ public class GenericMessagingTemplateTests { this.template.setSendTimeoutHeader("sto"); this.template.setReceiveTimeoutHeader("rto"); - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); MessageHandler handler = createLateReplier(latch, failure); willAnswer(invocation -> { this.executor.execute(() -> handler.handleMessage(invocation.getArgument(0))); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java index 2e6bb33f7d..9933c5f3d9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java @@ -44,20 +44,17 @@ import static org.mockito.Mockito.mock; */ public class MessageMethodArgumentResolverTests { - private MessageConverter converter; + private MessageConverter converter = mock(); - private MessageMethodArgumentResolver resolver; + private MessageMethodArgumentResolver resolver = new MessageMethodArgumentResolver(this.converter); private Method method; @BeforeEach public void setup() throws Exception { - this.method = MessageMethodArgumentResolverTests.class.getDeclaredMethod("handle", + this.method = getClass().getDeclaredMethod("handle", Message.class, Message.class, Message.class, Message.class, ErrorMessage.class, Message.class); - - this.converter = mock(MessageConverter.class); - this.resolver = new MessageMethodArgumentResolver(this.converter); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java index 9ccadce120..f0d4c5905b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; */ public class InvocableHandlerMethodTests { - private final Message message = mock(Message.class); + private final Message message = mock(); private final HandlerMethodArgumentResolverComposite resolvers = new HandlerMethodArgumentResolverComposite(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java index 225e793c50..4403863858 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java @@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock; */ public class InvocableHandlerMethodTests { - private final Message message = mock(Message.class); + private final Message message = mock(); private final List resolvers = new ArrayList<>(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java index 8b93eeecbd..3201b39980 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java @@ -66,7 +66,7 @@ import static org.mockito.Mockito.verify; */ public class DefaultRSocketRequesterBuilderTests { - private ClientTransport transport; + private ClientTransport transport = mock(); private final MockConnection connection = new MockConnection(); @@ -75,7 +75,6 @@ public class DefaultRSocketRequesterBuilderTests { @BeforeEach public void setup() { - this.transport = mock(ClientTransport.class); given(this.transport.connect()).willReturn(Mono.just(this.connection)); given(this.transport.maxFrameLength()).willReturn(16777215); } @@ -84,7 +83,7 @@ public class DefaultRSocketRequesterBuilderTests { @Test @SuppressWarnings("unchecked") public void rsocketConnectorConfigurer() { - Consumer strategiesConfigurer = mock(Consumer.class); + Consumer strategiesConfigurer = mock(); RSocketRequester.builder() .rsocketConnector(this.connectorConfigurer) .rsocketStrategies(strategiesConfigurer) diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketStrategiesTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketStrategiesTests.java index cdbafb60e3..402896d758 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketStrategiesTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketStrategiesTests.java @@ -110,7 +110,7 @@ class DefaultRSocketStrategiesTests { @Test @SuppressWarnings("unchecked") void applyMetadataExtractors() { - Consumer consumer = mock(Consumer.class); + Consumer consumer = mock(); RSocketStrategies.builder().metadataExtractorRegistry(consumer).build(); verify(consumer, times(1)).accept(any()); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java index 4ff81a9d23..2c16cefd5e 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesTests.java @@ -60,7 +60,7 @@ public class SimpAttributesTests { @Test public void registerDestructionCallback() { - Runnable callback = mock(Runnable.class); + Runnable callback = mock(); this.simpAttributes.registerDestructionCallback("name1", callback); assertThat(this.simpAttributes.getAttribute( @@ -70,15 +70,15 @@ public class SimpAttributesTests { @Test public void registerDestructionCallbackAfterSessionCompleted() { this.simpAttributes.sessionCompleted(); - assertThatIllegalStateException().isThrownBy(() -> - this.simpAttributes.registerDestructionCallback("name1", mock(Runnable.class))) - .withMessageContaining("already completed"); + assertThatIllegalStateException() + .isThrownBy(() -> this.simpAttributes.registerDestructionCallback("name1", mock())) + .withMessageContaining("already completed"); } @Test public void removeDestructionCallback() { - Runnable callback1 = mock(Runnable.class); - Runnable callback2 = mock(Runnable.class); + Runnable callback1 = mock(); + Runnable callback2 = mock(); this.simpAttributes.registerDestructionCallback("name1", callback1); this.simpAttributes.registerDestructionCallback("name2", callback2); @@ -100,8 +100,8 @@ public class SimpAttributesTests { @Test public void sessionCompleted() { - Runnable callback1 = mock(Runnable.class); - Runnable callback2 = mock(Runnable.class); + Runnable callback1 = mock(); + Runnable callback2 = mock(); this.simpAttributes.registerDestructionCallback("name1", callback1); this.simpAttributes.registerDestructionCallback("name2", callback2); @@ -113,7 +113,7 @@ public class SimpAttributesTests { @Test public void sessionCompletedIsIdempotent() { - Runnable callback1 = mock(Runnable.class); + Runnable callback1 = mock(); this.simpAttributes.registerDestructionCallback("name1", callback1); this.simpAttributes.sessionCompleted(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessageHeaderAccessorTests.java index 774576cc43..6b12c96125 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessageHeaderAccessorTests.java @@ -77,11 +77,11 @@ public class SimpMessageHeaderAccessorTests { SimpMessageHeaderAccessor accessor = SimpMessageHeaderAccessor.create(); accessor.setUserChangeCallback(userCallback); - Principal user1 = mock(Principal.class); + Principal user1 = mock(); accessor.setUser(user1); assertThat(userCallback.getUser()).isEqualTo(user1); - Principal user2 = mock(Principal.class); + Principal user2 = mock(); accessor.setUser(user2); assertThat(userCallback.getUser()).isEqualTo(user2); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java index 6089f0c42a..ddc641647e 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java @@ -21,12 +21,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.beans.factory.ObjectFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -38,19 +38,16 @@ import static org.mockito.Mockito.verify; */ public class SimpSessionScopeTests { - private SimpSessionScope scope; + private SimpSessionScope scope = new SimpSessionScope(); @SuppressWarnings("rawtypes") - private ObjectFactory objectFactory; + private ObjectFactory objectFactory = mock(); - private SimpAttributes simpAttributes; + private SimpAttributes simpAttributes = new SimpAttributes("session1", new ConcurrentHashMap<>()); @BeforeEach public void setUp() { - this.scope = new SimpSessionScope(); - this.objectFactory = Mockito.mock(ObjectFactory.class); - this.simpAttributes = new SimpAttributes("session1", new ConcurrentHashMap<>()); SimpAttributesContextHolder.setAttributes(this.simpAttributes); } @@ -90,7 +87,7 @@ public class SimpSessionScopeTests { @Test public void registerDestructionCallback() { - Runnable runnable = Mockito.mock(Runnable.class); + Runnable runnable = mock(); this.scope.registerDestructionCallback("name", runnable); this.simpAttributes.sessionCompleted(); @@ -102,5 +99,4 @@ public class SimpSessionScopeTests { assertThat(this.scope.getConversationId()).isEqualTo("session1"); } - } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java index b9b267379a..13f3a06a42 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java @@ -322,7 +322,7 @@ public class SendToMethodReturnValueHandlerTests { public void testHeadersToSend() throws Exception { Message message = createMessage("sess1", "sub1", "/app", "/dest", null); - SimpMessageSendingOperations messagingTemplate = mock(SimpMessageSendingOperations.class); + SimpMessageSendingOperations messagingTemplate = mock(); SendToMethodReturnValueHandler handler = new SendToMethodReturnValueHandler(messagingTemplate, false); handler.handleReturnValue(PAYLOAD, this.noAnnotationsReturnType, message); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java index f30579fe0c..db6a7df9ab 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java @@ -150,7 +150,7 @@ public class SubscriptionMethodReturnValueHandlerTests { String destination = "/dest"; Message inputMessage = createInputMessage(sessionId, subscriptionId, destination, null); - MessageSendingOperations messagingTemplate = mock(MessageSendingOperations.class); + MessageSendingOperations messagingTemplate = mock(); SubscriptionMethodReturnValueHandler handler = new SubscriptionMethodReturnValueHandler(messagingTemplate); handler.handleReturnValue(PAYLOAD, this.subscribeEventReturnType, inputMessage); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java index 16746e25f4..a43e116f85 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java @@ -26,8 +26,6 @@ import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.support.GenericMessage; @@ -165,8 +163,7 @@ public class BrokerMessageHandlerTests { TestBrokerMessageHandler(String... destinationPrefixes) { - super(mock(SubscribableChannel.class), mock(MessageChannel.class), - mock(SubscribableChannel.class), Arrays.asList(destinationPrefixes)); + super(mock(), mock(), mock(), Arrays.asList(destinationPrefixes)); setApplicationEventPublisher(this); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java index 1e15eeaaf6..d4dfbd80be 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java @@ -184,7 +184,7 @@ public class SimpleBrokerMessageHandlerTests { @Test @SuppressWarnings("rawtypes") public void startAndStopWithHeartbeatValue() { - ScheduledFuture future = mock(ScheduledFuture.class); + ScheduledFuture future = mock(); given(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), eq(Duration.ofMillis(15000)))).willReturn(future); this.messageHandler.setTaskScheduler(this.taskScheduler); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java index 89b7d6d6a0..b12b715bf6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java @@ -314,7 +314,7 @@ public class MessageBrokerConfigurationTests { @Test public void configureMessageConvertersCustom() { - final MessageConverter testConverter = mock(MessageConverter.class); + final MessageConverter testConverter = mock(); AbstractMessageBrokerConfiguration config = new BaseTestMessageBrokerConfig() { @Override protected boolean configureMessageConverters(List messageConverters) { @@ -331,7 +331,7 @@ public class MessageBrokerConfigurationTests { @Test public void configureMessageConvertersCustomAndDefault() { - final MessageConverter testConverter = mock(MessageConverter.class); + final MessageConverter testConverter = mock(); AbstractMessageBrokerConfiguration config = new BaseTestMessageBrokerConfig() { @Override @@ -378,7 +378,7 @@ public class MessageBrokerConfigurationTests { @Test public void simpValidatorCustom() { - final Validator validator = mock(Validator.class); + final Validator validator = mock(); AbstractMessageBrokerConfiguration config = new BaseTestMessageBrokerConfig() { @Override public Validator getValidator() { @@ -654,12 +654,12 @@ public class MessageBrokerConfigurationTests { @Override protected void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(mock(HandlerMethodArgumentResolver.class)); + argumentResolvers.add(mock()); } @Override protected void addReturnValueHandlers(List returnValueHandlers) { - returnValueHandlers.add(mock(HandlerMethodReturnValueHandler.class)); + returnValueHandlers.add(mock()); } @Override diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java index 4f34f2f753..e7f8884f45 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java @@ -279,7 +279,7 @@ public class DefaultStompSessionTests { public void handleMessageFrame() { this.session.afterConnected(this.connection); - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); String destination = "/topic/foo"; Subscription subscription = this.session.subscribe(destination, frameHandler); @@ -307,7 +307,7 @@ public class DefaultStompSessionTests { this.session.afterConnected(this.connection); assertThat(this.session.isConnected()).isTrue(); - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); String destination = "/topic/foo"; Subscription subscription = this.session.subscribe(destination, frameHandler); @@ -377,7 +377,7 @@ public class DefaultStompSessionTests { this.session.afterConnected(this.connection); assertThat(this.session.isConnected()).isTrue(); - this.session.setTaskScheduler(mock(TaskScheduler.class)); + this.session.setTaskScheduler(mock()); this.session.setAutoReceipt(true); this.session.send("/topic/foo", "sample payload"); @@ -449,7 +449,7 @@ public class DefaultStompSessionTests { assertThat(this.session.isConnected()).isTrue(); String destination = "/topic/foo"; - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); Subscription subscription = this.session.subscribe(destination, frameHandler); Message message = this.messageCaptor.getValue(); @@ -473,7 +473,7 @@ public class DefaultStompSessionTests { StompHeaders stompHeaders = new StompHeaders(); stompHeaders.setId(subscriptionId); stompHeaders.setDestination(destination); - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); Subscription subscription = this.session.subscribe(stompHeaders, frameHandler); assertThat(subscription.getSubscriptionId()).isEqualTo(subscriptionId); @@ -494,7 +494,7 @@ public class DefaultStompSessionTests { assertThat(this.session.isConnected()).isTrue(); String destination = "/topic/foo"; - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); Subscription subscription = this.session.subscribe(destination, frameHandler); subscription.unsubscribe(); @@ -518,7 +518,7 @@ public class DefaultStompSessionTests { StompHeaders subscribeHeaders = new StompHeaders(); subscribeHeaders.setDestination("/topic/foo"); subscribeHeaders.set(headerName, headerValue); - StompFrameHandler frameHandler = mock(StompFrameHandler.class); + StompFrameHandler frameHandler = mock(); Subscription subscription = this.session.subscribe(subscribeHeaders, frameHandler); StompHeaders unsubscribeHeaders = new StompHeaders(); @@ -572,7 +572,7 @@ public class DefaultStompSessionTests { @Test public void receiptReceived() { this.session.afterConnected(this.connection); - this.session.setTaskScheduler(mock(TaskScheduler.class)); + this.session.setTaskScheduler(mock()); AtomicReference received = new AtomicReference<>(); AtomicReference receivedHeaders = new AtomicReference<>(); @@ -580,7 +580,7 @@ public class DefaultStompSessionTests { StompHeaders headers = new StompHeaders(); headers.setDestination("/topic/foo"); headers.setReceipt("my-receipt"); - Subscription subscription = this.session.subscribe(headers, mock(StompFrameHandler.class)); + Subscription subscription = this.session.subscribe(headers, mock()); subscription.addReceiptTask(receiptHeaders -> { received.set(true); receivedHeaders.set(receiptHeaders); @@ -604,7 +604,7 @@ public class DefaultStompSessionTests { @Test public void receiptReceivedBeforeTaskAdded() { this.session.afterConnected(this.connection); - this.session.setTaskScheduler(mock(TaskScheduler.class)); + this.session.setTaskScheduler(mock()); AtomicReference received = new AtomicReference<>(); AtomicReference receivedHeaders = new AtomicReference<>(); @@ -612,7 +612,7 @@ public class DefaultStompSessionTests { StompHeaders headers = new StompHeaders(); headers.setDestination("/topic/foo"); headers.setReceipt("my-receipt"); - Subscription subscription = this.session.subscribe(headers, mock(StompFrameHandler.class)); + Subscription subscription = this.session.subscribe(headers, mock()); StompHeaderAccessor accessor = StompHeaderAccessor.create(StompCommand.RECEIPT); accessor.setReceiptId("my-receipt"); @@ -635,14 +635,14 @@ public class DefaultStompSessionTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) public void receiptNotReceived() { - TaskScheduler taskScheduler = mock(TaskScheduler.class); + TaskScheduler taskScheduler = mock(); this.session.afterConnected(this.connection); this.session.setTaskScheduler(taskScheduler); AtomicReference notReceived = new AtomicReference<>(); - ScheduledFuture future = mock(ScheduledFuture.class); + ScheduledFuture future = mock(); given(taskScheduler.schedule(any(Runnable.class), any(Instant.class))).willReturn(future); StompHeaders headers = new StompHeaders(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java index f9a7f968c5..4721d8503d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java @@ -39,7 +39,6 @@ import org.springframework.messaging.tcp.ReconnectStrategy; import org.springframework.messaging.tcp.TcpConnection; import org.springframework.messaging.tcp.TcpConnectionHandler; import org.springframework.messaging.tcp.TcpOperations; -import org.springframework.scheduling.TaskScheduler; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -55,18 +54,15 @@ class StompBrokerRelayMessageHandlerTests { private StompBrokerRelayMessageHandler brokerRelay; - private StubMessageChannel outboundChannel; + private StubMessageChannel outboundChannel = new StubMessageChannel(); - private StubTcpOperations tcpClient; + private StubTcpOperations tcpClient = new StubTcpOperations(); - ArgumentCaptor messageCountTaskCaptor = ArgumentCaptor.forClass(Runnable.class); + private ArgumentCaptor messageCountTaskCaptor = ArgumentCaptor.forClass(Runnable.class); @BeforeEach void setup() { - - this.outboundChannel = new StubMessageChannel(); - this.brokerRelay = new StompBrokerRelayMessageHandler(new StubMessageChannel(), this.outboundChannel, new StubMessageChannel(), Collections.singletonList("/topic")) { @@ -77,16 +73,13 @@ class StompBrokerRelayMessageHandlerTests { } }; - this.tcpClient = new StubTcpOperations(); this.brokerRelay.setTcpClient(this.tcpClient); - this.brokerRelay.setTaskScheduler(mock(TaskScheduler.class)); + this.brokerRelay.setTaskScheduler(mock()); } - @Test void virtualHost() { - this.brokerRelay.setVirtualHost("ABC"); this.brokerRelay.start(); @@ -107,7 +100,6 @@ class StompBrokerRelayMessageHandlerTests { @Test void loginAndPasscode() { - this.brokerRelay.setSystemLogin("syslogin"); this.brokerRelay.setSystemPasscode("syspasscode"); this.brokerRelay.setClientLogin("clientlogin"); @@ -180,7 +172,6 @@ class StompBrokerRelayMessageHandlerTests { @Test void messageFromBrokerIsEnriched() { - this.brokerRelay.start(); this.brokerRelay.handleMessage(connectMessage("sess1", "joe")); @@ -200,7 +191,6 @@ class StompBrokerRelayMessageHandlerTests { @Test void connectWhenBrokerNotAvailable() { - this.brokerRelay.start(); this.brokerRelay.stopInternal(); this.brokerRelay.handleMessage(connectMessage("sess1", "joe")); @@ -215,7 +205,6 @@ class StompBrokerRelayMessageHandlerTests { @Test void sendAfterBrokerUnavailable() { - this.brokerRelay.start(); assertThat(this.brokerRelay.getConnectionCount()).isEqualTo(1); @@ -237,8 +226,7 @@ class StompBrokerRelayMessageHandlerTests { @Test @SuppressWarnings("rawtypes") void systemSubscription() { - - MessageHandler handler = mock(MessageHandler.class); + MessageHandler handler = mock(); this.brokerRelay.setSystemSubscriptions(Collections.singletonMap("/topic/foo", handler)); this.brokerRelay.start(); @@ -262,7 +250,6 @@ class StompBrokerRelayMessageHandlerTests { @Test void alreadyConnected() { - this.brokerRelay.start(); Message connect = connectMessage("sess1", "joe"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java index 4c34b2033f..a51a9cb96b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java @@ -34,16 +34,15 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; /** - * Unit tests for - * {@link org.springframework.messaging.simp.user.DefaultUserDestinationResolver}. + * Unit tests for {@link DefaultUserDestinationResolver}. * * @author Rossen Stoyanchev */ public class DefaultUserDestinationResolverTests { - private DefaultUserDestinationResolver resolver; + private SimpUserRegistry registry = mock(); - private SimpUserRegistry registry; + private DefaultUserDestinationResolver resolver = new DefaultUserDestinationResolver(this.registry); @BeforeEach @@ -51,10 +50,7 @@ public class DefaultUserDestinationResolverTests { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123")); - this.registry = mock(SimpUserRegistry.class); given(this.registry.getUser("joe")).willReturn(simpUser); - - this.resolver = new DefaultUserDestinationResolver(this.registry); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java index 1c12de14f1..837b021eab 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Set; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.messaging.Message; import org.springframework.messaging.converter.MappingJackson2MessageConverter; @@ -40,7 +39,7 @@ import static org.mockito.Mockito.mock; */ class MultiServerUserRegistryTests { - private final SimpUserRegistry localRegistry = Mockito.mock(SimpUserRegistry.class); + private final SimpUserRegistry localRegistry = mock(); private final MultiServerUserRegistry registry = new MultiServerUserRegistry(this.localRegistry); @@ -49,7 +48,7 @@ class MultiServerUserRegistryTests { @Test void getUserFromLocalRegistry() { - SimpUser user = Mockito.mock(SimpUser.class); + SimpUser user = mock(); Set users = Collections.singleton(user); given(this.localRegistry.getUsers()).willReturn(users); given(this.localRegistry.getUserCount()).willReturn(1); @@ -66,7 +65,7 @@ class MultiServerUserRegistryTests { TestSimpSession testSession = new TestSimpSession("remote-sess"); testSession.addSubscriptions(new TestSimpSubscription("remote-sub", "/remote-dest")); testUser.addSessions(testSession); - SimpUserRegistry testRegistry = mock(SimpUserRegistry.class); + SimpUserRegistry testRegistry = mock(); given(testRegistry.getUsers()).willReturn(Collections.singleton(testUser)); Object registryDto = new MultiServerUserRegistry(testRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); @@ -105,7 +104,7 @@ class MultiServerUserRegistryTests { user1.addSessions(session1); user2.addSessions(session2); user3.addSessions(session3); - SimpUserRegistry userRegistry = mock(SimpUserRegistry.class); + SimpUserRegistry userRegistry = mock(); given(userRegistry.getUsers()).willReturn(new HashSet<>(Arrays.asList(user1, user2, user3))); Object registryDto = new MultiServerUserRegistry(userRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); @@ -135,7 +134,7 @@ class MultiServerUserRegistryTests { TestSimpUser remoteUser = new TestSimpUser("joe"); TestSimpSession remoteSession = new TestSimpSession("sess456"); remoteUser.addSessions(remoteSession); - SimpUserRegistry remoteRegistry = mock(SimpUserRegistry.class); + SimpUserRegistry remoteRegistry = mock(); given(remoteRegistry.getUsers()).willReturn(Collections.singleton(remoteUser)); Object remoteRegistryDto = new MultiServerUserRegistry(remoteRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(remoteRegistryDto, null); @@ -164,7 +163,7 @@ class MultiServerUserRegistryTests { // Prepare broadcast message from remote server TestSimpUser testUser = new TestSimpUser("joe"); testUser.addSessions(new TestSimpSession("remote-sub")); - SimpUserRegistry testRegistry = mock(SimpUserRegistry.class); + SimpUserRegistry testRegistry = mock(); given(testRegistry.getUsers()).willReturn(Collections.singleton(testUser)); Object registryDto = new MultiServerUserRegistry(testRegistry).getLocalRegistryDto(); Message message = this.converter.toMessage(registryDto, null); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java index 121429b411..08ab8435f2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java @@ -46,9 +46,9 @@ class UserDestinationMessageHandlerTests { private static final String SESSION_ID = "123"; - private final SimpUserRegistry registry = mock(SimpUserRegistry.class); + private final SimpUserRegistry registry = mock(); - private final SubscribableChannel brokerChannel = mock(SubscribableChannel.class); + private final SubscribableChannel brokerChannel = mock(); private final UserDestinationMessageHandler handler = new UserDestinationMessageHandler(new StubMessageChannel(), this.brokerChannel, new DefaultUserDestinationResolver(this.registry)); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java index 60e06786a9..0ebf48683f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserRegistryMessageHandlerTests.java @@ -24,10 +24,7 @@ import java.util.concurrent.ScheduledFuture; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -49,52 +46,43 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; /** * User tests for {@link UserRegistryMessageHandler}. + * * @author Rossen Stoyanchev */ -@ExtendWith(MockitoExtension.class) -public class UserRegistryMessageHandlerTests { +class UserRegistryMessageHandlerTests { + + private SimpUserRegistry localRegistry = mock(); + + private MessageChannel brokerChannel = mock(); + + private TaskScheduler taskScheduler = mock(); + + private MultiServerUserRegistry multiServerRegistry = new MultiServerUserRegistry(this.localRegistry); + + private MessageConverter converter = new MappingJackson2MessageConverter(); private UserRegistryMessageHandler handler; - private SimpUserRegistry localRegistry; - - private MultiServerUserRegistry multiServerRegistry; - - private MessageConverter converter; - - - @Mock - private MessageChannel brokerChannel; - - @Mock - private TaskScheduler taskScheduler; - @BeforeEach - public void setUp() throws Exception { - this.converter = new MappingJackson2MessageConverter(); - + void setUp() throws Exception { SimpMessagingTemplate brokerTemplate = new SimpMessagingTemplate(this.brokerChannel); brokerTemplate.setMessageConverter(this.converter); - this.localRegistry = mock(SimpUserRegistry.class); - this.multiServerRegistry = new MultiServerUserRegistry(this.localRegistry); - this.handler = new UserRegistryMessageHandler(this.multiServerRegistry, brokerTemplate, "/topic/simp-user-registry", this.taskScheduler); } @Test - public void brokerAvailableEvent() throws Exception { + void brokerAvailableEvent() throws Exception { Runnable runnable = getUserRegistryTask(); assertThat(runnable).isNotNull(); } @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void brokerUnavailableEvent() throws Exception { - - ScheduledFuture future = mock(ScheduledFuture.class); + void brokerUnavailableEvent() throws Exception { + ScheduledFuture future = mock(); given(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), any(Duration.class))).willReturn(future); BrokerAvailabilityEvent event = new BrokerAvailabilityEvent(true, this); @@ -108,7 +96,7 @@ public class UserRegistryMessageHandlerTests { @Test @SuppressWarnings("rawtypes") - public void broadcastRegistry() throws Exception { + void broadcastRegistry() throws Exception { given(this.brokerChannel.send(any())).willReturn(true); TestSimpUser simpUser1 = new TestSimpUser("joe"); @@ -130,7 +118,7 @@ public class UserRegistryMessageHandlerTests { MessageHeaders headers = message.getHeaders(); assertThat(SimpMessageHeaderAccessor.getDestination(headers)).isEqualTo("/topic/simp-user-registry"); - MultiServerUserRegistry remoteRegistry = new MultiServerUserRegistry(mock(SimpUserRegistry.class)); + MultiServerUserRegistry remoteRegistry = new MultiServerUserRegistry(mock()); remoteRegistry.addRemoteRegistryDto(message, this.converter, 20000); assertThat(remoteRegistry.getUserCount()).isEqualTo(2); assertThat(remoteRegistry.getUser("joe")).isNotNull(); @@ -138,8 +126,7 @@ public class UserRegistryMessageHandlerTests { } @Test - public void handleMessage() throws Exception { - + void handleMessage() throws Exception { TestSimpUser simpUser1 = new TestSimpUser("joe"); TestSimpUser simpUser2 = new TestSimpUser("jane"); @@ -147,7 +134,7 @@ public class UserRegistryMessageHandlerTests { simpUser2.addSessions(new TestSimpSession("456")); HashSet simpUsers = new HashSet<>(Arrays.asList(simpUser1, simpUser2)); - SimpUserRegistry remoteUserRegistry = mock(SimpUserRegistry.class); + SimpUserRegistry remoteUserRegistry = mock(); given(remoteUserRegistry.getUserCount()).willReturn(2); given(remoteUserRegistry.getUsers()).willReturn(simpUsers); @@ -162,8 +149,7 @@ public class UserRegistryMessageHandlerTests { } @Test - public void handleMessageFromOwnBroadcast() throws Exception { - + void handleMessageFromOwnBroadcast() throws Exception { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123")); given(this.localRegistry.getUserCount()).willReturn(1); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java index 2bab41ff57..9e916b5757 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java @@ -54,7 +54,7 @@ public class ChannelInterceptorTests { @Test public void preSendInterceptorReturningModifiedMessage() { - Message expected = mock(Message.class); + Message expected = mock(); PreSendInterceptor interceptor = new PreSendInterceptor(); interceptor.setMessageToReturn(expected); this.channel.addInterceptor(interceptor); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java index 730769bc7c..8c0d27a57c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java @@ -83,7 +83,7 @@ public class ExecutorSubscribableChannelTests { @Test public void sendWithExecutor() { BeforeHandleInterceptor interceptor = new BeforeHandleInterceptor(); - TaskExecutor executor = mock(TaskExecutor.class); + TaskExecutor executor = mock(); ExecutorSubscribableChannel testChannel = new ExecutorSubscribableChannel(executor); testChannel.addInterceptor(interceptor); testChannel.subscribe(this.handler); @@ -117,7 +117,7 @@ public class ExecutorSubscribableChannelTests { public void failurePropagates() { RuntimeException ex = new RuntimeException(); willThrow(ex).given(this.handler).handleMessage(this.message); - MessageHandler secondHandler = mock(MessageHandler.class); + MessageHandler secondHandler = mock(); this.channel.subscribe(this.handler); this.channel.subscribe(secondHandler); try { @@ -139,7 +139,7 @@ public class ExecutorSubscribableChannelTests { @Test public void interceptorWithModifiedMessage() { - Message expected = mock(Message.class); + Message expected = mock(); BeforeHandleInterceptor interceptor = new BeforeHandleInterceptor(); interceptor.setMessageToReturn(expected); this.channel.addInterceptor(interceptor); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index d5cf2c1ce8..963f18f8d5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -40,8 +40,8 @@ public abstract class AbstractEntityManagerFactoryBeanTests { protected static EntityManagerFactory mockEmf; @BeforeEach - public void setUp() throws Exception { - mockEmf = mock(EntityManagerFactory.class); + public void setUp() { + mockEmf = mock(); } @AfterEach diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java index 12c75166f6..1583170eed 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java @@ -49,8 +49,8 @@ public class DefaultJpaDialectTests { @Test public void testDefaultBeginTransaction() throws Exception { TransactionDefinition definition = new DefaultTransactionDefinition(); - EntityManager entityManager = mock(EntityManager.class); - EntityTransaction entityTx = mock(EntityTransaction.class); + EntityManager entityManager = mock(); + EntityTransaction entityTx = mock(); given(entityManager.getTransaction()).willReturn(entityTx); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java index b651f8eb67..9645f09890 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java @@ -56,7 +56,7 @@ public class EntityManagerFactoryUtilsTests { // test null assertion assertThatIllegalArgumentException().isThrownBy(() -> EntityManagerFactoryUtils.doGetTransactionalEntityManager(null, null)); - EntityManagerFactory factory = mock(EntityManagerFactory.class); + EntityManagerFactory factory = mock(); // no tx active assertThat(EntityManagerFactoryUtils.doGetTransactionalEntityManager(factory, null)).isNull(); @@ -66,8 +66,8 @@ public class EntityManagerFactoryUtilsTests { @Test public void testDoGetEntityManagerWithTx() throws Exception { try { - EntityManagerFactory factory = mock(EntityManagerFactory.class); - EntityManager manager = mock(EntityManager.class); + EntityManagerFactory factory = mock(); + EntityManager manager = mock(); TransactionSynchronizationManager.initSynchronization(); given(factory.createEntityManager()).willReturn(manager); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java index c8547d1dc4..e4b26f7fd9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java @@ -53,26 +53,19 @@ import static org.mockito.Mockito.verify; @SuppressWarnings({"unchecked", "rawtypes"}) public class JpaTransactionManagerTests { - private EntityManagerFactory factory; + private EntityManagerFactory factory = mock(); - private EntityManager manager; + private EntityManager manager = mock(); - private EntityTransaction tx; + private EntityTransaction tx = mock(); - private JpaTransactionManager tm; + private JpaTransactionManager tm = new JpaTransactionManager(factory); - private TransactionTemplate tt; + private TransactionTemplate tt = new TransactionTemplate(tm); @BeforeEach public void setup() { - factory = mock(EntityManagerFactory.class); - manager = mock(EntityManager.class); - tx = mock(EntityTransaction.class); - - tm = new JpaTransactionManager(factory); - tt = new TransactionTemplate(tm); - given(factory.createEntityManager()).willReturn(manager); given(manager.getTransaction()).willReturn(tx); given(manager.isOpen()).willReturn(true); @@ -448,8 +441,8 @@ public class JpaTransactionManagerTests { public void testTransactionWithRequiresNewInAfterCompletion() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); - EntityManager manager2 = mock(EntityManager.class); - EntityTransaction tx2 = mock(EntityTransaction.class); + EntityManager manager2 = mock(); + EntityTransaction tx2 = mock(); given(manager.getTransaction()).willReturn(tx); given(factory.createEntityManager()).willReturn(manager, manager2); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java index d3741988e2..6db5ec3fd7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java @@ -101,7 +101,7 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM @Test public void testApplicationManagedEntityManagerWithoutTransaction() throws Exception { Object testEntity = new Object(); - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); @@ -122,14 +122,14 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM public void testApplicationManagedEntityManagerWithTransaction() throws Exception { Object testEntity = new Object(); - EntityTransaction mockTx = mock(EntityTransaction.class); + EntityTransaction mockTx = mock(); // This one's for the tx (shared) - EntityManager sharedEm = mock(EntityManager.class); + EntityManager sharedEm = mock(); given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction()); // This is the application-specific one - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEm.getTransaction()).willReturn(mockTx); given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm); @@ -163,15 +163,15 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM public void testApplicationManagedEntityManagerWithTransactionAndCommitException() throws Exception { Object testEntity = new Object(); - EntityTransaction mockTx = mock(EntityTransaction.class); + EntityTransaction mockTx = mock(); willThrow(new OptimisticLockException()).given(mockTx).commit(); // This one's for the tx (shared) - EntityManager sharedEm = mock(EntityManager.class); + EntityManager sharedEm = mock(); given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction()); // This is the application-specific one - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEm.getTransaction()).willReturn(mockTx); given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm); @@ -206,11 +206,11 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM Object testEntity = new Object(); // This one's for the tx (shared) - EntityManager sharedEm = mock(EntityManager.class); + EntityManager sharedEm = mock(); given(sharedEm.getTransaction()).willReturn(new NoOpEntityTransaction()); // This is the application-specific one - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(sharedEm, mockEm); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java index f2768122b7..919e006930 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java @@ -55,7 +55,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnJoinTransaction() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy( em::joinTransaction); @@ -63,7 +63,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnFlush() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy( em::flush); @@ -71,7 +71,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnPersist() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy(() -> em.persist(new Object())); @@ -79,7 +79,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnMerge() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy(() -> em.merge(new Object())); @@ -87,7 +87,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnRemove() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy(() -> em.remove(new Object())); @@ -95,7 +95,7 @@ public class SharedEntityManagerCreatorTests { @Test public void transactionRequiredExceptionOnRefresh() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); + EntityManagerFactory emf = mock(); EntityManager em = SharedEntityManagerCreator.createSharedEntityManager(emf); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy(() -> em.refresh(new Object())); @@ -103,9 +103,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredQueryWithUpdate() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - Query query = mock(Query.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + Query query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createQuery("x")).willReturn(query); given(targetEm.isOpen()).willReturn(true); @@ -119,9 +119,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredQueryWithSingleResult() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - Query query = mock(Query.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + Query query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createQuery("x")).willReturn(query); given(targetEm.isOpen()).willReturn(true); @@ -135,9 +135,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredQueryWithResultList() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - Query query = mock(Query.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + Query query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createQuery("x")).willReturn(query); given(targetEm.isOpen()).willReturn(true); @@ -151,9 +151,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredQueryWithResultStream() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - Query query = mock(Query.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + Query query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createQuery("x")).willReturn(query); given(targetEm.isOpen()).willReturn(true); @@ -167,9 +167,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredStoredProcedureQueryWithIndexedParameters() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - StoredProcedureQuery query = mock(StoredProcedureQuery.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + StoredProcedureQuery query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createStoredProcedureQuery("x")).willReturn(query); willReturn("y").given(query).getOutputParameterValue(0); @@ -198,9 +198,9 @@ public class SharedEntityManagerCreatorTests { @Test public void deferredStoredProcedureQueryWithNamedParameters() { - EntityManagerFactory emf = mock(EntityManagerFactory.class); - EntityManager targetEm = mock(EntityManager.class); - StoredProcedureQuery query = mock(StoredProcedureQuery.class); + EntityManagerFactory emf = mock(); + EntityManager targetEm = mock(); + StoredProcedureQuery query = mock(); given(emf.createEntityManager()).willReturn(targetEm); given(targetEm.createStoredProcedureQuery("x")).willReturn(query); willReturn("y").given(query).getOutputParameterValue("a"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java index 3cfce81b9f..04ef5dd0df 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java @@ -142,7 +142,7 @@ class PersistenceManagedTypesBeanRegistrationAotProcessorTests { @Bean public DataSource mockDataSource() { - return mock(DataSource.class); + return mock(); } @Bean diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index bceca4ad5f..062b19a8d3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -62,30 +62,23 @@ import static org.mockito.Mockito.verify; */ public class OpenEntityManagerInViewTests { - private EntityManager manager; - - private EntityManagerFactory factory; - - private MockHttpServletRequest request; - - private MockHttpServletResponse response; - - private ServletWebRequest webRequest; - private final TestTaskExecutor taskExecutor = new TestTaskExecutor(); + private EntityManager manager = mock(); + + private EntityManagerFactory factory = mock(); + + private MockHttpServletRequest request = new MockHttpServletRequest(); + + private MockHttpServletResponse response = new MockHttpServletResponse(); + + private ServletWebRequest webRequest = new ServletWebRequest(this.request); + @BeforeEach public void setUp() { - factory = mock(EntityManagerFactory.class); - manager = mock(EntityManager.class); - given(factory.createEntityManager()).willReturn(manager); - - this.request = new MockHttpServletRequest(); this.request.setAsyncSupported(true); - this.response = new MockHttpServletResponse(); - this.webRequest = new ServletWebRequest(this.request); } @AfterEach @@ -273,8 +266,8 @@ public class OpenEntityManagerInViewTests { public void testOpenEntityManagerInViewFilter() throws Exception { given(manager.isOpen()).willReturn(true); - final EntityManagerFactory factory2 = mock(EntityManagerFactory.class); - final EntityManager manager2 = mock(EntityManager.class); + final EntityManagerFactory factory2 = mock(); + final EntityManager manager2 = mock(); given(factory2.createEntityManager()).willReturn(manager2); given(manager2.isOpen()).willReturn(true); @@ -327,8 +320,8 @@ public class OpenEntityManagerInViewTests { public void testOpenEntityManagerInViewFilterAsyncScenario() throws Exception { given(manager.isOpen()).willReturn(true); - final EntityManagerFactory factory2 = mock(EntityManagerFactory.class); - final EntityManager manager2 = mock(EntityManager.class); + final EntityManagerFactory factory2 = mock(); + final EntityManager manager2 = mock(); given(factory2.createEntityManager()).willReturn(manager2); given(manager2.isOpen()).willReturn(true); @@ -368,7 +361,7 @@ public class OpenEntityManagerInViewTests { FilterChain filterChain3 = new PassThroughFilterChain(filter2, filterChain2); - AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class); + AsyncWebRequest asyncWebRequest = mock(); given(asyncWebRequest.isAsyncStarted()).willReturn(true); WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.request); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java index f86bb63c60..0b681bddbf 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java @@ -70,7 +70,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { void processAheadOfTimeWhenPersistenceUnitOnPublicField() { RegisteredBean registeredBean = registerBean(DefaultPersistenceUnitField.class); testCompile(registeredBean, (actual, compiled) -> { - EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class); + EntityManagerFactory entityManagerFactory = mock(); this.beanFactory.registerSingleton("entityManagerFactory", entityManagerFactory); DefaultPersistenceUnitField instance = new DefaultPersistenceUnitField(); @@ -85,7 +85,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { void processAheadOfTimeWhenPersistenceUnitOnPublicSetter() { RegisteredBean registeredBean = registerBean(DefaultPersistenceUnitMethod.class); testCompile(registeredBean, (actual, compiled) -> { - EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class); + EntityManagerFactory entityManagerFactory = mock(); this.beanFactory.registerSingleton("entityManagerFactory", entityManagerFactory); DefaultPersistenceUnitMethod instance = new DefaultPersistenceUnitMethod(); @@ -101,7 +101,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { RegisteredBean registeredBean = registerBean( CustomUnitNamePublicPersistenceUnitMethod.class); testCompile(registeredBean, (actual, compiled) -> { - EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class); + EntityManagerFactory entityManagerFactory = mock(); this.beanFactory.registerSingleton("custom", entityManagerFactory); CustomUnitNamePublicPersistenceUnitMethod instance = new CustomUnitNamePublicPersistenceUnitMethod(); actual.accept(registeredBean, instance); @@ -118,7 +118,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { RegisteredBean registeredBean = registerBean( DefaultPersistenceContextField.class); testCompile(registeredBean, (actual, compiled) -> { - EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class); + EntityManagerFactory entityManagerFactory = mock(); this.beanFactory.registerSingleton("entityManagerFactory", entityManagerFactory); DefaultPersistenceContextField instance = new DefaultPersistenceContextField(); @@ -139,7 +139,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { RegisteredBean registeredBean = registerBean( CustomPropertiesPersistenceContextMethod.class); testCompile(registeredBean, (actual, compiled) -> { - EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class); + EntityManagerFactory entityManagerFactory = mock(); this.beanFactory.registerSingleton("entityManagerFactory", entityManagerFactory); CustomPropertiesPersistenceContextMethod instance = new CustomPropertiesPersistenceContextMethod(); @@ -172,7 +172,7 @@ class PersistenceAnnotationBeanPostProcessorAotContributionTests { PersistenceAnnotationBeanPostProcessor postProcessor = new PersistenceAnnotationBeanPostProcessor(); BeanRegistrationAotContribution contribution = postProcessor .processAheadOfTime(registeredBean); - BeanRegistrationCode beanRegistrationCode = mock(BeanRegistrationCode.class); + BeanRegistrationCode beanRegistrationCode = mock(); contribution.applyTo(generationContext, beanRegistrationCode); generationContext.writeGeneratedContent(); TestCompiler.forSystem().with(generationContext) diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java index 82e22136e0..279c873aac 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java @@ -42,33 +42,25 @@ import static org.mockito.Mockito.verify; * @author Juergen Hoeller * @since 4.1.2 */ -public class PersistenceContextTransactionTests { +class PersistenceContextTransactionTests { - private EntityManagerFactory factory; + private EntityManagerFactory factory = mock(); - private EntityManager manager; + private EntityManager manager = mock(); - private EntityTransaction tx; + private EntityTransaction tx = mock(); - private TransactionTemplate tt; + private TransactionTemplate tt = new TransactionTemplate(new JpaTransactionManager(factory)); - private EntityManagerHoldingBean bean; + private EntityManagerHoldingBean bean = new EntityManagerHoldingBean(); @BeforeEach - public void setup() { - factory = mock(EntityManagerFactory.class); - manager = mock(EntityManager.class); - tx = mock(EntityTransaction.class); - - JpaTransactionManager tm = new JpaTransactionManager(factory); - tt = new TransactionTemplate(tm); - + void setup() { given(factory.createEntityManager()).willReturn(manager); given(manager.getTransaction()).willReturn(tx); given(manager.isOpen()).willReturn(true); - bean = new EntityManagerHoldingBean(); @SuppressWarnings("serial") PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor() { @Override @@ -83,7 +75,7 @@ public class PersistenceContextTransactionTests { } @AfterEach - public void clear() { + void clear() { assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); @@ -92,7 +84,7 @@ public class PersistenceContextTransactionTests { @Test - public void testTransactionCommitWithSharedEntityManager() { + void testTransactionCommitWithSharedEntityManager() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -106,7 +98,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithSharedEntityManagerAndPropagationSupports() { + void testTransactionCommitWithSharedEntityManagerAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -121,7 +113,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManager() { + void testTransactionCommitWithExtendedEntityManager() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -135,7 +127,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManagerAndPropagationSupports() { + void testTransactionCommitWithExtendedEntityManagerAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -149,7 +141,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithSharedEntityManagerUnsynchronized() { + void testTransactionCommitWithSharedEntityManagerUnsynchronized() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -163,7 +155,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithSharedEntityManagerUnsynchronizedAndPropagationSupports() { + void testTransactionCommitWithSharedEntityManagerUnsynchronizedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -178,7 +170,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManagerUnsynchronized() { + void testTransactionCommitWithExtendedEntityManagerUnsynchronized() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -192,7 +184,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManagerUnsynchronizedAndPropagationSupports() { + void testTransactionCommitWithExtendedEntityManagerUnsynchronizedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -206,7 +198,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoined() { + void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoined() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -221,7 +213,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoined() { + void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoined() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -236,7 +228,7 @@ public class PersistenceContextTransactionTests { } @Test - public void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoinedAndPropagationSupports() { + void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoinedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -251,19 +243,19 @@ public class PersistenceContextTransactionTests { } - public static class EntityManagerHoldingBean { + static class EntityManagerHoldingBean { @PersistenceContext - public EntityManager sharedEntityManager; + EntityManager sharedEntityManager; @PersistenceContext(type = PersistenceContextType.EXTENDED) - public EntityManager extendedEntityManager; + EntityManager extendedEntityManager; @PersistenceContext(synchronization = SynchronizationType.UNSYNCHRONIZED) - public EntityManager sharedEntityManagerUnsynchronized; + EntityManager sharedEntityManagerUnsynchronized; @PersistenceContext(type = PersistenceContextType.EXTENDED, synchronization = SynchronizationType.UNSYNCHRONIZED) - public EntityManager extendedEntityManagerUnsynchronized; + EntityManager extendedEntityManagerUnsynchronized; } } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index d51505fb1d..2a3fcae9b5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -105,7 +105,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicExtendedPersistenceContextSetter() { - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); GenericApplicationContext gac = new GenericApplicationContext(); @@ -123,8 +123,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicSpecificExtendedPersistenceContextSetter() { - EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class); - EntityManager mockEm2 = mock(EntityManager.class); + EntityManagerFactory mockEmf2 = mock(); + EntityManager mockEm2 = mock(); given(mockEmf2.createEntityManager()).willReturn(mockEm2); GenericApplicationContext gac = new GenericApplicationContext(); @@ -146,7 +146,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testInjectionIntoExistingObjects() { - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); GenericApplicationContext gac = new GenericApplicationContext(); @@ -197,7 +197,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPublicExtendedPersistenceContextSetterWithEntityManagerInfoAndSerialization() throws Exception { EntityManager mockEm = mock(EntityManager.class, withSettings().serializable()); given(mockEm.isOpen()).willReturn(true); - EntityManagerFactoryWithInfo mockEmf = mock(EntityManagerFactoryWithInfo.class); + EntityManagerFactoryWithInfo mockEmf = mock(); given(mockEmf.getJpaDialect()).willReturn(new DefaultJpaDialect()); given(mockEmf.getEntityManagerInterface()).willReturn((Class) EntityManager.class); given(mockEmf.getBeanClassLoader()).willReturn(getClass().getClassLoader()); @@ -219,7 +219,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicExtendedPersistenceContextSetterWithOverriding() { - EntityManager mockEm2 = mock(EntityManager.class); + EntityManager mockEm2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -267,7 +267,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicPersistenceUnitSetterWithOverriding() { - EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class); + EntityManagerFactory mockEmf2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -285,7 +285,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() { - EntityManagerFactory mockEmf2 = mock(EntityManagerFactory.class); + EntityManagerFactory mockEmf2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -310,7 +310,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPublicPersistenceUnitSetterWithMultipleUnitsIdentifiedThroughUnitName() { - EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class); + EntityManagerFactoryWithInfo mockEmf2 = mock(); given(mockEmf2.getPersistenceUnitName()).willReturn("Person"); GenericApplicationContext gac = new GenericApplicationContext(); @@ -335,10 +335,10 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPersistenceUnitsFromJndi() { - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); - EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class); + EntityManagerFactoryWithInfo mockEmf2 = mock(); Map persistenceUnits = new HashMap<>(); persistenceUnits.put("", "pu1"); @@ -377,7 +377,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPersistenceUnitsFromJndiWithDefaultUnit() { - EntityManagerFactoryWithInfo mockEmf2 = mock(EntityManagerFactoryWithInfo.class); + EntityManagerFactoryWithInfo mockEmf2 = mock(); Map persistenceUnits = new HashMap<>(); persistenceUnits.put("System", "pu1"); @@ -432,9 +432,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPersistenceContextsFromJndi() { - EntityManager mockEm = mock(EntityManager.class); - EntityManager mockEm2 = mock(EntityManager.class); - EntityManager mockEm3 = mock(EntityManager.class); + EntityManager mockEm = mock(); + EntityManager mockEm2 = mock(); + EntityManager mockEm3 = mock(); Map persistenceContexts = new HashMap<>(); persistenceContexts.put("", "pc1"); @@ -472,9 +472,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testPersistenceContextsFromJndiWithDefaultUnit() { - EntityManager mockEm = mock(EntityManager.class); - EntityManager mockEm2 = mock(EntityManager.class); - EntityManager mockEm3 = mock(EntityManager.class); + EntityManager mockEm = mock(); + EntityManager mockEm2 = mock(); + EntityManager mockEm3 = mock(); Map persistenceContexts = new HashMap<>(); persistenceContexts.put("System", "pc1"); @@ -513,8 +513,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testSinglePersistenceContextFromJndi() { - EntityManager mockEm = mock(EntityManager.class); - EntityManager mockEm2 = mock(EntityManager.class); + EntityManager mockEm = mock(); + EntityManager mockEm2 = mock(); Map persistenceContexts = new HashMap<>(); persistenceContexts.put("System", "pc1"); @@ -566,7 +566,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Test public void testNoPropertiesPassedIn() { - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); PersistenceAnnotationBeanPostProcessor pabpp = new MockPersistenceAnnotationBeanPostProcessor(); @@ -579,7 +579,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPropertiesPassedIn() { Properties props = new Properties(); props.put("foo", "bar"); - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEmf.createEntityManager(props)).willReturn(mockEm); PersistenceAnnotationBeanPostProcessor pabpp = new MockPersistenceAnnotationBeanPostProcessor(); @@ -593,7 +593,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPropertiesForTransactionalEntityManager() { Properties props = new Properties(); props.put("foo", "bar"); - EntityManager em = mock(EntityManager.class); + EntityManager em = mock(); given(mockEmf.createEntityManager(props)).willReturn(em); given(em.getDelegate()).willReturn(new Object()); given(em.isOpen()).willReturn(true); @@ -617,7 +617,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPropertiesForSharedEntityManager1() { Properties props = new Properties(); props.put("foo", "bar"); - EntityManager em = mock(EntityManager.class); + EntityManager em = mock(); // only one call made - the first EM definition wins (in this case the one w/ the properties) given(mockEmf.createEntityManager(props)).willReturn(em); given(em.getDelegate()).willReturn(new Object()); @@ -650,7 +650,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPropertiesForSharedEntityManager2() { Properties props = new Properties(); props.put("foo", "bar"); - EntityManager em = mock(EntityManager.class); + EntityManager em = mock(); // only one call made - the first EM definition wins (in this case the one w/o the properties) given(mockEmf.createEntityManager()).willReturn(em); given(em.getDelegate()).willReturn(new Object(), 2); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java index 93f53e1e51..6584910ec8 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java @@ -41,10 +41,10 @@ public class SharedEntityManagerFactoryTests { public void testValidUsage() { Object o = new Object(); - EntityManager mockEm = mock(EntityManager.class); + EntityManager mockEm = mock(); given(mockEm.isOpen()).willReturn(true); - EntityManagerFactory mockEmf = mock(EntityManagerFactory.class); + EntityManagerFactory mockEmf = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); SharedEntityManagerBean proxyFactoryBean = new SharedEntityManagerBean(); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index 5769a67f61..e7fa6f10be 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -105,7 +105,7 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { @Test void marshalSAXResult() throws Exception { - ContentHandler contentHandler = mock(ContentHandler.class); + ContentHandler contentHandler = mock(); SAXResult result = new SAXResult(contentHandler); marshaller.marshal(flights, result); InOrder ordered = inOrder(contentHandler); @@ -277,7 +277,7 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { marshaller.setClassesToBeBound(BinaryObject.class); marshaller.setMtomEnabled(true); marshaller.afterPropertiesSet(); - MimeContainer mimeContainer = mock(MimeContainer.class); + MimeContainer mimeContainer = mock(); Resource logo = new ClassPathResource("spring-ws.png", getClass()); DataHandler dataHandler = new DataHandler(new FileDataSource(logo.getFile())); @@ -307,7 +307,7 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { @Test // SPR-10806 void unmarshalStreamSourceWithXmlOptions() throws Exception { - final jakarta.xml.bind.Unmarshaller unmarshaller = mock(jakarta.xml.bind.Unmarshaller.class); + final jakarta.xml.bind.Unmarshaller unmarshaller = mock(); Jaxb2Marshaller marshaller = new Jaxb2Marshaller() { @Override public jakarta.xml.bind.Unmarshaller createUnmarshaller() { @@ -341,7 +341,7 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { @Test // SPR-10806 void unmarshalSaxSourceWithXmlOptions() throws Exception { - final jakarta.xml.bind.Unmarshaller unmarshaller = mock(jakarta.xml.bind.Unmarshaller.class); + final jakarta.xml.bind.Unmarshaller unmarshaller = mock(); Jaxb2Marshaller marshaller = new Jaxb2Marshaller() { @Override public jakarta.xml.bind.Unmarshaller createUnmarshaller() { diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java index e0b4b5147f..f03924bbf8 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java @@ -83,7 +83,7 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests operation = NamedParameterUtils.substituteNamedParameters( "xxx :a", BIND_MARKERS, namedParams); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/AnonymousBindMarkersUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/AnonymousBindMarkersUnitTests.java index 87169d4bca..ae14486b29 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/AnonymousBindMarkersUnitTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/AnonymousBindMarkersUnitTests.java @@ -42,7 +42,7 @@ class AnonymousBindMarkersUnitTests { @Test public void shouldBindByIndex() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.anonymous("?").create(); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/BindingsUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/BindingsUnitTests.java index 0bfef03742..35f46709f4 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/BindingsUnitTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/BindingsUnitTests.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; class BindingsUnitTests { BindMarkersFactory markersFactory = BindMarkersFactory.indexed("$", 1); - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); @Test void shouldCreateBindings() { diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/IndexedBindMarkersUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/IndexedBindMarkersUnitTests.java index 9bc389d718..5fe7739913 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/IndexedBindMarkersUnitTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/IndexedBindMarkersUnitTests.java @@ -42,7 +42,7 @@ class IndexedBindMarkersUnitTests { @Test void shouldCreateNewBindMarkersWithOffset() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 1).create(); @@ -77,7 +77,7 @@ class IndexedBindMarkersUnitTests { @Test void bindValueShouldBindByIndex() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 0).create(); @@ -90,7 +90,7 @@ class IndexedBindMarkersUnitTests { @Test void bindNullShouldBindByIndex() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 0).create(); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/NamedBindMarkersUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/NamedBindMarkersUnitTests.java index d83691e5b2..cab993701d 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/NamedBindMarkersUnitTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/NamedBindMarkersUnitTests.java @@ -89,7 +89,7 @@ class NamedBindMarkersUnitTests { @Test void bindValueShouldBindByName() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32).create(); @@ -102,7 +102,7 @@ class NamedBindMarkersUnitTests { @Test void bindNullShouldBindByName() { - BindTarget bindTarget = mock(BindTarget.class); + BindTarget bindTarget = mock(); BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32).create(); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java index de0a06343e..4e290bd397 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java @@ -53,28 +53,24 @@ class MockFilterChainTests { @Test void constructorNullServlet() { - assertThatIllegalArgumentException().isThrownBy(() -> - new MockFilterChain(null)); + assertThatIllegalArgumentException().isThrownBy(() -> new MockFilterChain(null)); } @Test void constructorNullFilter() { - assertThatIllegalArgumentException().isThrownBy(() -> - new MockFilterChain(mock(Servlet.class), (Filter) null)); + assertThatIllegalArgumentException().isThrownBy(() -> new MockFilterChain(mock(), (Filter) null)); } @Test void doFilterNullRequest() throws Exception { MockFilterChain chain = new MockFilterChain(); - assertThatIllegalArgumentException().isThrownBy(() -> - chain.doFilter(null, this.response)); + assertThatIllegalArgumentException().isThrownBy(() -> chain.doFilter(null, this.response)); } @Test void doFilterNullResponse() throws Exception { MockFilterChain chain = new MockFilterChain(); - assertThatIllegalArgumentException().isThrownBy(() -> - chain.doFilter(this.request, null)); + assertThatIllegalArgumentException().isThrownBy(() -> chain.doFilter(this.request, null)); } @Test @@ -85,25 +81,25 @@ class MockFilterChainTests { assertThat(chain.getRequest()).isEqualTo(request); assertThat(chain.getResponse()).isEqualTo(response); - assertThatIllegalStateException().isThrownBy(() -> - chain.doFilter(this.request, this.response)) + assertThatIllegalStateException() + .isThrownBy(() -> chain.doFilter(this.request, this.response)) .withMessage("This FilterChain has already been called!"); } @Test void doFilterWithServlet() throws Exception { - Servlet servlet = mock(Servlet.class); + Servlet servlet = mock(); MockFilterChain chain = new MockFilterChain(servlet); chain.doFilter(this.request, this.response); verify(servlet).service(this.request, this.response); - assertThatIllegalStateException().isThrownBy(() -> - chain.doFilter(this.request, this.response)) + assertThatIllegalStateException() + .isThrownBy(() -> chain.doFilter(this.request, this.response)) .withMessage("This FilterChain has already been called!"); } @Test void doFilterWithServletAndFilters() throws Exception { - Servlet servlet = mock(Servlet.class); + Servlet servlet = mock(); MockFilter filter2 = new MockFilter(servlet); MockFilter filter1 = new MockFilter(null); @@ -116,8 +112,8 @@ class MockFilterChainTests { verify(servlet).service(this.request, this.response); - assertThatIllegalStateException().isThrownBy(() -> - chain.doFilter(this.request, this.response)) + assertThatIllegalStateException() + .isThrownBy(() -> chain.doFilter(this.request, this.response)) .withMessage("This FilterChain has already been called!"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java index db3297c5fc..697d5d055f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java @@ -56,7 +56,7 @@ import static org.springframework.test.context.NestedTestConfiguration.Enclosing */ class BootstrapUtilsTests { - private final CacheAwareContextLoaderDelegate delegate = mock(CacheAwareContextLoaderDelegate.class); + private final CacheAwareContextLoaderDelegate delegate = mock(); @Test void resolveTestContextBootstrapperWithEmptyBootstrapWithAnnotation() { diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java index 002da9c991..ca59b81931 100644 --- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java @@ -407,7 +407,7 @@ class MergedContextConfigurationTests { */ @Test void equalsWithSameContextCustomizers() { - Set customizers = Collections.singleton(mock(ContextCustomizer.class)); + Set customizers = Collections.singleton(mock()); MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, null, null, customizers, loader, null, null); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, @@ -420,8 +420,8 @@ class MergedContextConfigurationTests { */ @Test void equalsWithDifferentContextCustomizers() { - Set customizers1 = Collections.singleton(mock(ContextCustomizer.class)); - Set customizers2 = Collections.singleton(mock(ContextCustomizer.class)); + Set customizers1 = Collections.singleton(mock()); + Set customizers2 = Collections.singleton(mock()); MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, null, null, customizers1, loader, null, null); diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java index 2f91668473..bec193828d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; class AotMergedContextConfigurationTests { private final CacheAwareContextLoaderDelegate delegate = - new DefaultCacheAwareContextLoaderDelegate(mock(ContextCache.class)); + new DefaultCacheAwareContextLoaderDelegate(mock()); private final ContextLoader contextLoader = new DelegatingSmartContextLoader(); diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java index 47f7c98ad6..45ece82bb7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/LruContextCacheTests.java @@ -49,10 +49,10 @@ class LruContextCacheTests { private static final MergedContextConfiguration bazConfig = config(Baz.class); - private final ConfigurableApplicationContext abcContext = mock(ConfigurableApplicationContext.class); - private final ConfigurableApplicationContext fooContext = mock(ConfigurableApplicationContext.class); - private final ConfigurableApplicationContext barContext = mock(ConfigurableApplicationContext.class); - private final ConfigurableApplicationContext bazContext = mock(ConfigurableApplicationContext.class); + private final ConfigurableApplicationContext abcContext = mock(); + private final ConfigurableApplicationContext fooContext = mock(); + private final ConfigurableApplicationContext barContext = mock(); + private final ConfigurableApplicationContext bazContext = mock(); @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java index bac0d0fbe6..1782c9f78e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java @@ -232,7 +232,7 @@ public class EventPublishingTestExecutionListenerIntegrationTests { @Bean public TestExecutionListener listener() { - return mock(TestExecutionListener.class); + return mock(); } /** diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java index 85ee9f5038..2b6451f140 100644 --- a/spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java @@ -19,10 +19,8 @@ package org.springframework.test.context.jdbc; import org.junit.jupiter.api.Test; import org.mockito.BDDMockito; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AnnotationConfigurationException; -import org.springframework.core.io.Resource; import org.springframework.test.context.TestContext; import org.springframework.test.context.jdbc.SqlConfig.TransactionMode; @@ -42,7 +40,7 @@ class SqlScriptsTestExecutionListenerTests { private final SqlScriptsTestExecutionListener listener = new SqlScriptsTestExecutionListener(); - private final TestContext testContext = mock(TestContext.class); + private final TestContext testContext = mock(); @Test @@ -78,9 +76,9 @@ class SqlScriptsTestExecutionListenerTests { @Test void isolatedTxModeDeclaredWithoutTxMgr() throws Exception { - ApplicationContext ctx = mock(ApplicationContext.class); - given(ctx.getResource(anyString())).willReturn(mock(Resource.class)); - given(ctx.getAutowireCapableBeanFactory()).willReturn(mock(AutowireCapableBeanFactory.class)); + ApplicationContext ctx = mock(); + given(ctx.getResource(anyString())).willReturn(mock()); + given(ctx.getAutowireCapableBeanFactory()).willReturn(mock()); Class clazz = IsolatedWithoutTxMgr.class; BDDMockito.> given(testContext.getTestClass()).willReturn(clazz); @@ -92,9 +90,9 @@ class SqlScriptsTestExecutionListenerTests { @Test void missingDataSourceAndTxMgr() throws Exception { - ApplicationContext ctx = mock(ApplicationContext.class); - given(ctx.getResource(anyString())).willReturn(mock(Resource.class)); - given(ctx.getAutowireCapableBeanFactory()).willReturn(mock(AutowireCapableBeanFactory.class)); + ApplicationContext ctx = mock(); + given(ctx.getResource(anyString())).willReturn(mock()); + given(ctx.getAutowireCapableBeanFactory()).willReturn(mock()); Class clazz = MissingDataSourceAndTxMgr.class; BDDMockito.> given(testContext.getTestClass()).willReturn(clazz); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java index 6663276540..38772ef5b2 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java @@ -111,10 +111,10 @@ class DisabledIfConditionTests { private ExtensionContext buildExtensionContext(String methodName) { Class testClass = SpringTestCase.class; Method method = ReflectionUtils.findMethod(getClass(), methodName); - Store store = mock(Store.class); + Store store = mock(); given(store.getOrComputeIfAbsent(any(), any(), any())).willReturn(new TestContextManager(testClass)); - ExtensionContext extensionContext = mock(ExtensionContext.class); + ExtensionContext extensionContext = mock(); given(extensionContext.getTestClass()).willReturn(Optional.of(testClass)); given(extensionContext.getElement()).willReturn(Optional.of(method)); given(extensionContext.getStore(any())).willReturn(store); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java index 2c6627c0c6..2dcb27aefd 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; */ public class SpringFailOnTimeoutTests { - private final Statement statement = mock(Statement.class); + private final Statement statement = mock(); @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java index d8d9fd5a4f..013a9bf828 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java @@ -23,8 +23,6 @@ import java.lang.annotation.Target; import java.util.Collections; import java.util.Set; -import org.mockito.Mockito; - import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.AliasFor; @@ -42,6 +40,7 @@ import org.springframework.test.context.TestContextBootstrapper; import org.springframework.test.context.web.WebAppConfiguration; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import static org.mockito.Mockito.mock; import static org.springframework.test.context.NestedTestConfiguration.EnclosingConfiguration.INHERIT; import static org.springframework.test.context.NestedTestConfiguration.EnclosingConfiguration.OVERRIDE; @@ -63,7 +62,7 @@ abstract class AbstractContextConfigurationUtilsTests { MergedContextConfiguration buildMergedContextConfiguration(Class testClass) { - CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate = Mockito.mock(CacheAwareContextLoaderDelegate.class); + CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate = mock(); BootstrapContext bootstrapContext = BootstrapTestUtils.buildBootstrapContext(testClass, cacheAwareContextLoaderDelegate); TestContextBootstrapper bootstrapper = BootstrapTestUtils.resolveTestContextBootstrapper(bootstrapContext); return bootstrapper.buildMergedContextConfiguration(); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java index c08f0cdc9e..62b2228e76 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java @@ -59,7 +59,7 @@ class DirtiesContextTestExecutionListenerTests { private final TestExecutionListener beforeListener = new DirtiesContextBeforeModesTestExecutionListener(); private final TestExecutionListener afterListener = new DirtiesContextTestExecutionListener(); - private final TestContext testContext = mock(TestContext.class); + private final TestContext testContext = mock(); @Nested diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerTests.java index 8cc4b35e3a..ea13ae26c6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerTests.java @@ -27,7 +27,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.test.context.DynamicPropertyRegistry; -import org.springframework.test.context.MergedContextConfiguration; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; @@ -63,7 +62,7 @@ class DynamicPropertiesContextCustomizerTests { DynamicPropertiesContextCustomizer customizer = customizerFor("nullName"); ConfigurableApplicationContext context = new StaticApplicationContext(); assertThatIllegalArgumentException() - .isThrownBy(() -> customizer.customizeContext(context, mock(MergedContextConfiguration.class))) + .isThrownBy(() -> customizer.customizeContext(context, mock())) .withMessage("'name' must not be null or blank"); } @@ -72,7 +71,7 @@ class DynamicPropertiesContextCustomizerTests { DynamicPropertiesContextCustomizer customizer = customizerFor("emptyName"); ConfigurableApplicationContext context = new StaticApplicationContext(); assertThatIllegalArgumentException() - .isThrownBy(() -> customizer.customizeContext(context, mock(MergedContextConfiguration.class))) + .isThrownBy(() -> customizer.customizeContext(context, mock())) .withMessage("'name' must not be null or blank"); } @@ -81,7 +80,7 @@ class DynamicPropertiesContextCustomizerTests { DynamicPropertiesContextCustomizer customizer = customizerFor("nullValueSupplier"); ConfigurableApplicationContext context = new StaticApplicationContext(); assertThatIllegalArgumentException() - .isThrownBy(() -> customizer.customizeContext(context, mock(MergedContextConfiguration.class))) + .isThrownBy(() -> customizer.customizeContext(context, mock())) .withMessage("'valueSupplier' must not be null"); } @@ -89,7 +88,7 @@ class DynamicPropertiesContextCustomizerTests { void customizeContextAddsPropertySource() throws Exception { ConfigurableApplicationContext context = new StaticApplicationContext(); DynamicPropertiesContextCustomizer customizer = customizerFor("valid1", "valid2"); - customizer.customizeContext(context, mock(MergedContextConfiguration.class)); + customizer.customizeContext(context, mock()); ConfigurableEnvironment environment = context.getEnvironment(); assertThat(environment.getRequiredProperty("p1a")).isEqualTo("v1a"); assertThat(environment.getRequiredProperty("p1b")).isEqualTo("v1b"); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java index 5f6fb354a1..c04edf42e4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java @@ -191,7 +191,7 @@ class TestPropertySourceUtilsTests { @Test void addPropertiesFilesToEnvironmentWithNullEnvironment() { assertThatIllegalArgumentException() - .isThrownBy(() -> addPropertiesFilesToEnvironment((ConfigurableEnvironment) null, mock(ResourceLoader.class), FOO_LOCATIONS)) + .isThrownBy(() -> addPropertiesFilesToEnvironment((ConfigurableEnvironment) null, mock(), FOO_LOCATIONS)) .withMessageContaining("'environment' must not be null"); } @@ -205,7 +205,7 @@ class TestPropertySourceUtilsTests { @Test void addPropertiesFilesToEnvironmentWithEnvironmentAndNullLocations() { assertThatIllegalArgumentException() - .isThrownBy(() -> addPropertiesFilesToEnvironment(new MockEnvironment(), mock(ResourceLoader.class), (String[]) null)) + .isThrownBy(() -> addPropertiesFilesToEnvironment(new MockEnvironment(), mock(), (String[]) null)) .withMessageContaining("'locations' must not be null"); } @@ -219,7 +219,7 @@ class TestPropertySourceUtilsTests { String pair = "key = value"; ByteArrayResource resource = new ByteArrayResource(pair.getBytes(), "from inlined property: " + pair); - ResourceLoader resourceLoader = mock(ResourceLoader.class); + ResourceLoader resourceLoader = mock(); given(resourceLoader.getResource(anyString())).willReturn(resource); addPropertiesFilesToEnvironment(environment, resourceLoader, FOO_LOCATIONS); diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java index b074513137..ae7242fc49 100644 --- a/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java @@ -49,7 +49,7 @@ import static org.springframework.transaction.annotation.Propagation.REQUIRED; */ class TransactionalTestExecutionListenerTests { - private final PlatformTransactionManager tm = mock(PlatformTransactionManager.class); + private final PlatformTransactionManager tm = mock(); private final TransactionalTestExecutionListener listener = new TransactionalTestExecutionListener() { @Override @@ -58,7 +58,7 @@ class TransactionalTestExecutionListenerTests { } }; - private final TestContext testContext = mock(TestContext.class); + private final TestContext testContext = mock(); @AfterEach diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java index 36704a66d7..da5c4a6b17 100644 --- a/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.BDDMockito; -import org.springframework.context.ApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; @@ -49,9 +48,9 @@ class ServletTestExecutionListenerTests { private static final String SET_UP_OUTSIDE_OF_STEL = "setUpOutsideOfStel"; - private final WebApplicationContext wac = mock(WebApplicationContext.class); + private final WebApplicationContext wac = mock(); private final MockServletContext mockServletContext = new MockServletContext(); - private final TestContext testContext = mock(TestContext.class); + private final TestContext testContext = mock(); private final ServletTestExecutionListener listener = new ServletTestExecutionListener(); @@ -73,7 +72,7 @@ class ServletTestExecutionListenerTests { @Test void standardApplicationContext() throws Exception { BDDMockito.> given(testContext.getTestClass()).willReturn(getClass()); - given(testContext.getApplicationContext()).willReturn(mock(ApplicationContext.class)); + given(testContext.getApplicationContext()).willReturn(mock()); listener.beforeTestClass(testContext); assertSetUpOutsideOfStelAttributeExists(); diff --git a/spring-test/src/test/java/org/springframework/test/web/client/response/DefaultResponseCreatorTests.java b/spring-test/src/test/java/org/springframework/test/web/client/response/DefaultResponseCreatorTests.java index 7422fa1edd..d949f26f33 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/response/DefaultResponseCreatorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/response/DefaultResponseCreatorTests.java @@ -105,7 +105,7 @@ class DefaultResponseCreatorTests { @Test void setBodyFromResource() throws IOException { byte[] resourceContent = {7, 14, 21, 28, 35}; - Resource resource = mock(Resource.class); + Resource resource = mock(); given(resource.getInputStream()).willReturn(new ByteArrayInputStream(resourceContent)); ClientHttpResponse response = createResponse(new DefaultResponseCreator(HttpStatus.OK).body(resource)); diff --git a/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java b/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java index 63982612a3..333894cfb2 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java @@ -53,7 +53,7 @@ class ExecutingResponseCreatorTests { @Test void ensureRequestIsMock() { final ExecutingResponseCreator responseCreator = new ExecutingResponseCreator((uri, method) -> null); - ClientHttpRequest notAMockRequest = mock(ClientHttpRequest.class); + ClientHttpRequest notAMockRequest = mock(); assertThatIllegalStateException() .isThrownBy(() -> responseCreator.createResponse(notAMockRequest)) diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java index 0e105afd93..086a29fe44 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java @@ -131,7 +131,7 @@ public class CookieAssertionTests { ExchangeResult result = new ExchangeResult( request, response, Mono.empty(), Mono.empty(), Duration.ZERO, null, null); - return new CookieAssertions(result, mock(WebTestClient.ResponseSpec.class)); + return new CookieAssertions(result, mock()); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java index bc3dc33b09..eb1cd739d7 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java @@ -242,7 +242,7 @@ class HeaderAssertionTests { ExchangeResult result = new ExchangeResult( request, response, Mono.empty(), Mono.empty(), Duration.ZERO, null, null); - return new HeaderAssertions(result, mock(WebTestClient.ResponseSpec.class)); + return new HeaderAssertions(result, mock()); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java index 601260215a..cdeb6063e8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java @@ -175,7 +175,7 @@ class StatusAssertionTests { ExchangeResult result = new ExchangeResult( request, response, Mono.empty(), Mono.empty(), Duration.ZERO, null, null); - return new StatusAssertions(result, mock(WebTestClient.ResponseSpec.class)); + return new StatusAssertions(result, mock()); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java index c2040c8491..b5dadb1bf8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java @@ -26,13 +26,10 @@ import com.gargoylesoftware.htmlunit.WebResponse; import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.bind.annotation.RequestMapping; @@ -52,13 +49,11 @@ import static org.mockito.Mockito.mock; * @author Rossen Stoyanchev * @since 4.2 */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration -@WebAppConfiguration +@SpringJUnitWebConfig @SuppressWarnings("rawtypes") public class MockMvcConnectionBuilderSupportTests { - private final WebClient client = mock(WebClient.class); + private final WebClient client = mock(); private MockMvcWebConnectionBuilderSupport builder; @@ -68,7 +63,7 @@ public class MockMvcConnectionBuilderSupportTests { @BeforeEach public void setup() { - given(this.client.getWebConnection()).willReturn(mock(WebConnection.class)); + given(this.client.getWebConnection()).willReturn(mock()); this.builder = new MockMvcWebConnectionBuilderSupport(this.wac) {}; } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index 7d3d647f63..2927dfaa52 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -23,9 +23,7 @@ import java.util.List; import java.util.Map; import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpSession; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -45,6 +43,7 @@ import org.springframework.web.servlet.ModelAndView; import static java.nio.charset.StandardCharsets.UTF_16; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link PrintingResultHandler}. @@ -128,7 +127,7 @@ class PrintingResultHandlerTests { String palindrome = "ablE was I ere I saw Elba"; byte[] bytes = palindrome.getBytes(UTF_16); this.request.setContent(bytes); - this.request.setSession(Mockito.mock(HttpSession.class)); + this.request.setSession(mock()); this.handler.handle(this.mvcResult); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/AsyncControllerJavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/AsyncControllerJavaConfigTests.java index 9dfdd3effc..fe6ac75377 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/AsyncControllerJavaConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/AsyncControllerJavaConfigTests.java @@ -44,6 +44,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; /** * {@link MockMvcWebTestClient} equivalent of the MockMvc @@ -97,7 +98,7 @@ public class AsyncControllerJavaConfigTests { @Bean public CallableProcessingInterceptor callableInterceptor() { - return Mockito.mock(CallableProcessingInterceptor.class); + return mock(); } @Bean diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java index 3026b5af21..cb3315a708 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java @@ -19,7 +19,6 @@ package org.springframework.test.web.servlet.samples.client.context; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -42,6 +41,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; /** * {@link MockMvcWebTestClient} equivalent of the MockMvc @@ -88,7 +88,7 @@ class JavaConfigTests { @Bean PersonDao personDao() { - return Mockito.mock(PersonDao.class); + return mock(); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FrameworkExtensionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FrameworkExtensionTests.java index feabca799f..fa818c38d5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FrameworkExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FrameworkExtensionTests.java @@ -83,7 +83,7 @@ public class FrameworkExtensionTests { public RequestPostProcessor beforeMockMvcCreated(ConfigurableMockMvcBuilder builder, WebApplicationContext context) { return request -> { - request.setUserPrincipal(mock(Principal.class)); + request.setUserPrincipal(mock()); return request; }; } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java index 8cd326a4fb..1d9eee5220 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java @@ -45,6 +45,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -111,7 +112,7 @@ public class AsyncControllerJavaConfigTests { @Bean public CallableProcessingInterceptor callableInterceptor() { - return Mockito.mock(CallableProcessingInterceptor.class); + return mock(); } @Bean diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java index 67bd61b277..a592c2db26 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java @@ -20,7 +20,6 @@ import jakarta.servlet.ServletContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -46,6 +45,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -160,7 +160,7 @@ public class JavaConfigTests { @Bean public PersonDao personDao() { - return Mockito.mock(PersonDao.class); + return mock(); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java index e98278f98c..4403cae7bd 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java @@ -122,7 +122,7 @@ public class FrameworkExtensionTests { public RequestPostProcessor beforeMockMvcCreated(ConfigurableMockMvcBuilder builder, WebApplicationContext context) { return request -> { - request.setUserPrincipal(mock(Principal.class)); + request.setUserPrincipal(mock()); return request; }; } diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java index 92ad674318..b00d12fe9e 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationInterceptorTests.java @@ -74,7 +74,7 @@ public class PersistenceExceptionTranslationInterceptorTests extends Persistence interceptor.setAlwaysTranslate(true); RuntimeException exception = new RuntimeException(); - MethodInvocation invocation = mock(MethodInvocation.class); + MethodInvocation invocation = mock(); given(invocation.proceed()).willThrow(exception); assertThatThrownBy(() -> interceptor.invoke(invocation)).isSameAs(exception); diff --git a/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java b/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java index 0ab4b95edd..8a3ee8b084 100644 --- a/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java @@ -55,7 +55,7 @@ public class LocalConnectionFactoryBeanTests { @Test public void testCreatesVanillaConnectionFactoryIfNoConnectionManagerHasBeenConfigured() throws Exception { final Object CONNECTION_FACTORY = new Object(); - ManagedConnectionFactory managedConnectionFactory = mock(ManagedConnectionFactory.class); + ManagedConnectionFactory managedConnectionFactory = mock(); given(managedConnectionFactory.createConnectionFactory()).willReturn(CONNECTION_FACTORY); LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); factory.setManagedConnectionFactory(managedConnectionFactory); @@ -65,8 +65,8 @@ public class LocalConnectionFactoryBeanTests { @Test public void testCreatesManagedConnectionFactoryIfAConnectionManagerHasBeenConfigured() throws Exception { - ManagedConnectionFactory managedConnectionFactory = mock(ManagedConnectionFactory.class); - ConnectionManager connectionManager = mock(ConnectionManager.class); + ManagedConnectionFactory managedConnectionFactory = mock(); + ConnectionManager connectionManager = mock(); LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); factory.setManagedConnectionFactory(managedConnectionFactory); factory.setConnectionManager(connectionManager); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index 1850e141eb..6548edcbf9 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -63,8 +63,8 @@ public class JndiJtaTransactionManagerTests { private void doTestJtaTransactionManagerWithDefaultJndiLookups(String tmName, boolean tmFound, boolean defaultUt) throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); if (defaultUt) { given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); } @@ -128,10 +128,10 @@ public class JndiJtaTransactionManagerTests { @Test public void jtaTransactionManagerWithCustomJndiLookups() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); - TransactionManager tm = mock(TransactionManager.class); + TransactionManager tm = mock(); JtaTransactionManager ptm = new JtaTransactionManager(); ptm.setUserTransactionName("jndi-ut"); @@ -167,10 +167,10 @@ public class JndiJtaTransactionManagerTests { @Test public void jtaTransactionManagerWithNotCacheUserTransaction() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); - UserTransaction ut2 = mock(UserTransaction.class); + UserTransaction ut2 = mock(); given(ut2.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); JtaTransactionManager ptm = new JtaTransactionManager(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java index 11d42bb16b..9a517fb2a0 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java @@ -55,10 +55,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -92,10 +92,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithCommitAndSynchronizationOnActual() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -121,7 +121,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithCommitAndSynchronizationNever() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn( Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); @@ -145,9 +145,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithRollback() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -180,9 +180,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithRollbackAndSynchronizationOnActual() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -208,7 +208,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithRollbackAndSynchronizationNever() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -235,10 +235,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndRollbackOnly() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -260,10 +260,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndException() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -286,10 +286,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndCommitException() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); willThrow(new OptimisticLockingFailureException("")).given(synch).beforeCommit(false); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -312,10 +312,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndRollbackOnlyAndNoGlobalRollback() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); ptm.setGlobalRollbackOnParticipationFailure(false); @@ -338,9 +338,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndExceptionAndNoGlobalRollback() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); ptm.setGlobalRollbackOnParticipationFailure(false); @@ -363,14 +363,14 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndJtaSynchronization() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); MockJtaTransaction tx = new MockJtaTransaction(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); given(tm.getTransaction()).willReturn(tx); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut, tm); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -395,10 +395,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndSynchronizationOnActual() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -421,7 +421,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingTransactionAndSynchronizationNever() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -444,10 +444,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithExistingAndPropagationSupports() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -470,10 +470,10 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationSupports() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION); - final TransactionSynchronization synch = mock(TransactionSynchronization.class); + final TransactionSynchronization synch = mock(); JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -495,7 +495,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationSupportsAndSynchronizationOnActual() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -517,7 +517,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationSupportsAndSynchronizationNever() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -539,9 +539,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationNotSupported() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); - Transaction tx = mock(Transaction.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); + Transaction tx = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); given(tm.suspend()).willReturn(tx); @@ -563,9 +563,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNew() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); - Transaction tx = mock(Transaction.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); + Transaction tx = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); @@ -611,7 +611,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewWithinSupports() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); @@ -651,9 +651,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewAndExisting() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); - Transaction tx = mock(Transaction.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); + Transaction tx = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); given(tm.suspend()).willReturn(tx); @@ -676,8 +676,8 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewAndExistingWithSuspendException() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); willThrow(new SystemException()).given(tm).suspend(); @@ -697,9 +697,9 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewAndExistingWithBeginException() throws Exception { - UserTransaction ut = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); - Transaction tx = mock(Transaction.class); + UserTransaction ut = mock(); + TransactionManager tm = mock(); + Transaction tx = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); given(tm.suspend()).willReturn(tx); willThrow(new SystemException()).given(ut).begin(); @@ -721,8 +721,8 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewAndAdapter() throws Exception { - TransactionManager tm = mock(TransactionManager.class); - Transaction tx = mock(Transaction.class); + TransactionManager tm = mock(); + Transaction tx = mock(); given(tm.getStatus()).willReturn(Status.STATUS_ACTIVE); given(tm.suspend()).willReturn(tx); @@ -745,7 +745,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithPropagationRequiresNewAndSuspensionNotSupported() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -763,7 +763,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithIsolationLevel() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION); assertThatExceptionOfType(InvalidIsolationLevelException.class).isThrownBy(() -> { @@ -781,7 +781,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithSystemExceptionOnIsExisting() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willThrow(new SystemException("system exception")); assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() -> { @@ -798,7 +798,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithNestedBegin() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -817,7 +817,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithNotSupportedExceptionOnNestedBegin() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); willThrow(new NotSupportedException("not supported")).given(ut).begin(); @@ -836,7 +836,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithUnsupportedOperationExceptionOnNestedBegin() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); willThrow(new UnsupportedOperationException("not supported")).given(ut).begin(); @@ -855,7 +855,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithSystemExceptionOnBegin() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION); willThrow(new SystemException("system exception")).given(ut).begin(); @@ -873,7 +873,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithRollbackExceptionOnCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); willThrow(new RollbackException("unexpected rollback")).given(ut).commit(); @@ -909,7 +909,7 @@ public class JtaTransactionManagerTests { } private void doTestJtaTransactionManagerWithNoExceptionOnGlobalRollbackOnly(boolean failEarly) throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_MARKED_ROLLBACK, Status.STATUS_MARKED_ROLLBACK, Status.STATUS_MARKED_ROLLBACK); @@ -962,7 +962,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithHeuristicMixedExceptionOnCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); willThrow(new HeuristicMixedException("heuristic exception")).given(ut).commit(); @@ -989,7 +989,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithHeuristicRollbackExceptionOnCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); willThrow(new HeuristicRollbackException("heuristic exception")).given(ut).commit(); @@ -1016,7 +1016,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithSystemExceptionOnCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); willThrow(new SystemException("system exception")).given(ut).commit(); @@ -1043,7 +1043,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithSystemExceptionOnRollback() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); willThrow(new SystemException("system exception")).given(ut).rollback(); @@ -1069,7 +1069,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithIllegalStateExceptionOnRollbackOnly() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); willThrow(new IllegalStateException("no existing transaction")).given(ut).setRollbackOnly(); @@ -1087,7 +1087,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithSystemExceptionOnRollbackOnly() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_ACTIVE); willThrow(new SystemException("system exception")).given(ut).setRollbackOnly(); @@ -1111,7 +1111,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithDoubleCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); @@ -1131,7 +1131,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithDoubleRollback() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); @@ -1151,7 +1151,7 @@ public class JtaTransactionManagerTests { @Test public void jtaTransactionManagerWithRollbackAndCommit() throws Exception { - UserTransaction ut = mock(UserTransaction.class); + UserTransaction ut = mock(); given(ut.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE); JtaTransactionManager ptm = newJtaTransactionManager(ut); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java index 12df9f4bc3..0af4475c90 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java @@ -23,7 +23,6 @@ import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; -import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -93,7 +92,7 @@ public class TransactionBeanRegistrationAotProcessorTests { private void process(Class beanClass) { BeanRegistrationAotContribution contribution = createContribution(beanClass); if (contribution != null) { - contribution.applyTo(this.generationContext, mock(BeanRegistrationCode.class)); + contribution.applyTo(this.generationContext, mock()); } } @@ -123,6 +122,7 @@ public class TransactionBeanRegistrationAotProcessorTests { @Transactional static class TransactionalOnTypeBean implements NonAnnotatedTransactionalInterface { + @Override public void transactional() { } } @@ -130,6 +130,7 @@ public class TransactionBeanRegistrationAotProcessorTests { @jakarta.transaction.Transactional static class JakartaTransactionalOnTypeBean implements NonAnnotatedTransactionalInterface { + @Override public void transactional() { } } @@ -147,6 +148,7 @@ public class TransactionBeanRegistrationAotProcessorTests { static class TransactionalOnClassMethodBean implements NonAnnotatedTransactionalInterface { + @Override @Transactional public void transactional() { } @@ -160,6 +162,7 @@ public class TransactionBeanRegistrationAotProcessorTests { static class TransactionalOnInterfaceMethodBean implements TransactionalOnMethodInterface { + @Override public void transactional() { } } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java index 54f9b8eaa7..4a508f53a2 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java @@ -64,7 +64,7 @@ public abstract class AbstractReactiveTransactionAspectTests { @Test public void noTransaction() throws Exception { - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransactionManager rtm = mock(); DefaultTestBean tb = new DefaultTestBean(); TransactionAttributeSource tas = new MapTransactionAttributeSource(); @@ -92,8 +92,8 @@ public abstract class AbstractReactiveTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(getNameMethod, txatt); - ReactiveTransaction status = mock(ReactiveTransaction.class); - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransaction status = mock(); + ReactiveTransactionManager rtm = mock(); // expect a transaction given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); given(rtm.commit(status)).willReturn(Mono.empty()); @@ -120,8 +120,8 @@ public abstract class AbstractReactiveTransactionAspectTests { MapTransactionAttributeSource tas2 = new MapTransactionAttributeSource(); tas2.register(setNameMethod, txatt); - ReactiveTransaction status = mock(ReactiveTransaction.class); - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransaction status = mock(); + ReactiveTransactionManager rtm = mock(); // expect a transaction given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); given(rtm.commit(status)).willReturn(Mono.empty()); @@ -150,8 +150,8 @@ public abstract class AbstractReactiveTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(getNameMethod, txatt); - ReactiveTransaction status = mock(ReactiveTransaction.class); - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransaction status = mock(); + ReactiveTransactionManager rtm = mock(); // expect a transaction given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); given(rtm.commit(status)).willReturn(Mono.empty()); @@ -229,8 +229,8 @@ public abstract class AbstractReactiveTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(m, txatt); - ReactiveTransaction status = mock(ReactiveTransaction.class); - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransaction status = mock(); + ReactiveTransactionManager rtm = mock(); // Gets additional call(s) from TransactionControl given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); @@ -285,7 +285,7 @@ public abstract class AbstractReactiveTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(m, txatt); - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransactionManager rtm = mock(); // Expect a transaction CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null); given(rtm.getReactiveTransaction(txatt)).willThrow(ex); @@ -320,9 +320,9 @@ public abstract class AbstractReactiveTransactionAspectTests { // Method m2 = getNameMethod; // No attributes for m2 - ReactiveTransactionManager rtm = mock(ReactiveTransactionManager.class); + ReactiveTransactionManager rtm = mock(); - ReactiveTransaction status = mock(ReactiveTransaction.class); + ReactiveTransaction status = mock(); given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status)); UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null); given(rtm.commit(status)).willReturn(Mono.error(ex)); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java index 3546da2184..5adf2014fa 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java @@ -75,7 +75,7 @@ public abstract class AbstractTransactionAspectTests { @Test public void noTransaction() throws Exception { - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + PlatformTransactionManager ptm = mock(); TestBean tb = new TestBean(); TransactionAttributeSource tas = new MapTransactionAttributeSource(); @@ -103,8 +103,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(getNameMethod, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); // expect a transaction given(ptm.getTransaction(txatt)).willReturn(status); @@ -175,8 +175,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas2 = new MapTransactionAttributeSource(); tas2.register(setNameMethod, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); // expect a transaction given(ptm.getTransaction(txatt)).willReturn(status); @@ -202,8 +202,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(getNameMethod, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); // expect a transaction given(ptm.getTransaction(txatt)).willReturn(status); @@ -225,8 +225,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(exceptionalMethod, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); // Expect a transaction given(ptm.getTransaction(txatt)).willReturn(status); @@ -275,10 +275,10 @@ public abstract class AbstractTransactionAspectTests { tas.register(outerMethod, outerTxatt); tas.register(innerMethod, innerTxatt); - TransactionStatus outerStatus = mock(TransactionStatus.class); - TransactionStatus innerStatus = mock(TransactionStatus.class); + TransactionStatus outerStatus = mock(); + TransactionStatus innerStatus = mock(); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + PlatformTransactionManager ptm = mock(); // Expect a transaction given(ptm.getTransaction(outerTxatt)).willReturn(outerStatus); given(ptm.getTransaction(innerTxatt)).willReturn(innerStatus); @@ -383,8 +383,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(m, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); // Gets additional call(s) from TransactionControl given(ptm.getTransaction(txatt)).willReturn(status); @@ -436,8 +436,8 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(m, txatt); - TransactionStatus status = mock(TransactionStatus.class); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + TransactionStatus status = mock(); + PlatformTransactionManager ptm = mock(); given(ptm.getTransaction(txatt)).willReturn(status); @@ -471,7 +471,7 @@ public abstract class AbstractTransactionAspectTests { MapTransactionAttributeSource tas = new MapTransactionAttributeSource(); tas.register(m, txatt); - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + PlatformTransactionManager ptm = mock(); // Expect a transaction CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null); given(ptm.getTransaction(txatt)).willThrow(ex); @@ -509,9 +509,9 @@ public abstract class AbstractTransactionAspectTests { // Method m2 = getNameMethod; // No attributes for m2 - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + PlatformTransactionManager ptm = mock(); - TransactionStatus status = mock(TransactionStatus.class); + TransactionStatus status = mock(); given(ptm.getTransaction(txatt)).willReturn(status); UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null); willThrow(ex).given(ptm).commit(status); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java index 0f49ea7835..c5f8dcdf0c 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java @@ -142,7 +142,7 @@ public class BeanFactoryTransactionTests { private void doTestGetsAreNotTransactional(final ITestBean testBean) { // Install facade - PlatformTransactionManager ptm = mock(PlatformTransactionManager.class); + PlatformTransactionManager ptm = mock(); PlatformTransactionManagerFacade.delegate = ptm; assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue(); @@ -151,7 +151,7 @@ public class BeanFactoryTransactionTests { verifyNoInteractions(ptm); // Install facade expecting a call - final TransactionStatus ts = mock(TransactionStatus.class); + final TransactionStatus ts = mock(); ptm = new PlatformTransactionManager() { private boolean invoked; @Override diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index 79b74fd1ae..47f32c6d4f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -129,7 +129,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithNoBeanFactory() { - PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class); + PlatformTransactionManager transactionManager = mock(); TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, null); assertThat(ti.determineTransactionManager(new DefaultTransactionAttribute())).isSameAs(transactionManager); @@ -137,7 +137,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithNoBeanFactoryAndNoTransactionAttribute() { - PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class); + PlatformTransactionManager transactionManager = mock(); TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, null); assertThat(ti.determineTransactionManager(null)).isSameAs(transactionManager); @@ -145,7 +145,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithNoTransactionAttribute() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory); assertThat(ti.determineTransactionManager(null)).isNull(); @@ -153,7 +153,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithQualifierUnknown() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory); DefaultTransactionAttribute attribute = new DefaultTransactionAttribute(); attribute.setQualifier("fooTransactionManager"); @@ -165,8 +165,8 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithQualifierAndDefault() { - BeanFactory beanFactory = mock(BeanFactory.class); - PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class); + BeanFactory beanFactory = mock(); + PlatformTransactionManager transactionManager = mock(); TransactionInterceptor ti = transactionInterceptorWithTransactionManager(transactionManager, beanFactory); PlatformTransactionManager fooTransactionManager = associateTransactionManager(beanFactory, "fooTransactionManager"); @@ -179,7 +179,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithQualifierAndDefaultName() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); associateTransactionManager(beanFactory, "defaultTransactionManager"); TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName( "defaultTransactionManager", beanFactory); @@ -194,7 +194,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithEmptyQualifierAndDefaultName() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); PlatformTransactionManager defaultTransactionManager = associateTransactionManager(beanFactory, "defaultTransactionManager"); TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName( @@ -208,7 +208,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithQualifierSeveralTimes() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory); PlatformTransactionManager txManager = associateTransactionManager(beanFactory, "fooTransactionManager"); @@ -227,7 +227,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerWithBeanNameSeveralTimes() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName( "fooTransactionManager", beanFactory); @@ -245,10 +245,10 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @Test public void determineTransactionManagerDefaultSeveralTimes() { - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); TransactionInterceptor ti = simpleTransactionInterceptor(beanFactory); - PlatformTransactionManager txManager = mock(PlatformTransactionManager.class); + PlatformTransactionManager txManager = mock(); given(beanFactory.getBean(TransactionManager.class)).willReturn(txManager); DefaultTransactionAttribute attribute = new DefaultTransactionAttribute(); @@ -298,7 +298,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests } private PlatformTransactionManager associateTransactionManager(BeanFactory beanFactory, String name) { - PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class); + PlatformTransactionManager transactionManager = mock(); given(beanFactory.containsBean(name)).willReturn(true); given(beanFactory.getBean(name, TransactionManager.class)).willReturn(transactionManager); return transactionManager; diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java index c2e4ed25e7..320180c522 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java @@ -34,9 +34,9 @@ public class JtaTransactionManagerSerializationTests { @Test public void serializable() throws Exception { - UserTransaction ut1 = mock(UserTransaction.class); - UserTransaction ut2 = mock(UserTransaction.class); - TransactionManager tm = mock(TransactionManager.class); + UserTransaction ut1 = mock(); + UserTransaction ut2 = mock(); + TransactionManager tm = mock(); JtaTransactionManager jtam = new JtaTransactionManager(); jtam.setUserTransaction(ut1); diff --git a/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java b/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java index 191019f98a..67e1c2697b 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java @@ -147,7 +147,7 @@ public class HttpRangeTests { @Test public void toResourceRegionInputStreamResource() { - InputStreamResource resource = mock(InputStreamResource.class); + InputStreamResource resource = mock(); HttpRange range = HttpRange.createByteRange(0, 9); assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource)); @@ -155,7 +155,7 @@ public class HttpRangeTests { @Test public void toResourceRegionIllegalLength() { - ByteArrayResource resource = mock(ByteArrayResource.class); + ByteArrayResource resource = mock(); given(resource.contentLength()).willReturn(-1L); HttpRange range = HttpRange.createByteRange(0, 9); assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource)); @@ -163,7 +163,7 @@ public class HttpRangeTests { @Test public void toResourceRegionExceptionLength() throws IOException { - InputStreamResource resource = mock(InputStreamResource.class); + InputStreamResource resource = mock(); given(resource.contentLength()).willThrow(IOException.class); HttpRange range = HttpRange.createByteRange(0, 9); assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource)); diff --git a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java index df8f9a5889..265fda18a0 100644 --- a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java @@ -35,7 +35,7 @@ public class SimpleClientHttpRequestFactoryTests { @Test // SPR-13225 public void headerWithNullValue() { - HttpURLConnection urlConnection = mock(HttpURLConnection.class); + HttpURLConnection urlConnection = mock(); given(urlConnection.getRequestMethod()).willReturn("GET"); HttpHeaders headers = new HttpHeaders(); headers.set("foo", null); diff --git a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java index 8370ea6bd9..4ef16c6637 100644 --- a/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify; */ public class SimpleClientHttpResponseTests { - private final HttpURLConnection connection = mock(HttpURLConnection.class); + private final HttpURLConnection connection = mock(); private final SimpleClientHttpResponse response = new SimpleClientHttpResponse(this.connection); @@ -97,7 +97,7 @@ public class SimpleClientHttpResponseTests { @Test // SPR-16773 public void shouldNotDrainWhenErrorStreamClosed() throws Exception { - InputStream is = mock(InputStream.class); + InputStream is = mock(); given(this.connection.getErrorStream()).willReturn(is); willDoNothing().given(is).close(); given(is.transferTo(any())).willCallRealMethod(); diff --git a/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java b/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java index 3373126a7d..40805fae48 100644 --- a/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java @@ -95,7 +95,7 @@ class DefaultClientRequestObservationConventionTests { @Test void addsKeyValueForNonResolvableStatus() throws Exception { ClientRequestObservationContext context = new ClientRequestObservationContext(this.request); - ClientHttpResponse response = mock(ClientHttpResponse.class); + ClientHttpResponse response = mock(); context.setResponse(response); given(response.getStatusCode()).willThrow(new IOException("test error")); assertThat(this.observationConvention.getLowCardinalityKeyValues(context)).contains(KeyValue.of("status", "IO_ERROR")); diff --git a/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java index d85b081945..369b008af0 100644 --- a/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java @@ -38,9 +38,9 @@ public class ReactorResourceFactoryTests { private final ReactorResourceFactory resourceFactory = new ReactorResourceFactory(); - private final ConnectionProvider connectionProvider = mock(ConnectionProvider.class); + private final ConnectionProvider connectionProvider = mock(); - private final LoopResources loopResources = mock(LoopResources.class); + private final LoopResources loopResources = mock(); @Test diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java index 0d7e336077..5c9079cc23 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java @@ -103,7 +103,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { this.bufferFactory.wrap("Bb".getBytes(StandardCharsets.UTF_8)), this.bufferFactory.wrap("Cc".getBytes(StandardCharsets.UTF_8)) ); - FilePart mockPart = mock(FilePart.class); + FilePart mockPart = mock(); HttpHeaders partHeaders = new HttpHeaders(); partHeaders.setContentType(MediaType.TEXT_PLAIN); partHeaders.setContentDispositionFormData("foo", "file.txt"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java index b9f452a27b..fb9c0d84be 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java @@ -62,14 +62,14 @@ public class PartHttpMessageWriterTests extends AbstractLeakCheckingTests { void write() { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.TEXT_PLAIN); - Part textPart = mock(Part.class); + Part textPart = mock(); given(textPart.name()).willReturn("text part"); given(textPart.headers()).willReturn(headers); given(textPart.content()).willReturn(Flux.just( this.bufferFactory.wrap("text1".getBytes(StandardCharsets.UTF_8)), this.bufferFactory.wrap("text2".getBytes(StandardCharsets.UTF_8)))); - FilePart filePart = mock(FilePart.class); + FilePart filePart = mock(); given(filePart.name()).willReturn("file part"); given(filePart.headers()).willReturn(new HttpHeaders()); given(filePart.filename()).willReturn("file.txt"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java index 40b554afd1..8662d6305d 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java @@ -141,14 +141,14 @@ class CodecConfigurerTests { @Test void defaultAndCustomReaders() { - Decoder customDecoder1 = mock(Decoder.class); - Decoder customDecoder2 = mock(Decoder.class); + Decoder customDecoder1 = mock(); + Decoder customDecoder2 = mock(); given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true); - HttpMessageReader customReader1 = mock(HttpMessageReader.class); - HttpMessageReader customReader2 = mock(HttpMessageReader.class); + HttpMessageReader customReader1 = mock(); + HttpMessageReader customReader2 = mock(); given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true); @@ -189,14 +189,14 @@ class CodecConfigurerTests { @Test void defaultAndCustomWriters() { - Encoder customEncoder1 = mock(Encoder.class); - Encoder customEncoder2 = mock(Encoder.class); + Encoder customEncoder1 = mock(); + Encoder customEncoder2 = mock(); given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true); - HttpMessageWriter customWriter1 = mock(HttpMessageWriter.class); - HttpMessageWriter customWriter2 = mock(HttpMessageWriter.class); + HttpMessageWriter customWriter1 = mock(); + HttpMessageWriter customWriter2 = mock(); given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true); @@ -236,14 +236,14 @@ class CodecConfigurerTests { @Test void defaultsOffCustomReaders() { - Decoder customDecoder1 = mock(Decoder.class); - Decoder customDecoder2 = mock(Decoder.class); + Decoder customDecoder1 = mock(); + Decoder customDecoder2 = mock(); given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true); - HttpMessageReader customReader1 = mock(HttpMessageReader.class); - HttpMessageReader customReader2 = mock(HttpMessageReader.class); + HttpMessageReader customReader1 = mock(); + HttpMessageReader customReader2 = mock(); given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true); @@ -267,14 +267,14 @@ class CodecConfigurerTests { @Test void defaultsOffWithCustomWriters() { - Encoder customEncoder1 = mock(Encoder.class); - Encoder customEncoder2 = mock(Encoder.class); + Encoder customEncoder1 = mock(); + Encoder customEncoder2 = mock(); given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true); - HttpMessageWriter customWriter1 = mock(HttpMessageWriter.class); - HttpMessageWriter customWriter2 = mock(HttpMessageWriter.class); + HttpMessageWriter customWriter1 = mock(); + HttpMessageWriter customWriter2 = mock(); given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false); given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true); diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java index 2c471c825c..3cde8bae1a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java @@ -125,7 +125,7 @@ public class ResourceHttpMessageConverterTests { @Test // SPR-12999 public void writeContentNotGettingInputStream() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); - Resource resource = mock(Resource.class); + Resource resource = mock(); given(resource.getInputStream()).willThrow(FileNotFoundException.class); converter.write(resource, MediaType.APPLICATION_OCTET_STREAM, outputMessage); @@ -135,8 +135,8 @@ public class ResourceHttpMessageConverterTests { @Test // SPR-12999 public void writeContentNotClosingInputStream() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); - Resource resource = mock(Resource.class); - InputStream inputStream = mock(InputStream.class); + Resource resource = mock(); + InputStream inputStream = mock(); given(resource.getInputStream()).willReturn(inputStream); given(inputStream.read(any())).willReturn(-1); willThrow(new NullPointerException()).given(inputStream).close(); @@ -148,8 +148,8 @@ public class ResourceHttpMessageConverterTests { @Test // SPR-13620 public void writeContentInputStreamThrowingNullPointerException() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); - Resource resource = mock(Resource.class); - InputStream in = mock(InputStream.class); + Resource resource = mock(); + InputStream in = mock(); given(resource.getInputStream()).willReturn(in); given(in.read(any())).willThrow(NullPointerException.class); converter.write(resource, MediaType.APPLICATION_OCTET_STREAM, outputMessage); diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java index 3ec8d8694c..28c0a73dd5 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java @@ -25,7 +25,6 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.mockito.BDDMockito; -import org.mockito.Mockito; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.io.ClassPathResource; @@ -38,6 +37,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.testfixture.http.MockHttpOutputMessage; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Test cases for {@link ResourceRegionHttpMessageConverter} class. @@ -186,7 +186,7 @@ public class ResourceRegionHttpMessageConverterTests { @Test // SPR-15041 public void applicationOctetStreamDefaultContentType() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); - ClassPathResource body = Mockito.mock(ClassPathResource.class); + ClassPathResource body = mock(); BDDMockito.given(body.getFilename()).willReturn("spring.dat"); BDDMockito.given(body.contentLength()).willReturn(12L); BDDMockito.given(body.getInputStream()).willReturn(new ByteArrayInputStream("Spring Framework".getBytes())); diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java index d012884268..7ac870d47d 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java @@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets; import com.google.protobuf.ExtensionRegistry; import com.google.protobuf.Message; import com.google.protobuf.util.JsonFormat; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; @@ -35,32 +34,24 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** - * Test suite for {@link ProtobufHttpMessageConverter}. + * Tests for {@link ProtobufHttpMessageConverter}. * * @author Alex Antonov * @author Juergen Hoeller * @author Andreas Ahlenstorf * @author Sebastien Deleuze */ -public class ProtobufHttpMessageConverterTests { +class ProtobufHttpMessageConverterTests { - private ProtobufHttpMessageConverter converter; + private ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter(); - private ExtensionRegistry extensionRegistry; + private ExtensionRegistry extensionRegistry = mock(); - private Msg testMsg; - - - @BeforeEach - public void setup() { - this.extensionRegistry = mock(ExtensionRegistry.class); - this.converter = new ProtobufHttpMessageConverter(); - this.testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build(); - } + private Msg testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build(); @Test - public void canRead() { + void canRead() { assertThat(this.converter.canRead(Msg.class, null)).isTrue(); assertThat(this.converter.canRead(Msg.class, ProtobufHttpMessageConverter.PROTOBUF)).isTrue(); assertThat(this.converter.canRead(Msg.class, MediaType.APPLICATION_JSON)).isTrue(); @@ -72,7 +63,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void canWrite() { + void canWrite() { assertThat(this.converter.canWrite(Msg.class, null)).isTrue(); assertThat(this.converter.canWrite(Msg.class, ProtobufHttpMessageConverter.PROTOBUF)).isTrue(); assertThat(this.converter.canWrite(Msg.class, MediaType.APPLICATION_JSON)).isTrue(); @@ -82,7 +73,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void read() throws IOException { + void read() throws IOException { byte[] body = this.testMsg.toByteArray(); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); inputMessage.getHeaders().setContentType(ProtobufHttpMessageConverter.PROTOBUF); @@ -91,7 +82,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void readNoContentType() throws IOException { + void readNoContentType() throws IOException { byte[] body = this.testMsg.toByteArray(); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); Message result = this.converter.read(Msg.class, inputMessage); @@ -99,7 +90,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void writeProtobuf() throws IOException { + void writeProtobuf() throws IOException { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); MediaType contentType = ProtobufHttpMessageConverter.PROTOBUF; this.converter.write(this.testMsg, contentType, outputMessage); @@ -117,7 +108,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void writeJsonWithGoogleProtobuf() throws IOException { + void writeJsonWithGoogleProtobuf() throws IOException { this.converter = new ProtobufHttpMessageConverter( new ProtobufHttpMessageConverter.ProtobufJavaUtilSupport(null, null), this.extensionRegistry); @@ -141,7 +132,7 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void writeJsonWithJavaFormat() throws IOException { + void writeJsonWithJavaFormat() throws IOException { this.converter = new ProtobufHttpMessageConverter( new ProtobufHttpMessageConverter.ProtobufJavaFormatSupport(), this.extensionRegistry); @@ -166,13 +157,13 @@ public class ProtobufHttpMessageConverterTests { } @Test - public void defaultContentType() throws Exception { + void defaultContentType() throws Exception { assertThat(this.converter.getDefaultContentType(this.testMsg)) .isEqualTo(ProtobufHttpMessageConverter.PROTOBUF); } @Test - public void getContentLength() throws IOException { + void getContentLength() throws IOException { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); MediaType contentType = ProtobufHttpMessageConverter.PROTOBUF; this.converter.write(this.testMsg, contentType, outputMessage); diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java index 620c3f0d3a..76e023c7bd 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java @@ -52,7 +52,7 @@ public class MarshallingHttpMessageConverterTests { @Test public void canRead() { - Unmarshaller unmarshaller = mock(Unmarshaller.class); + Unmarshaller unmarshaller = mock(); given(unmarshaller.supports(Integer.class)).willReturn(false); given(unmarshaller.supports(String.class)).willReturn(true); @@ -67,7 +67,7 @@ public class MarshallingHttpMessageConverterTests { @Test public void canWrite() { - Marshaller marshaller = mock(Marshaller.class); + Marshaller marshaller = mock(); given(marshaller.supports(Integer.class)).willReturn(false); given(marshaller.supports(String.class)).willReturn(true); @@ -85,7 +85,7 @@ public class MarshallingHttpMessageConverterTests { String body = "Hello World"; MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8)); - Unmarshaller unmarshaller = mock(Unmarshaller.class); + Unmarshaller unmarshaller = mock(); given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(body); MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(); @@ -99,8 +99,8 @@ public class MarshallingHttpMessageConverterTests { public void readWithTypeMismatchException() throws Exception { MockHttpInputMessage inputMessage = new MockHttpInputMessage(new byte[0]); - Marshaller marshaller = mock(Marshaller.class); - Unmarshaller unmarshaller = mock(Unmarshaller.class); + Marshaller marshaller = mock(); + Unmarshaller unmarshaller = mock(); given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(3); MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller, unmarshaller); @@ -114,7 +114,7 @@ public class MarshallingHttpMessageConverterTests { MockHttpInputMessage inputMessage = new MockHttpInputMessage(new byte[0]); UnmarshallingFailureException ex = new UnmarshallingFailureException("forced"); - Unmarshaller unmarshaller = mock(Unmarshaller.class); + Unmarshaller unmarshaller = mock(); given(unmarshaller.unmarshal(isA(StreamSource.class))).willThrow(ex); MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(); @@ -129,7 +129,7 @@ public class MarshallingHttpMessageConverterTests { String body = "Hello World"; MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); - Marshaller marshaller = mock(Marshaller.class); + Marshaller marshaller = mock(); willDoNothing().given(marshaller).marshal(eq(body), isA(Result.class)); MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller); @@ -145,7 +145,7 @@ public class MarshallingHttpMessageConverterTests { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); MarshallingFailureException ex = new MarshallingFailureException("forced"); - Marshaller marshaller = mock(Marshaller.class); + Marshaller marshaller = mock(); willThrow(ex).given(marshaller).marshal(eq(body), isA(Result.class)); MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java index 92d5a42d18..7f5be91a71 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java @@ -105,7 +105,7 @@ public class ListenerReadPublisherTests { @Override protected DataBuffer read() { this.readCalls++; - return mock(DataBuffer.class); + return mock(); } @Override diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java index 6971bbce8e..9cc56d580d 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java @@ -57,7 +57,7 @@ public class ListenerWriteProcessorTests { // Turn off writing so next item will be cached this.processor.setWritePossible(false); - DataBuffer buffer = mock(DataBuffer.class); + DataBuffer buffer = mock(); this.processor.onNext(buffer); // Send error while item cached @@ -76,7 +76,7 @@ public class ListenerWriteProcessorTests { this.processor.setFailOnWrite(true); // Write - DataBuffer buffer = mock(DataBuffer.class); + DataBuffer buffer = mock(); this.processor.onNext(buffer); assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull(); @@ -89,11 +89,11 @@ public class ListenerWriteProcessorTests { // Disable writing: next item will be cached. this.processor.setWritePossible(false); - DataBuffer buffer1 = mock(DataBuffer.class); + DataBuffer buffer1 = mock(); this.processor.onNext(buffer1); // Send more data illegally - DataBuffer buffer2 = mock(DataBuffer.class); + DataBuffer buffer2 = mock(); this.processor.onNext(buffer2); assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull(); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java index 7f39a9dfab..72f8fd1340 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java @@ -100,7 +100,7 @@ public class ServerHttpRequestTests { @Test public void mutateSslInfo() throws Exception { - SslInfo sslInfo = mock(SslInfo.class); + SslInfo sslInfo = mock(); ServerHttpRequest request = createRequest("/").mutate().sslInfo(sslInfo).build(); assertThat(request.getSslInfo()).isSameAs(sslInfo); } diff --git a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java index df7cb10831..2250426d53 100644 --- a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java @@ -59,7 +59,7 @@ class DefaultResponseErrorHandlerHttpStatusTests { private final DefaultResponseErrorHandler handler = new DefaultResponseErrorHandler(); - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); @ParameterizedTest(name = "[{index}] error: [{0}]") diff --git a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java index ba6af327ed..ce8f634b59 100644 --- a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java @@ -46,7 +46,7 @@ public class DefaultResponseErrorHandlerTests { private final DefaultResponseErrorHandler handler = new DefaultResponseErrorHandler(); - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); @Test diff --git a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java index 0d73ecd232..c3fa004493 100644 --- a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java @@ -42,7 +42,7 @@ public class ExtractingResponseErrorHandlerTests { private ExtractingResponseErrorHandler errorHandler; - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); @BeforeEach diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java index 68f064a0ae..aa50bac17c 100644 --- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java @@ -53,11 +53,11 @@ import static org.mockito.Mockito.mock; class HttpMessageConverterExtractorTests { @SuppressWarnings("unchecked") - private final HttpMessageConverter converter = mock(HttpMessageConverter.class); + private final HttpMessageConverter converter = mock(); private final HttpMessageConverterExtractor extractor = new HttpMessageConverterExtractor<>(String.class, asList(converter)); private final MediaType contentType = MediaType.TEXT_PLAIN; private final HttpHeaders responseHeaders = new HttpHeaders(); - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); @Test @@ -156,7 +156,7 @@ class HttpMessageConverterExtractorTests { ParameterizedTypeReference> reference = new ParameterizedTypeReference<>() {}; Type type = reference.getType(); - GenericHttpMessageConverter converter = mock(GenericHttpMessageConverter.class); + GenericHttpMessageConverter converter = mock(); HttpMessageConverterExtractor extractor = new HttpMessageConverterExtractor>(type, asList(converter)); given(response.getStatusCode()).willReturn(HttpStatus.OK); diff --git a/spring-web/src/test/java/org/springframework/web/client/IntrospectingClientHttpResponseTests.java b/spring-web/src/test/java/org/springframework/web/client/IntrospectingClientHttpResponseTests.java index dbf39cc8dc..ae0a3095ed 100644 --- a/spring-web/src/test/java/org/springframework/web/client/IntrospectingClientHttpResponseTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/IntrospectingClientHttpResponseTests.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; */ class IntrospectingClientHttpResponseTests { - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); private final IntrospectingClientHttpResponse wrappedResponse = new IntrospectingClientHttpResponse(response); diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java index 69afc5269c..ca292e45c2 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java @@ -58,16 +58,16 @@ class RestTemplateObservationTests { private final TestObservationRegistry observationRegistry = TestObservationRegistry.create(); - private final ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); + private final ClientHttpRequestFactory requestFactory = mock(); - private final ClientHttpRequest request = mock(ClientHttpRequest.class); + private final ClientHttpRequest request = mock(); - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); - private final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class); + private final ResponseErrorHandler errorHandler = mock(); @SuppressWarnings("unchecked") - private final HttpMessageConverter converter = mock(HttpMessageConverter.class); + private final HttpMessageConverter converter = mock(); private final RestTemplate template = new RestTemplate(List.of(converter)); diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java index 3057543b31..8cc65a7448 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java @@ -83,16 +83,16 @@ import static org.springframework.http.MediaType.parseMediaType; @SuppressWarnings("unchecked") class RestTemplateTests { - private final ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); + private final ClientHttpRequestFactory requestFactory = mock(); - private final ClientHttpRequest request = mock(ClientHttpRequest.class); + private final ClientHttpRequest request = mock(); - private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final ClientHttpResponse response = mock(); - private final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class); + private final ResponseErrorHandler errorHandler = mock(); @SuppressWarnings("rawtypes") - private final HttpMessageConverter converter = mock(HttpMessageConverter.class); + private final HttpMessageConverter converter = mock(); private final RestTemplate template = new RestTemplate(Collections.singletonList(converter)); @@ -241,10 +241,10 @@ class RestTemplateTests { @Test void requestAvoidsDuplicateAcceptHeaderValues() throws Exception { - HttpMessageConverter firstConverter = mock(HttpMessageConverter.class); + HttpMessageConverter firstConverter = mock(); given(firstConverter.canRead(any(), any())).willReturn(true); given(firstConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); - HttpMessageConverter secondConverter = mock(HttpMessageConverter.class); + HttpMessageConverter secondConverter = mock(); given(secondConverter.canRead(any(), any())).willReturn(true); given(secondConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); @@ -654,7 +654,7 @@ class RestTemplateTests { @Test @SuppressWarnings("rawtypes") void exchangeParameterizedType() throws Exception { - GenericHttpMessageConverter converter = mock(GenericHttpMessageConverter.class); + GenericHttpMessageConverter converter = mock(); template.setMessageConverters(Collections.>singletonList(converter)); ParameterizedTypeReference> intList = new ParameterizedTypeReference<>() {}; given(converter.canRead(intList.getType(), null, null)).willReturn(true); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java index a8b0a7f16b..3f31bc3d91 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java @@ -100,7 +100,7 @@ public class ServletRequestAttributesTests { @Test public void getSessionScopedAttributeDoesNotForceCreationOfSession() { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); ServletRequestAttributes attrs = new ServletRequestAttributes(request); Object value = attrs.getAttribute(KEY, RequestAttributes.SCOPE_SESSION); @@ -122,7 +122,7 @@ public class ServletRequestAttributesTests { @Test public void removeSessionScopedAttributeDoesNotForceCreationOfSession() { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); ServletRequestAttributes attrs = new ServletRequestAttributes(request); attrs.removeAttribute(KEY, RequestAttributes.SCOPE_SESSION); @@ -131,8 +131,8 @@ public class ServletRequestAttributesTests { @Test public void updateAccessedAttributes() { - HttpServletRequest request = mock(HttpServletRequest.class); - HttpSession session = mock(HttpSession.class); + HttpServletRequest request = mock(); + HttpSession session = mock(); given(request.getSession(anyBoolean())).willReturn(session); given(session.getAttribute(KEY)).willReturn(VALUE); @@ -176,8 +176,8 @@ public class ServletRequestAttributesTests { } private void doSkipImmutableValue(Object immutableValue) { - HttpServletRequest request = mock(HttpServletRequest.class); - HttpSession session = mock(HttpSession.class); + HttpServletRequest request = mock(); + HttpSession session = mock(); given(request.getSession(anyBoolean())).willReturn(session); given(session.getAttribute(KEY)).willReturn(immutableValue); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java index 8e7fff0f9c..ca0e175980 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java @@ -33,7 +33,7 @@ public class DeferredResultTests { @Test public void setResult() { - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(); result.setResultHandler(handler); @@ -44,7 +44,7 @@ public class DeferredResultTests { @Test public void setResultTwice() { - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(); result.setResultHandler(handler); @@ -57,7 +57,7 @@ public class DeferredResultTests { @Test public void isSetOrExpired() { - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(); result.setResultHandler(handler); @@ -73,7 +73,7 @@ public class DeferredResultTests { @Test public void hasResult() { - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(); result.setResultHandler(handler); @@ -103,7 +103,7 @@ public class DeferredResultTests { public void onTimeout() throws Exception { final StringBuilder sb = new StringBuilder(); - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(null, "timeout result"); result.setResultHandler(handler); @@ -120,7 +120,7 @@ public class DeferredResultTests { public void onError() throws Exception { final StringBuilder sb = new StringBuilder(); - DeferredResultHandler handler = mock(DeferredResultHandler.class); + DeferredResultHandler handler = mock(); DeferredResult result = new DeferredResult<>(null, "error result"); result.setResultHandler(handler); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java index f40cf23e14..3cf5beab3f 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java @@ -108,7 +108,7 @@ public class StandardServletAsyncWebRequestTests { @Test public void onTimeoutHandler() throws Exception { - Runnable timeoutHandler = mock(Runnable.class); + Runnable timeoutHandler = mock(); this.asyncRequest.addTimeoutHandler(timeoutHandler); this.asyncRequest.onTimeout(new AsyncEvent(new MockAsyncContext(this.request, this.response))); verify(timeoutHandler).run(); @@ -117,7 +117,7 @@ public class StandardServletAsyncWebRequestTests { @SuppressWarnings("unchecked") @Test public void onErrorHandler() throws Exception { - Consumer errorHandler = mock(Consumer.class); + Consumer errorHandler = mock(); this.asyncRequest.addErrorHandler(errorHandler); Exception e = new Exception(); this.asyncRequest.onError(new AsyncEvent(new MockAsyncContext(this.request, this.response), e)); @@ -133,7 +133,7 @@ public class StandardServletAsyncWebRequestTests { @Test public void onCompletionHandler() throws Exception { - Runnable handler = mock(Runnable.class); + Runnable handler = mock(); this.asyncRequest.addCompletionHandler(handler); this.asyncRequest.startAsync(); @@ -148,7 +148,7 @@ public class StandardServletAsyncWebRequestTests { @SuppressWarnings("unchecked") @Test public void onErrorHandlerAfterOnErrorEvent() throws Exception { - Consumer handler = mock(Consumer.class); + Consumer handler = mock(); this.asyncRequest.addErrorHandler(handler); this.asyncRequest.startAsync(); @@ -160,7 +160,7 @@ public class StandardServletAsyncWebRequestTests { @Test public void onCompletionHandlerAfterOnCompleteEvent() throws Exception { - Runnable handler = mock(Runnable.class); + Runnable handler = mock(); this.asyncRequest.addCompletionHandler(handler); this.asyncRequest.startAsync(); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java index 8abf387923..c3bbb356ac 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java @@ -59,7 +59,7 @@ public class WebAsyncManagerErrorTests { this.servletResponse = new MockHttpServletResponse(); this.asyncWebRequest = new StandardServletAsyncWebRequest(servletRequest, servletResponse); - AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class); + AsyncTaskExecutor executor = mock(); this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest); this.asyncManager.setTaskExecutor(executor); @@ -71,7 +71,7 @@ public class WebAsyncManagerErrorTests { public void startCallableProcessingErrorAndComplete() throws Exception { StubCallable callable = new StubCallable(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); Exception e = new Exception(); given(interceptor.handleError(this.asyncWebRequest, callable, e)).willReturn(RESULT_NONE); @@ -112,7 +112,7 @@ public class WebAsyncManagerErrorTests { StubCallable callable = new StubCallable(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); Exception e = new Exception(); given(interceptor.handleError(this.asyncWebRequest, callable, e)).willReturn(22); @@ -135,7 +135,7 @@ public class WebAsyncManagerErrorTests { StubCallable callable = new StubCallable(); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); Exception e = new Exception(); given(interceptor.handleError(this.asyncWebRequest, callable, e)).willThrow(exception); @@ -157,7 +157,7 @@ public class WebAsyncManagerErrorTests { DeferredResult deferredResult = new DeferredResult<>(); - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); Exception e = new Exception(); given(interceptor.handleError(this.asyncWebRequest, deferredResult, e)).willReturn(true); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index 13bd5c4a8e..01588bda9f 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java @@ -40,25 +40,22 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; /** - * Test fixture with an {@link WebAsyncManager} with a mock AsyncWebRequest. + * Tests for {@link WebAsyncManager} with a mock {@link AsyncWebRequest}. * * @author Rossen Stoyanchev */ -public class WebAsyncManagerTests { +class WebAsyncManagerTests { - private WebAsyncManager asyncManager; + private AsyncWebRequest asyncWebRequest = mock(); - private AsyncWebRequest asyncWebRequest; + private MockHttpServletRequest servletRequest = new MockHttpServletRequest(); - private MockHttpServletRequest servletRequest; + private WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(servletRequest); @BeforeEach - public void setup() { - this.servletRequest = new MockHttpServletRequest(); - this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest); + void setup() { this.asyncManager.setTaskExecutor(new SyncTaskExecutor()); - this.asyncWebRequest = mock(AsyncWebRequest.class); this.asyncManager.setAsyncWebRequest(this.asyncWebRequest); verify(this.asyncWebRequest).addCompletionHandler((Runnable) notNull()); reset(this.asyncWebRequest); @@ -66,7 +63,7 @@ public class WebAsyncManagerTests { @Test - public void startAsyncProcessingWithoutAsyncWebRequest() throws Exception { + void startAsyncProcessingWithoutAsyncWebRequest() throws Exception { WebAsyncManager manager = WebAsyncUtils.getAsyncManager(new MockHttpServletRequest()); assertThatIllegalStateException() @@ -79,7 +76,7 @@ public class WebAsyncManagerTests { } @Test - public void isConcurrentHandlingStarted() { + void isConcurrentHandlingStarted() { given(this.asyncWebRequest.isAsyncStarted()).willReturn(false); assertThat(this.asyncManager.isConcurrentHandlingStarted()).isFalse(); @@ -91,17 +88,17 @@ public class WebAsyncManagerTests { } @Test - public void setAsyncWebRequestAfterAsyncStarted() { + void setAsyncWebRequestAfterAsyncStarted() { this.asyncWebRequest.startAsync(); assertThatIllegalArgumentException().isThrownBy(() -> this.asyncManager.setAsyncWebRequest(null)); } @Test - public void startCallableProcessing() throws Exception { + void startCallableProcessing() throws Exception { int concurrentResult = 21; Callable task = new StubCallable(concurrentResult); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); setupDefaultAsyncScenario(); @@ -118,11 +115,11 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingCallableException() throws Exception { + void startCallableProcessingCallableException() throws Exception { Exception concurrentResult = new Exception(); Callable task = new StubCallable(concurrentResult); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); setupDefaultAsyncScenario(); @@ -139,11 +136,11 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingBeforeConcurrentHandlingException() throws Exception { + void startCallableProcessingBeforeConcurrentHandlingException() throws Exception { Callable task = new StubCallable(21); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).beforeConcurrentHandling(this.asyncWebRequest, task); this.asyncManager.registerCallableInterceptor("interceptor", interceptor); @@ -160,11 +157,11 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingPreProcessException() throws Exception { + void startCallableProcessingPreProcessException() throws Exception { Callable task = new StubCallable(21); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).preProcess(this.asyncWebRequest, task); setupDefaultAsyncScenario(); @@ -180,11 +177,11 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingPostProcessException() throws Exception { + void startCallableProcessingPostProcessException() throws Exception { Callable task = new StubCallable(21); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, task, 21); setupDefaultAsyncScenario(); @@ -201,12 +198,12 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingPostProcessContinueAfterException() throws Exception { + void startCallableProcessingPostProcessContinueAfterException() throws Exception { Callable task = new StubCallable(21); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor1 = mock(CallableProcessingInterceptor.class); - CallableProcessingInterceptor interceptor2 = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor1 = mock(); + CallableProcessingInterceptor interceptor2 = mock(); willThrow(exception).given(interceptor2).postProcess(this.asyncWebRequest, task, 21); setupDefaultAsyncScenario(); @@ -227,11 +224,11 @@ public class WebAsyncManagerTests { @SuppressWarnings("unchecked") @Test - public void startCallableProcessingWithAsyncTask() throws Exception { - AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class); + void startCallableProcessingWithAsyncTask() throws Exception { + AsyncTaskExecutor executor = mock(); given(this.asyncWebRequest.getNativeRequest(HttpServletRequest.class)).willReturn(this.servletRequest); - WebAsyncTask asyncTask = new WebAsyncTask<>(1000L, executor, mock(Callable.class)); + WebAsyncTask asyncTask = new WebAsyncTask<>(1000L, executor, mock()); this.asyncManager.startCallableProcessing(asyncTask); verify(executor).submit((Runnable) notNull()); @@ -243,18 +240,18 @@ public class WebAsyncManagerTests { } @Test - public void startCallableProcessingNullInput() throws Exception { + void startCallableProcessingNullInput() throws Exception { assertThatIllegalArgumentException() .isThrownBy(() -> this.asyncManager.startCallableProcessing((Callable) null)) .withMessage("Callable must not be null"); } @Test - public void startDeferredResultProcessing() throws Exception { + void startDeferredResultProcessing() throws Exception { DeferredResult deferredResult = new DeferredResult<>(1000L); String concurrentResult = "abc"; - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); setupDefaultAsyncScenario(); @@ -272,11 +269,11 @@ public class WebAsyncManagerTests { } @Test - public void startDeferredResultProcessingBeforeConcurrentHandlingException() throws Exception { + void startDeferredResultProcessingBeforeConcurrentHandlingException() throws Exception { DeferredResult deferredResult = new DeferredResult<>(); Exception exception = new Exception(); - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).beforeConcurrentHandling(this.asyncWebRequest, deferredResult); this.asyncManager.registerDeferredResultInterceptor("interceptor", interceptor); @@ -293,11 +290,11 @@ public class WebAsyncManagerTests { } @Test - public void startDeferredResultProcessingPreProcessException() throws Exception { + void startDeferredResultProcessingPreProcessException() throws Exception { DeferredResult deferredResult = new DeferredResult<>(); Exception exception = new Exception(); - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).preProcess(this.asyncWebRequest, deferredResult); setupDefaultAsyncScenario(); @@ -313,11 +310,11 @@ public class WebAsyncManagerTests { } @Test - public void startDeferredResultProcessingPostProcessException() throws Exception { + void startDeferredResultProcessingPostProcessException() throws Exception { DeferredResult deferredResult = new DeferredResult<>(); Exception exception = new Exception(); - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, deferredResult, 25); setupDefaultAsyncScenario(); @@ -334,7 +331,7 @@ public class WebAsyncManagerTests { } @Test - public void startDeferredResultProcessingNullInput() throws Exception { + void startDeferredResultProcessingNullInput() throws Exception { assertThatIllegalArgumentException() .isThrownBy(() -> this.asyncManager.startDeferredResultProcessing(null)) .withMessage("DeferredResult must not be null"); @@ -358,7 +355,7 @@ public class WebAsyncManagerTests { private Object value; - public StubCallable(Object value) { + StubCallable(Object value) { this.value = value; } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java index 500d480e91..ed05b35ad5 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java @@ -63,7 +63,7 @@ public class WebAsyncManagerTimeoutTests { this.servletResponse = new MockHttpServletResponse(); this.asyncWebRequest = new StandardServletAsyncWebRequest(servletRequest, servletResponse); - AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class); + AsyncTaskExecutor executor = mock(); this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest); this.asyncManager.setTaskExecutor(executor); @@ -75,7 +75,7 @@ public class WebAsyncManagerTimeoutTests { public void startCallableProcessingTimeoutAndComplete() throws Exception { StubCallable callable = new StubCallable(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willReturn(RESULT_NONE); this.asyncManager.registerCallableInterceptor("interceptor", interceptor); @@ -112,7 +112,7 @@ public class WebAsyncManagerTimeoutTests { StubCallable callable = new StubCallable(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willReturn(22); this.asyncManager.registerCallableInterceptor("timeoutInterceptor", interceptor); @@ -133,7 +133,7 @@ public class WebAsyncManagerTimeoutTests { StubCallable callable = new StubCallable(); Exception exception = new Exception(); - CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class); + CallableProcessingInterceptor interceptor = mock(); given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willThrow(exception); this.asyncManager.registerCallableInterceptor("timeoutInterceptor", interceptor); @@ -153,9 +153,9 @@ public class WebAsyncManagerTimeoutTests { public void startCallableProcessingTimeoutAndCheckThreadInterrupted() throws Exception { StubCallable callable = new StubCallable(); - Future future = mock(Future.class); + Future future = mock(); - AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class); + AsyncTaskExecutor executor = mock(); given(executor.submit(any(Runnable.class))).willReturn(future); this.asyncManager.setTaskExecutor(executor); @@ -174,7 +174,7 @@ public class WebAsyncManagerTimeoutTests { DeferredResult deferredResult = new DeferredResult<>(); - DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); + DeferredResultProcessingInterceptor interceptor = mock(); given(interceptor.handleTimeout(this.asyncWebRequest, deferredResult)).willReturn(true); this.asyncManager.registerDeferredResultInterceptor("interceptor", interceptor); diff --git a/spring-web/src/test/java/org/springframework/web/context/support/ServletContextResourceTests.java b/spring-web/src/test/java/org/springframework/web/context/support/ServletContextResourceTests.java index 71333f5aab..767d8be4e0 100644 --- a/spring-web/src/test/java/org/springframework/web/context/support/ServletContextResourceTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/support/ServletContextResourceTests.java @@ -80,7 +80,7 @@ public class ServletContextResourceTests { @Test void missingResourceShouldHaveExpectedProperties() { - MockServletContext context = mock(MockServletContext.class); + MockServletContext context = mock(); given(context.getRealPath(eq("/org/springframework/web/context/support/missing.txt"))) .willReturn(this.servletContext.getRealPath("org/springframework/web/context/support/") + "missing.txt"); Resource missing = new ServletContextResource(context, "org/springframework/web/context/support/missing.txt"); diff --git a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java index 41d3a4192e..b4e64d9a91 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java @@ -47,14 +47,14 @@ public class CharacterEncodingFilterTests { @Test public void forceEncodingAlwaysSetsEncoding() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); request.setCharacterEncoding(ENCODING); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null); given(request.getDispatcherType()).willReturn(DispatcherType.REQUEST); - HttpServletResponse response = mock(HttpServletResponse.class); - FilterChain filterChain = mock(FilterChain.class); + HttpServletResponse response = mock(); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING, true); filter.init(new MockFilterConfig(FILTER_NAME)); @@ -68,7 +68,7 @@ public class CharacterEncodingFilterTests { @Test public void encodingIfEmptyAndNotForced() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); given(request.getCharacterEncoding()).willReturn(null); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null); @@ -76,7 +76,7 @@ public class CharacterEncodingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); - FilterChain filterChain = mock(FilterChain.class); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING); filter.init(new MockFilterConfig(FILTER_NAME)); @@ -90,7 +90,7 @@ public class CharacterEncodingFilterTests { @Test public void doesNotIfEncodingIsNotEmptyAndNotForced() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); given(request.getCharacterEncoding()).willReturn(ENCODING); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null); @@ -98,7 +98,7 @@ public class CharacterEncodingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); - FilterChain filterChain = mock(FilterChain.class); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING); filter.init(new MockFilterConfig(FILTER_NAME)); @@ -111,7 +111,7 @@ public class CharacterEncodingFilterTests { @Test public void withBeanInitialization() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); given(request.getCharacterEncoding()).willReturn(null); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null); @@ -119,7 +119,7 @@ public class CharacterEncodingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); - FilterChain filterChain = mock(FilterChain.class); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(); filter.setEncoding(ENCODING); @@ -135,7 +135,7 @@ public class CharacterEncodingFilterTests { @Test public void withIncompleteInitialization() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); given(request.getCharacterEncoding()).willReturn(null); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(CharacterEncodingFilter.class.getName()))).willReturn(null); @@ -143,7 +143,7 @@ public class CharacterEncodingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); - FilterChain filterChain = mock(FilterChain.class); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING); filter.doFilter(request, response, filterChain); @@ -157,14 +157,14 @@ public class CharacterEncodingFilterTests { // SPR-14240 @Test public void setForceEncodingOnRequestOnly() throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletRequest request = mock(); request.setCharacterEncoding(ENCODING); given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null); given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null); given(request.getDispatcherType()).willReturn(DispatcherType.REQUEST); - HttpServletResponse response = mock(HttpServletResponse.class); - FilterChain filterChain = mock(FilterChain.class); + HttpServletResponse response = mock(); + FilterChain filterChain = mock(); CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING, true, false); filter.init(new MockFilterConfig(FILTER_NAME)); diff --git a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java index a96aee17cc..30bd982364 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java @@ -634,7 +634,7 @@ public class ForwardedHeaderFilterTests { } }; MockHttpServletResponse response = new MockHttpServletResponse(); - FilterChain filterChain = new MockFilterChain(mock(HttpServlet.class), filter, redirectFilter); + FilterChain filterChain = new MockFilterChain(mock(), filter, redirectFilter); filterChain.doFilter(request, response); return response.getRedirectedUrl(); } diff --git a/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java index 96211525e0..3ac8577649 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java @@ -30,6 +30,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link RelativeRedirectFilter}. @@ -41,7 +42,7 @@ public class RelativeRedirectFilterTests { private RelativeRedirectFilter filter = new RelativeRedirectFilter(); - private HttpServletResponse response = Mockito.mock(HttpServletResponse.class); + private HttpServletResponse response = mock(); @Test diff --git a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java index 78d24a1617..c50a98590b 100644 --- a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java @@ -74,7 +74,7 @@ public class ControllerAdviceBeanTests { @Test public void equalsHashCodeAndToStringForBeanName() { String beanName = "myBean"; - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); given(beanFactory.containsBean(beanName)).willReturn(true); ControllerAdviceBean bean1 = new ControllerAdviceBean(beanName, beanFactory); @@ -232,7 +232,7 @@ public class ControllerAdviceBeanTests { @SuppressWarnings({"rawtypes", "unchecked"}) private void assertOrder(Class beanType, int expectedOrder) { String beanName = "myBean"; - BeanFactory beanFactory = mock(BeanFactory.class); + BeanFactory beanFactory = mock(); given(beanFactory.containsBean(beanName)).willReturn(true); given(beanFactory.getType(beanName)).willReturn(beanType); given(beanFactory.getBean(beanName)).willReturn(BeanUtils.instantiateClass(beanType)); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java index c3ab1ed072..06a710825d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java @@ -161,7 +161,7 @@ public class ModelAttributeMethodProcessorTests { @Test public void resolveArgumentViaDefaultConstructor() throws Exception { WebDataBinder dataBinder = new WebRequestDataBinder(null); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(any(), notNull(), eq("attrName"))).willReturn(dataBinder); this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory); @@ -175,7 +175,7 @@ public class ModelAttributeMethodProcessorTests { this.container.addAttribute(name, target); StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(this.request, target, name)).willReturn(dataBinder); this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory); @@ -194,7 +194,7 @@ public class ModelAttributeMethodProcessorTests { this.container.setBindingDisabled(name); StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(this.request, target, name)).willReturn(dataBinder); this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory); @@ -210,7 +210,7 @@ public class ModelAttributeMethodProcessorTests { this.container.addAttribute(name, target); StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(this.request, target, name)).willReturn(dataBinder); this.processor.resolveArgument(this.paramBindingDisabledAttr, this.container, this.request, factory); @@ -227,7 +227,7 @@ public class ModelAttributeMethodProcessorTests { StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name); dataBinder.getBindingResult().reject("error"); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.request, target, name)).willReturn(dataBinder); assertThatExceptionOfType(BindException.class).isThrownBy(() -> @@ -246,7 +246,7 @@ public class ModelAttributeMethodProcessorTests { this.container.addAttribute("anotherTestBean", anotherTestBean); StubRequestDataBinder dataBinder = new StubRequestDataBinder(testBean, name); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.request, testBean, name)).willReturn(dataBinder); this.processor.resolveArgument(this.paramModelAttr, this.container, this.request, binderFactory); @@ -275,7 +275,7 @@ public class ModelAttributeMethodProcessorTests { mockRequest.addParameter("listOfStrings", "1,2"); ServletWebRequest requestWithParam = new ServletWebRequest(mockRequest); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(any(), any(), eq("testBeanWithConstructorArgs"))) .willAnswer(invocation -> { WebRequestDataBinder binder = new WebRequestDataBinder(invocation.getArgument(1)); @@ -294,7 +294,7 @@ public class ModelAttributeMethodProcessorTests { this.container.addAttribute(expectedAttrName, target); WebDataBinder dataBinder = new WebRequestDataBinder(target); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(this.request, target, expectedAttrName)).willReturn(dataBinder); this.processor.resolveArgument(param, this.container, this.request, factory); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java index f859cb880f..8e098beb32 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java @@ -168,7 +168,7 @@ public class ModelFactoryTests { container.addAttribute(commandName, command); WebDataBinder dataBinder = new WebDataBinder(command, commandName); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.webRequest, command, commandName)).willReturn(dataBinder); ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler); @@ -188,7 +188,7 @@ public class ModelFactoryTests { container.addAttribute(attributeName, attribute); WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder); ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler); @@ -208,7 +208,7 @@ public class ModelFactoryTests { this.attributeStore.storeAttribute(this.webRequest, attributeName, attribute); WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder); container.getSessionStatus().setComplete(); @@ -233,7 +233,7 @@ public class ModelFactoryTests { container.setRedirectModelScenario(true); WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder); ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index b17783edf2..d8fc311a14 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -437,7 +437,7 @@ public class RequestParamMethodArgumentResolverTests { WebDataBinder binder = new WebRequestDataBinder(null); binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(webRequest, null, "stringNotAnnot")).willReturn(binder); request.addParameter("stringNotAnnot", ""); @@ -452,7 +452,7 @@ public class RequestParamMethodArgumentResolverTests { WebDataBinder binder = new WebRequestDataBinder(null); binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); - WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class); + WebDataBinderFactory binderFactory = mock(); given(binderFactory.createBinder(webRequest, null, "name")).willReturn(binder); request.addParameter("name", ""); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java index 96c18f5645..a99c5a9ddb 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java @@ -40,34 +40,32 @@ import static org.mockito.Mockito.verify; * @author Arjen Poutsma * @author Rossen Stoyanchev */ -public class WebArgumentResolverAdapterTests { +class WebArgumentResolverAdapterTests { - private TestWebArgumentResolverAdapter adapter; + private WebArgumentResolver adaptee = mock(); - private WebArgumentResolver adaptee; + private TestWebArgumentResolverAdapter adapter = new TestWebArgumentResolverAdapter(adaptee); + + private NativeWebRequest webRequest = new ServletWebRequest(new MockHttpServletRequest()); private MethodParameter parameter; - private NativeWebRequest webRequest; @BeforeEach - public void setUp() throws Exception { - adaptee = mock(WebArgumentResolver.class); - adapter = new TestWebArgumentResolverAdapter(adaptee); + void setUp() throws Exception { parameter = new MethodParameter(getClass().getMethod("handle", Integer.TYPE), 0); - webRequest = new ServletWebRequest(new MockHttpServletRequest()); // Expose request to the current thread (for SpEL expressions) RequestContextHolder.setRequestAttributes(webRequest); } @AfterEach - public void resetRequestContextHolder() { + void resetRequestContextHolder() { RequestContextHolder.resetRequestAttributes(); } @Test - public void supportsParameter() throws Exception { + void supportsParameter() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willReturn(42); assertThat(adapter.supportsParameter(parameter)).as("Parameter not supported").isTrue(); @@ -76,7 +74,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void supportsParameterUnresolved() throws Exception { + void supportsParameterUnresolved() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willReturn(WebArgumentResolver.UNRESOLVED); assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse(); @@ -85,7 +83,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void supportsParameterWrongType() throws Exception { + void supportsParameterWrongType() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willReturn("Foo"); assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse(); @@ -94,7 +92,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void supportsParameterThrowsException() throws Exception { + void supportsParameterThrowsException() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willThrow(new Exception()); assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse(); @@ -103,7 +101,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void resolveArgument() throws Exception { + void resolveArgument() throws Exception { int expected = 42; given(adaptee.resolveArgument(parameter, webRequest)).willReturn(expected); @@ -112,7 +110,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void resolveArgumentUnresolved() throws Exception { + void resolveArgumentUnresolved() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willReturn(WebArgumentResolver.UNRESOLVED); assertThatIllegalStateException().isThrownBy(() -> @@ -120,7 +118,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void resolveArgumentWrongType() throws Exception { + void resolveArgumentWrongType() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willReturn("Foo"); assertThatIllegalStateException().isThrownBy(() -> @@ -128,7 +126,7 @@ public class WebArgumentResolverAdapterTests { } @Test - public void resolveArgumentThrowsException() throws Exception { + void resolveArgumentThrowsException() throws Exception { given(adaptee.resolveArgument(parameter, webRequest)).willThrow(new Exception()); assertThatException().isThrownBy(() -> adapter.resolveArgument(parameter, null, webRequest, null)); @@ -139,7 +137,7 @@ public class WebArgumentResolverAdapterTests { private class TestWebArgumentResolverAdapter extends AbstractWebArgumentResolverAdapter { - public TestWebArgumentResolverAdapter(WebArgumentResolver adaptee) { + TestWebArgumentResolverAdapter(WebArgumentResolver adaptee) { super(adaptee); } diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java index 9562a65821..fa9e2e171b 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java @@ -34,13 +34,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Rossen Stoyanchev */ @SuppressWarnings("unused") -public class HandlerMethodReturnValueHandlerCompositeTests { +class HandlerMethodReturnValueHandlerCompositeTests { - private HandlerMethodReturnValueHandlerComposite handlers; + private HandlerMethodReturnValueHandlerComposite handlers = new HandlerMethodReturnValueHandlerComposite(); - private HandlerMethodReturnValueHandler integerHandler; + private HandlerMethodReturnValueHandler integerHandler = mock(); - ModelAndViewContainer mavContainer; + private ModelAndViewContainer mavContainer = new ModelAndViewContainer(); private MethodParameter integerType; @@ -48,35 +48,31 @@ public class HandlerMethodReturnValueHandlerCompositeTests { @BeforeEach - public void setup() throws Exception { + void setup() throws Exception { this.integerType = new MethodParameter(getClass().getDeclaredMethod("handleInteger"), -1); this.stringType = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1); - this.integerHandler = mock(HandlerMethodReturnValueHandler.class); given(this.integerHandler.supportsReturnType(this.integerType)).willReturn(true); - this.handlers = new HandlerMethodReturnValueHandlerComposite(); this.handlers.addHandler(this.integerHandler); - - mavContainer = new ModelAndViewContainer(); } @Test - public void supportsReturnType() throws Exception { + void supportsReturnType() throws Exception { assertThat(this.handlers.supportsReturnType(this.integerType)).isTrue(); assertThat(this.handlers.supportsReturnType(this.stringType)).isFalse(); } @Test - public void handleReturnValue() throws Exception { + void handleReturnValue() throws Exception { this.handlers.handleReturnValue(55, this.integerType, this.mavContainer, null); verify(this.integerHandler).handleReturnValue(55, this.integerType, this.mavContainer, null); } @Test - public void handleReturnValueWithMultipleHandlers() throws Exception { - HandlerMethodReturnValueHandler anotherIntegerHandler = mock(HandlerMethodReturnValueHandler.class); + void handleReturnValueWithMultipleHandlers() throws Exception { + HandlerMethodReturnValueHandler anotherIntegerHandler = mock(); given(anotherIntegerHandler.supportsReturnType(this.integerType)).willReturn(true); this.handlers.handleReturnValue(55, this.integerType, this.mavContainer, null); @@ -86,15 +82,15 @@ public class HandlerMethodReturnValueHandlerCompositeTests { } @Test // SPR-13083 - public void handleReturnValueWithAsyncHandler() throws Exception { + void handleReturnValueWithAsyncHandler() throws Exception { Promise promise = new Promise<>(); MethodParameter promiseType = new MethodParameter(getClass().getDeclaredMethod("handlePromise"), -1); - HandlerMethodReturnValueHandler responseBodyHandler = mock(HandlerMethodReturnValueHandler.class); + HandlerMethodReturnValueHandler responseBodyHandler = mock(); given(responseBodyHandler.supportsReturnType(promiseType)).willReturn(true); this.handlers.addHandler(responseBodyHandler); - AsyncHandlerMethodReturnValueHandler promiseHandler = mock(AsyncHandlerMethodReturnValueHandler.class); + AsyncHandlerMethodReturnValueHandler promiseHandler = mock(); given(promiseHandler.supportsReturnType(promiseType)).willReturn(true); given(promiseHandler.isAsyncReturnValue(promise, promiseType)).willReturn(true); this.handlers.addHandler(promiseHandler); @@ -109,7 +105,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests { } @Test - public void noSuitableReturnValueHandler() throws Exception { + void noSuitableReturnValueHandler() throws Exception { assertThatIllegalArgumentException().isThrownBy(() -> this.handlers.handleReturnValue("value", this.stringType, null, null)); } diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java index cce0b992c2..b5cd519af5 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java @@ -72,7 +72,7 @@ public class ByteArrayMultipartFileEditorTests { @Test public void setValueAsMultipartFile() throws Exception { String expectedValue = "That is comforting to know"; - MultipartFile file = mock(MultipartFile.class); + MultipartFile file = mock(); given(file.getBytes()).willReturn(expectedValue.getBytes()); editor.setValue(file); assertThat(editor.getAsText()).isEqualTo(expectedValue); @@ -80,7 +80,7 @@ public class ByteArrayMultipartFileEditorTests { @Test public void setValueAsMultipartFileWithBadBytes() throws Exception { - MultipartFile file = mock(MultipartFile.class); + MultipartFile file = mock(); given(file.getBytes()).willThrow(new IOException()); assertThatIllegalArgumentException().isThrownBy(() -> editor.setValue(file)); diff --git a/spring-web/src/test/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessorTests.java b/spring-web/src/test/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessorTests.java index 43c05c1382..6d778b048d 100644 --- a/spring-web/src/test/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessorTests.java @@ -24,7 +24,6 @@ import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; -import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.beans.factory.support.RootBeanDefinition; @@ -61,7 +60,7 @@ class HttpExchangeBeanRegistrationAotProcessorTests { private void process(Class beanClass) { BeanRegistrationAotContribution contribution = createContribution(beanClass); if (contribution != null) { - contribution.applyTo(this.generationContext, mock(BeanRegistrationCode.class)); + contribution.applyTo(this.generationContext, mock()); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java index c023f672a5..0d3ad00914 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java @@ -77,8 +77,8 @@ public class DispatcherHandlerTests { @Test void preFlightRequest() { - WebHandler webHandler = mock(WebHandler.class); - HandlerMapping handlerMapping = mock(HandlerMapping.class); + WebHandler webHandler = mock(); + HandlerMapping handlerMapping = mock(); given((handlerMapping).getHandler(any())).willReturn(Mono.just(webHandler)); StaticApplicationContext context = new StaticApplicationContext(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java index 050ec4f347..540dfd3277 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java @@ -132,7 +132,7 @@ public class DelegatingWebFluxConfigurationTests { @Test void webSocketService() { - WebSocketService service = mock(WebSocketService.class); + WebSocketService service = mock(); given(webFluxConfigurer.getWebSocketService()).willReturn(service); delegatingConfig.setConfigurers(Collections.singletonList(webFluxConfigurer)); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java index a88884c098..6f520d798c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java @@ -49,6 +49,7 @@ import org.springframework.web.testfixture.server.MockServerWebExchange; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link ResourceHandlerRegistry}. @@ -126,10 +127,10 @@ class ResourceHandlerRegistryTests { @Test void resourceChain() { - ResourceUrlProvider resourceUrlProvider = Mockito.mock(ResourceUrlProvider.class); + ResourceUrlProvider resourceUrlProvider = mock(); this.registry.setResourceUrlProvider(resourceUrlProvider); - ResourceResolver mockResolver = Mockito.mock(ResourceResolver.class); - ResourceTransformerSupport mockTransformer = Mockito.mock(ResourceTransformerSupport.class); + ResourceResolver mockResolver = mock(); + ResourceTransformerSupport mockTransformer = mock(); this.registration.resourceChain(true).addResolver(mockResolver).addTransformer(mockTransformer); @@ -189,11 +190,11 @@ class ResourceHandlerRegistryTests { @Test @SuppressWarnings("deprecation") void resourceChainWithOverrides() { - CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class); - VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class); - WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class); + CachingResourceResolver cachingResolver = mock(); + VersionResourceResolver versionResolver = mock(); + WebJarsResourceResolver webjarsResolver = mock(); PathResourceResolver pathResourceResolver = new PathResourceResolver(); - CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class); + CachingResourceTransformer cachingTransformer = mock(); CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer(); this.registration.setCacheControl(CacheControl.maxAge(3600, TimeUnit.MILLISECONDS)) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java index 922ce42a14..c10bcf54f0 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java @@ -333,7 +333,7 @@ public class WebFluxConfigurationSupportTests { @GetMapping("/{id}") public Principal getUser() { - return mock(Principal.class); + return mock(); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java index 84d8d430ae..6c660d60f2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java @@ -93,7 +93,7 @@ class DefaultClientRequestBuilderTests { List> messageWriters = new ArrayList<>(); messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); - ExchangeStrategies strategies = mock(ExchangeStrategies.class); + ExchangeStrategies strategies = mock(); given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(POST, "/"); @@ -142,7 +142,7 @@ class DefaultClientRequestBuilderTests { .build(); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); - ExchangeStrategies strategies = mock(ExchangeStrategies.class); + ExchangeStrategies strategies = mock(); result.writeTo(request, strategies).block(); @@ -168,7 +168,7 @@ class DefaultClientRequestBuilderTests { List> messageWriters = new ArrayList<>(); messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); - ExchangeStrategies strategies = mock(ExchangeStrategies.class); + ExchangeStrategies strategies = mock(); given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); @@ -187,7 +187,7 @@ class DefaultClientRequestBuilderTests { List> messageWriters = new ArrayList<>(); messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); - ExchangeStrategies strategies = mock(ExchangeStrategies.class); + ExchangeStrategies strategies = mock(); given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); @@ -207,7 +207,7 @@ class DefaultClientRequestBuilderTests { List> messageWriters = new ArrayList<>(); messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes())); - ExchangeStrategies strategies = mock(ExchangeStrategies.class); + ExchangeStrategies strategies = mock(); given(strategies.messageWriters()).willReturn(messageWriters); MockClientHttpRequest request = new MockClientHttpRequest(GET, "/"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 6de7a3be12..082fc0475d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -61,20 +61,19 @@ import static org.springframework.web.reactive.function.BodyExtractors.toMono; */ class DefaultClientResponseTests { - private ClientHttpResponse mockResponse; + private ClientHttpResponse mockResponse = mock(); private final HttpHeaders httpHeaders = new HttpHeaders(); - private ExchangeStrategies mockExchangeStrategies; + private ExchangeStrategies mockExchangeStrategies = mock(); private DefaultClientResponse defaultClientResponse; @BeforeEach - void createMocks() { - mockResponse = mock(ClientHttpResponse.class); + void configureMocks() { given(mockResponse.getHeaders()).willReturn(this.httpHeaders); - mockExchangeStrategies = mock(ExchangeStrategies.class); + defaultClientResponse = new DefaultClientResponse(mockResponse, mockExchangeStrategies, "", "", () -> null); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java index f9e058a76e..69a2fcc8ec 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java @@ -73,7 +73,7 @@ public class DefaultWebClientTests { @BeforeEach public void setup() { - ClientResponse mockResponse = mock(ClientResponse.class); + ClientResponse mockResponse = mock(); when(mockResponse.statusCode()).thenReturn(HttpStatus.OK); when(mockResponse.bodyToMono(Void.class)).thenReturn(Mono.empty()); given(this.exchangeFunction.exchange(this.captor.capture())).willReturn(Mono.just(mockResponse)); @@ -380,7 +380,7 @@ public class DefaultWebClientTests { @Test public void switchToErrorOnEmptyClientResponseMono() { - ExchangeFunction exchangeFunction = mock(ExchangeFunction.class); + ExchangeFunction exchangeFunction = mock(); given(exchangeFunction.exchange(any())).willReturn(Mono.empty()); WebClient client = WebClient.builder().baseUrl("/base").exchangeFunction(exchangeFunction).build(); StepVerifier.create(client.get().uri("/path").retrieve().bodyToMono(Void.class)) @@ -464,8 +464,8 @@ public class DefaultWebClientTests { ClientResponse response = ClientResponse.create(HttpStatus.BAD_REQUEST).build(); given(exchangeFunction.exchange(any())).willReturn(Mono.just(response)); - Predicate predicate1 = mock(Predicate.class); - Predicate predicate2 = mock(Predicate.class); + Predicate predicate1 = mock(); + Predicate predicate2 = mock(); given(predicate1.test(HttpStatus.BAD_REQUEST)).willReturn(false); given(predicate2.test(HttpStatus.BAD_REQUEST)).willReturn(false); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java index 69eeb9fa81..1037559275 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java @@ -52,7 +52,7 @@ public class ExchangeFilterFunctionsTests { @Test public void andThen() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); ExchangeFunction exchange = r -> Mono.just(response); boolean[] filtersInvoked = new boolean[2]; @@ -82,7 +82,7 @@ public class ExchangeFilterFunctionsTests { @Test public void apply() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); ExchangeFunction exchange = r -> Mono.just(response); boolean[] filterInvoked = new boolean[1]; @@ -101,7 +101,7 @@ public class ExchangeFilterFunctionsTests { @Test public void basicAuthenticationUsernamePassword() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); ExchangeFunction exchange = r -> { assertThat(r.headers().containsKey(HttpHeaders.AUTHORIZATION)).isTrue(); @@ -118,7 +118,7 @@ public class ExchangeFilterFunctionsTests { @Test public void basicAuthenticationInvalidCharacters() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ExchangeFunction exchange = r -> Mono.just(mock(ClientResponse.class)); + ExchangeFunction exchange = r -> Mono.just(mock()); assertThatIllegalArgumentException().isThrownBy(() -> ExchangeFilterFunctions.basicAuthentication("foo", "\ud83d\udca9").filter(request, exchange)); @@ -131,7 +131,7 @@ public class ExchangeFilterFunctionsTests { .attributes(org.springframework.web.reactive.function.client.ExchangeFilterFunctions .Credentials.basicAuthenticationCredentials("foo", "bar")) .build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); ExchangeFunction exchange = r -> { assertThat(r.headers().containsKey(HttpHeaders.AUTHORIZATION)).isTrue(); @@ -149,7 +149,7 @@ public class ExchangeFilterFunctionsTests { @SuppressWarnings("deprecation") public void basicAuthenticationAbsentAttributes() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); ExchangeFunction exchange = r -> { assertThat(r.headers().containsKey(HttpHeaders.AUTHORIZATION)).isFalse(); @@ -165,7 +165,7 @@ public class ExchangeFilterFunctionsTests { @Test public void statusHandlerMatch() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); given(response.statusCode()).willReturn(HttpStatus.NOT_FOUND); ExchangeFunction exchange = r -> Mono.just(response); @@ -183,7 +183,7 @@ public class ExchangeFilterFunctionsTests { @Test public void statusHandlerNoMatch() { ClientRequest request = ClientRequest.create(HttpMethod.GET, DEFAULT_URL).build(); - ClientResponse response = mock(ClientResponse.class); + ClientResponse response = mock(); given(response.statusCode()).willReturn(HttpStatus.NOT_FOUND); Mono result = ExchangeFilterFunctions diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java index d357a1bab1..addf547576 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java @@ -49,7 +49,7 @@ class WebClientObservationTests { private final TestObservationRegistry observationRegistry = TestObservationRegistry.create(); - private final ExchangeFunction exchangeFunction = mock(ExchangeFunction.class); + private final ExchangeFunction exchangeFunction = mock(); private final ArgumentCaptor request = ArgumentCaptor.forClass(ClientRequest.class); @@ -57,7 +57,7 @@ class WebClientObservationTests { @BeforeEach void setup() { - ClientResponse mockResponse = mock(ClientResponse.class); + ClientResponse mockResponse = mock(); when(mockResponse.statusCode()).thenReturn(HttpStatus.OK); when(mockResponse.bodyToMono(Void.class)).thenReturn(Mono.empty()); given(this.exchangeFunction.exchange(this.request.capture())).willReturn(Mono.just(mockResponse)); @@ -95,7 +95,7 @@ class WebClientObservationTests { @Test void recordsObservationForErrorExchange() { - ExchangeFunction exchangeFunction = mock(ExchangeFunction.class); + ExchangeFunction exchangeFunction = mock(); given(exchangeFunction.exchange(any())).willReturn(Mono.error(new IllegalStateException())); WebClient client = WebClient.builder().observationRegistry(observationRegistry).exchangeFunction(exchangeFunction).build(); StepVerifier.create(client.get().uri("/path").retrieve().bodyToMono(Void.class)) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java index 2eadf273e1..8b5fd75b09 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; */ class ClientResponseWrapperTests { - private ClientResponse mockResponse = mock(ClientResponse.class); + private ClientResponse mockResponse = mock(); private ClientResponseWrapper wrapper = new ClientResponseWrapper(mockResponse); @@ -62,7 +62,7 @@ class ClientResponseWrapperTests { @Test void headers() { - ClientResponse.Headers headers = mock(ClientResponse.Headers.class); + ClientResponse.Headers headers = mock(); given(mockResponse.headers()).willReturn(headers); assertThat(wrapper.headers()).isSameAs(headers); @@ -71,7 +71,7 @@ class ClientResponseWrapperTests { @Test @SuppressWarnings("unchecked") void cookies() { - MultiValueMap cookies = mock(MultiValueMap.class); + MultiValueMap cookies = mock(); given(mockResponse.cookies()).willReturn(cookies); assertThat(wrapper.cookies()).isSameAs(cookies); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java index b4df3715aa..5626f95b75 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseTests.java @@ -141,15 +141,15 @@ public class DefaultRenderingResponseTests { Mono result = RenderingResponse.create("view").modelAttributes(model).build(); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://localhost")); - ViewResolver viewResolver = mock(ViewResolver.class); - View view = mock(View.class); + ViewResolver viewResolver = mock(); + View view = mock(); given(viewResolver.resolveViewName("view", Locale.ENGLISH)).willReturn(Mono.just(view)); given(view.render(model, null, exchange)).willReturn(Mono.empty()); List viewResolvers = new ArrayList<>(); viewResolvers.add(viewResolver); - HandlerStrategies mockConfig = mock(HandlerStrategies.class); + HandlerStrategies mockConfig = mock(); given(mockConfig.viewResolvers()).willReturn(viewResolvers); StepVerifier.create(result) @@ -172,18 +172,18 @@ public class DefaultRenderingResponseTests { MediaType contentType = MediaType.APPLICATION_PDF; exchange.getResponse().getHeaders().setContentType(contentType); - ViewResolver viewResolver = mock(ViewResolver.class); - RedirectView view = mock(RedirectView.class); + ViewResolver viewResolver = mock(); + RedirectView view = mock(); given(viewResolver.resolveViewName(eq("view"), any())).willReturn(Mono.just(view)); given(view.render(model, contentType, exchange)).willReturn(Mono.empty()); List viewResolvers = new ArrayList<>(); viewResolvers.add(viewResolver); - HandlerStrategies mockConfig = mock(HandlerStrategies.class); + HandlerStrategies mockConfig = mock(); given(mockConfig.viewResolvers()).willReturn(viewResolvers); - ServerResponse.Context context = mock(ServerResponse.Context.class); + ServerResponse.Context context = mock(); given(context.viewResolvers()).willReturn(viewResolvers); Mono result = renderingResponse.writeTo(exchange, context); @@ -200,13 +200,13 @@ public class DefaultRenderingResponseTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://localhost")); TestView view = new TestView(); - ViewResolver viewResolver = mock(ViewResolver.class); + ViewResolver viewResolver = mock(); given(viewResolver.resolveViewName(any(), any())).willReturn(Mono.just(view)); List viewResolvers = new ArrayList<>(); viewResolvers.add(viewResolver); - ServerResponse.Context context = mock(ServerResponse.Context.class); + ServerResponse.Context context = mock(); given(context.viewResolvers()).willReturn(viewResolvers); StepVerifier.create(result.flatMap(response -> response.writeTo(exchange, context))) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java index cbfed64932..443971eb0a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTests.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Optional; import java.util.OptionalLong; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.HttpHeaders; @@ -39,22 +38,15 @@ import static org.mockito.Mockito.mock; /** * @author Arjen Poutsma */ -public class HeadersWrapperTests { +class HeadersWrapperTests { - private ServerRequest.Headers mockHeaders; + private ServerRequest.Headers mockHeaders = mock(); - private ServerRequestWrapper.HeadersWrapper wrapper; - - - @BeforeEach - public void createWrapper() { - mockHeaders = mock(ServerRequest.Headers.class); - wrapper = new ServerRequestWrapper.HeadersWrapper(mockHeaders); - } + private ServerRequestWrapper.HeadersWrapper wrapper = new ServerRequestWrapper.HeadersWrapper(mockHeaders); @Test - public void accept() { + void accept() { List accept = Collections.singletonList(MediaType.APPLICATION_JSON); given(mockHeaders.accept()).willReturn(accept); @@ -62,7 +54,7 @@ public class HeadersWrapperTests { } @Test - public void acceptCharset() { + void acceptCharset() { List acceptCharset = Collections.singletonList(StandardCharsets.UTF_8); given(mockHeaders.acceptCharset()).willReturn(acceptCharset); @@ -70,7 +62,7 @@ public class HeadersWrapperTests { } @Test - public void contentLength() { + void contentLength() { OptionalLong contentLength = OptionalLong.of(42L); given(mockHeaders.contentLength()).willReturn(contentLength); @@ -78,7 +70,7 @@ public class HeadersWrapperTests { } @Test - public void contentType() { + void contentType() { Optional contentType = Optional.of(MediaType.APPLICATION_JSON); given(mockHeaders.contentType()).willReturn(contentType); @@ -86,7 +78,7 @@ public class HeadersWrapperTests { } @Test - public void host() { + void host() { InetSocketAddress host = InetSocketAddress.createUnresolved("example.com", 42); given(mockHeaders.host()).willReturn(host); @@ -94,7 +86,7 @@ public class HeadersWrapperTests { } @Test - public void range() { + void range() { List range = Collections.singletonList(HttpRange.createByteRange(42)); given(mockHeaders.range()).willReturn(range); @@ -102,7 +94,7 @@ public class HeadersWrapperTests { } @Test - public void header() { + void header() { String name = "foo"; List value = Collections.singletonList("bar"); given(mockHeaders.header(name)).willReturn(value); @@ -111,7 +103,7 @@ public class HeadersWrapperTests { } @Test - public void asHttpHeaders() { + void asHttpHeaders() { HttpHeaders httpHeaders = new HttpHeaders(); given(mockHeaders.asHttpHeaders()).willReturn(httpHeaders); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java index 9d130dffb2..f6a6cb1d80 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java @@ -56,7 +56,7 @@ class RouterFunctionsTests { MockServerHttpRequest mockRequest = MockServerHttpRequest.get("https://example.com").build(); ServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), Collections.emptyList()); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.test(request)).willReturn(true); RouterFunction @@ -77,7 +77,7 @@ class RouterFunctionsTests { MockServerHttpRequest mockRequest = MockServerHttpRequest.get("https://example.com").build(); ServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), Collections.emptyList()); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.test(request)).willReturn(false); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); @@ -96,7 +96,7 @@ class RouterFunctionsTests { MockServerHttpRequest mockRequest = MockServerHttpRequest.get("https://example.com").build(); ServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), Collections.emptyList()); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.nest(request)).willReturn(Optional.of(request)); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); @@ -116,7 +116,7 @@ class RouterFunctionsTests { MockServerHttpRequest mockRequest = MockServerHttpRequest.get("https://example.com").build(); ServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), Collections.emptyList()); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.nest(request)).willReturn(Optional.empty()); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java index 7ad2f447ad..afe53bb704 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java @@ -42,20 +42,20 @@ import static org.mockito.Mockito.mock; /** * @author Arjen Poutsma */ -public class ServerRequestWrapperTests { +class ServerRequestWrapperTests { - private final ServerRequest mockRequest = mock(ServerRequest.class); + private final ServerRequest mockRequest = mock(); private final ServerRequestWrapper wrapper = new ServerRequestWrapper(mockRequest); @Test - public void request() { + void request() { assertThat(wrapper.request()).isSameAs(mockRequest); } @Test - public void method() { + void method() { HttpMethod method = HttpMethod.POST; given(mockRequest.method()).willReturn(method); @@ -63,7 +63,7 @@ public class ServerRequestWrapperTests { } @Test - public void uri() { + void uri() { URI uri = URI.create("https://example.com"); given(mockRequest.uri()).willReturn(uri); @@ -71,7 +71,7 @@ public class ServerRequestWrapperTests { } @Test - public void path() { + void path() { String path = "/foo/bar"; given(mockRequest.path()).willReturn(path); @@ -79,15 +79,15 @@ public class ServerRequestWrapperTests { } @Test - public void headers() { - ServerRequest.Headers headers = mock(ServerRequest.Headers.class); + void headers() { + ServerRequest.Headers headers = mock(); given(mockRequest.headers()).willReturn(headers); assertThat(wrapper.headers()).isSameAs(headers); } @Test - public void attribute() { + void attribute() { String name = "foo"; String value = "bar"; given(mockRequest.attribute(name)).willReturn(Optional.of(value)); @@ -96,7 +96,7 @@ public class ServerRequestWrapperTests { } @Test - public void queryParam() { + void queryParam() { String name = "foo"; String value = "bar"; given(mockRequest.queryParam(name)).willReturn(Optional.of(value)); @@ -105,7 +105,7 @@ public class ServerRequestWrapperTests { } @Test - public void queryParams() { + void queryParams() { MultiValueMap value = new LinkedMultiValueMap<>(); value.add("foo", "bar"); given(mockRequest.queryParams()).willReturn(value); @@ -114,7 +114,7 @@ public class ServerRequestWrapperTests { } @Test - public void pathVariable() { + void pathVariable() { String name = "foo"; String value = "bar"; given(mockRequest.pathVariable(name)).willReturn(value); @@ -123,7 +123,7 @@ public class ServerRequestWrapperTests { } @Test - public void pathVariables() { + void pathVariables() { Map pathVariables = Collections.singletonMap("foo", "bar"); given(mockRequest.pathVariables()).willReturn(pathVariables); @@ -132,15 +132,15 @@ public class ServerRequestWrapperTests { @Test @SuppressWarnings("unchecked") - public void cookies() { - MultiValueMap cookies = mock(MultiValueMap.class); + void cookies() { + MultiValueMap cookies = mock(); given(mockRequest.cookies()).willReturn(cookies); assertThat(wrapper.cookies()).isSameAs(cookies); } @Test - public void bodyExtractor() { + void bodyExtractor() { Mono result = Mono.just("foo"); BodyExtractor, ReactiveHttpInputMessage> extractor = BodyExtractors.toMono(String.class); given(mockRequest.body(extractor)).willReturn(result); @@ -149,7 +149,7 @@ public class ServerRequestWrapperTests { } @Test - public void bodyToMonoClass() { + void bodyToMonoClass() { Mono result = Mono.just("foo"); given(mockRequest.bodyToMono(String.class)).willReturn(result); @@ -157,7 +157,7 @@ public class ServerRequestWrapperTests { } @Test - public void bodyToMonoParameterizedTypeReference() { + void bodyToMonoParameterizedTypeReference() { Mono result = Mono.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference<>() {}; given(mockRequest.bodyToMono(reference)).willReturn(result); @@ -166,7 +166,7 @@ public class ServerRequestWrapperTests { } @Test - public void bodyToFluxClass() { + void bodyToFluxClass() { Flux result = Flux.just("foo"); given(mockRequest.bodyToFlux(String.class)).willReturn(result); @@ -174,7 +174,7 @@ public class ServerRequestWrapperTests { } @Test - public void bodyToFluxParameterizedTypeReference() { + void bodyToFluxParameterizedTypeReference() { Flux result = Flux.just("foo"); ParameterizedTypeReference reference = new ParameterizedTypeReference<>() {}; given(mockRequest.bodyToFlux(reference)).willReturn(result); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java index 193c922373..4b0c5f8986 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java @@ -24,7 +24,6 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCache; @@ -34,6 +33,7 @@ import org.springframework.web.reactive.resource.GzipSupport.GzippedFiles; import org.springframework.web.testfixture.server.MockServerWebExchange; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; import static org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest.get; /** @@ -81,7 +81,7 @@ public class CachingResourceResolverTests { @Test public void resolveResourceInternalFromCache() { - Resource expected = Mockito.mock(Resource.class); + Resource expected = mock(); this.cache.put(resourceKey("bar.css"), expected); MockServerWebExchange exchange = MockServerWebExchange.from(get("")); @@ -165,8 +165,8 @@ public class CachingResourceResolverTests { @Test public void resolveResourceMatchingEncoding() { - Resource resource = Mockito.mock(Resource.class); - Resource gzipped = Mockito.mock(Resource.class); + Resource resource = mock(); + Resource gzipped = mock(); this.cache.put(resourceKey("bar.css"), resource); this.cache.put(resourceKey("bar.css+encoding=gzip"), gzipped); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java index e4b80b17c1..a7e52a8263 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java @@ -23,7 +23,6 @@ import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import reactor.test.StepVerifier; import org.springframework.core.io.ClassPathResource; @@ -34,6 +33,9 @@ import org.springframework.web.testfixture.server.MockServerWebExchange; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import static org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest.get; /** @@ -113,7 +115,7 @@ class CssLinkResourceTransformerTests { MockServerWebExchange exchange = MockServerWebExchange.from(get("/static/external.css")); List transformers = Collections.singletonList(new CssLinkResourceTransformer()); - ResourceResolverChain mockChain = Mockito.mock(DefaultResourceResolverChain.class); + ResourceResolverChain mockChain = mock(); ResourceTransformerChain chain = new DefaultResourceTransformerChain(mockChain, transformers); Resource resource = getResource("external.css"); @@ -132,9 +134,9 @@ class CssLinkResourceTransformerTests { .verify(); List locations = Collections.singletonList(resource); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("https://example.org/fonts/css", locations); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("file:///home/spring/image.png", locations); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("//example.org/style.css", locations); + verify(mockChain, never()).resolveUrlPath("https://example.org/fonts/css", locations); + verify(mockChain, never()).resolveUrlPath("file:///home/spring/image.png", locations); + verify(mockChain, never()).resolveUrlPath("//example.org/style.css", locations); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java index 8906522b12..60295a69fd 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java @@ -304,10 +304,10 @@ class ResourceWebHandlerTests { // Use mock ResourceResolver: i.e. we're only testing upfront validations... - Resource resource = mock(Resource.class); + Resource resource = mock(); given(resource.getFilename()).willThrow(new AssertionError("Resource should not be resolved")); given(resource.getInputStream()).willThrow(new AssertionError("Resource should not be resolved")); - ResourceResolver resolver = mock(ResourceResolver.class); + ResourceResolver resolver = mock(); given(resolver.resolveResource(any(), any(), any(), any())).willReturn(Mono.just(resource)); ResourceWebHandler handler = new ResourceWebHandler(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java index e92a0261ed..e1d062ec02 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java @@ -17,13 +17,11 @@ package org.springframework.web.reactive.resource; import java.time.Duration; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -42,33 +40,26 @@ import static org.mockito.Mockito.verify; /** * Unit tests for {@link VersionResourceResolver}. + * * @author Rossen Stoyanchev * @author Brian Clozel + * @author Sam Brannen */ -public class VersionResourceResolverTests { +class VersionResourceResolverTests { - private List locations; + private List locations = List.of( + new ClassPathResource("test/", getClass()), + new ClassPathResource("testalternatepath/", getClass())); - private VersionResourceResolver resolver; + private ResourceResolverChain chain = mock(); - private ResourceResolverChain chain; + private VersionStrategy versionStrategy = mock(); - private VersionStrategy versionStrategy; + private VersionResourceResolver resolver = new VersionResourceResolver(); - @BeforeEach - public void setup() { - this.locations = new ArrayList<>(); - this.locations.add(new ClassPathResource("test/", getClass())); - this.locations.add(new ClassPathResource("testalternatepath/", getClass())); - - this.resolver = new VersionResourceResolver(); - this.chain = mock(ResourceResolverChain.class); - this.versionStrategy = mock(VersionStrategy.class); - } - @Test - public void resolveResourceExisting() { + void resolveResourceExisting() { String file = "bar.css"; Resource expected = new ClassPathResource("test/" + file, getClass()); given(this.chain.resolveResource(null, file, this.locations)).willReturn(Mono.just(expected)); @@ -84,7 +75,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoVersionStrategy() { + void resolveResourceNoVersionStrategy() { String file = "missing.css"; given(this.chain.resolveResource(null, file, this.locations)).willReturn(Mono.empty()); @@ -98,7 +89,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoVersionInPath() { + void resolveResourceNoVersionInPath() { String file = "bar.css"; given(this.chain.resolveResource(null, file, this.locations)).willReturn(Mono.empty()); given(this.versionStrategy.extractVersion(file)).willReturn(""); @@ -114,7 +105,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoResourceAfterVersionRemoved() { + void resolveResourceNoResourceAfterVersionRemoved() { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -133,7 +124,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceVersionDoesNotMatch() { + void resolveResourceVersionDoesNotMatch() { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -154,7 +145,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceSuccess() { + void resolveResourceSuccess() { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -179,10 +170,10 @@ public class VersionResourceResolverTests { } @Test - public void getStrategyForPath() { + void getStrategyForPath() { Map strategies = new HashMap<>(); - VersionStrategy jsStrategy = mock(VersionStrategy.class); - VersionStrategy catchAllStrategy = mock(VersionStrategy.class); + VersionStrategy jsStrategy = mock(); + VersionStrategy catchAllStrategy = mock(); strategies.put("/**", catchAllStrategy); strategies.put("/**/*.js", jsStrategy); this.resolver.setStrategyMap(strategies); @@ -194,8 +185,7 @@ public class VersionResourceResolverTests { } @Test // SPR-13883 - public void shouldConfigureFixedPrefixAutomatically() { - + void shouldConfigureFixedPrefixAutomatically() { this.resolver.addFixedVersionStrategy("fixedversion", "/js/**", "/css/**", "/fixedversion/css/**"); assertThat(this.resolver.getStrategyMap()).hasSize(4); @@ -214,12 +204,11 @@ public class VersionResourceResolverTests { } @Test // SPR-15372 - public void resolveUrlPathNoVersionStrategy() { + void resolveUrlPathNoVersionStrategy() { given(this.chain.resolveUrlPath("/foo.css", this.locations)).willReturn(Mono.just("/foo.css")); String resolved = this.resolver.resolveUrlPathInternal("/foo.css", this.locations, this.chain) .block(Duration.ofMillis(1000)); assertThat(resolved).isEqualTo("/foo.css"); } - } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java index b3092b989f..1b36c1a4b0 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java @@ -19,7 +19,6 @@ package org.springframework.web.reactive.resource; import java.time.Duration; import java.util.List; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -29,7 +28,6 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest; import org.springframework.web.testfixture.server.MockServerWebExchange; -import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; @@ -43,33 +41,23 @@ import static org.mockito.Mockito.verify; * @author Rossen Stoyanchev * @author Brian Clozel */ -public class WebJarsResourceResolverTests { +class WebJarsResourceResolverTests { private static final Duration TIMEOUT = Duration.ofSeconds(1); - private List locations; + private List locations = List.of(new ClassPathResource("/META-INF/resources/webjars")); - private WebJarsResourceResolver resolver; + // for this to work, an actual WebJar must be on the test classpath + private WebJarsResourceResolver resolver = new WebJarsResourceResolver(); - private ResourceResolverChain chain; + private ResourceResolverChain chain = mock(); - private ServerWebExchange exchange; - - - @BeforeEach - public void setup() { - // for this to work, an actual WebJar must be on the test classpath - this.locations = singletonList(new ClassPathResource("/META-INF/resources/webjars")); - this.resolver = new WebJarsResourceResolver(); - this.chain = mock(ResourceResolverChain.class); - this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get("")); - } + private ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("")); @Test - public void resolveUrlExisting() { - this.locations = singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveUrlExisting() { String file = "/foo/2.3/foo.txt"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(Mono.just(file)); @@ -80,8 +68,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlExistingNotInJarFile() { - this.locations = singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveUrlExistingNotInJarFile() { String file = "foo/foo.txt"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(Mono.empty()); @@ -93,7 +80,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlWebJarResource() { + void resolveUrlWebJarResource() { String file = "underscorejs/underscore.js"; String expected = "underscorejs/1.8.3/underscore.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(Mono.empty()); @@ -107,7 +94,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlWebJarResourceNotFound() { + void resolveUrlWebJarResourceNotFound() { String file = "something/something.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(Mono.empty()); @@ -119,9 +106,8 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceExisting() { - Resource expected = mock(Resource.class); - this.locations = singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveResourceExisting() { + Resource expected = mock(); String file = "foo/2.3/foo.txt"; given(this.chain.resolveResource(this.exchange, file, this.locations)).willReturn(Mono.just(expected)); @@ -134,7 +120,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceNotFound() { + void resolveResourceNotFound() { String file = "something/something.js"; given(this.chain.resolveResource(this.exchange, file, this.locations)).willReturn(Mono.empty()); @@ -148,18 +134,15 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceWebJar() { - this.locations = singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); - + void resolveResourceWebJar() { String file = "underscorejs/underscore.js"; given(this.chain.resolveResource(this.exchange, file, this.locations)).willReturn(Mono.empty()); - Resource expected = mock(Resource.class); + Resource expected = mock(); String expectedPath = "underscorejs/1.8.3/underscore.js"; given(this.chain.resolveResource(this.exchange, expectedPath, this.locations)) .willReturn(Mono.just(expected)); - Resource actual = this.resolver .resolveResource(this.exchange, file, this.locations, this.chain) .block(TIMEOUT); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java index cb2042827b..ea419084e4 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java @@ -231,7 +231,7 @@ public class InvocableHandlerMethodTests { } private HandlerMethodArgumentResolver stubResolver(Mono stubValue) { - HandlerMethodArgumentResolver resolver = mock(HandlerMethodArgumentResolver.class); + HandlerMethodArgumentResolver resolver = mock(); given(resolver.supportsParameter(any())).willReturn(true); given(resolver.resolveArgument(any(), any(), any())).willReturn(stubValue); return resolver; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java index 1e3ec7f6a2..9caa8c1125 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java @@ -118,7 +118,7 @@ public class ControllerAdviceTests { RequestMappingHandlerAdapter adapter = createAdapter(context); TestController controller = context.getBean(TestController.class); - Validator validator = mock(Validator.class); + Validator validator = mock(); controller.setValidator(validator); BindingContext bindingContext = handle(adapter, controller, "handle").getBindingContext(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java index 9c1891c580..db79978552 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java @@ -87,7 +87,7 @@ public class ModelInitializerTests { @Test public void initBinderMethod() { - Validator validator = mock(Validator.class); + Validator validator = mock(); TestController controller = new TestController(); controller.setValidator(validator); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java index 386a206d93..ef2f11769f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java @@ -57,7 +57,7 @@ import static org.mockito.Mockito.mock; * * @author Rossen Stoyanchev */ -public class RequestMappingHandlerMappingTests { +class RequestMappingHandlerMappingTests { private final StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -65,13 +65,13 @@ public class RequestMappingHandlerMappingTests { @BeforeEach - public void setup() { + void setup() { this.handlerMapping.setApplicationContext(wac); } @Test - public void resolveEmbeddedValuesInPatterns() { + void resolveEmbeddedValuesInPatterns() { this.handlerMapping.setEmbeddedValueResolver(value -> "/${pattern}/bar".equals(value) ? "/foo/bar" : value); String[] patterns = new String[] { "/foo", "/${pattern}/bar" }; @@ -81,7 +81,7 @@ public class RequestMappingHandlerMappingTests { } @Test - public void pathPrefix() throws Exception { + void pathPrefix() throws Exception { this.handlerMapping.setEmbeddedValueResolver(value -> "/${prefix}".equals(value) ? "/api" : value); this.handlerMapping.setPathPrefixes(Collections.singletonMap( "/${prefix}", HandlerTypePredicate.forAnnotation(RestController.class))); @@ -94,7 +94,7 @@ public class RequestMappingHandlerMappingTests { } @Test - public void resolveRequestMappingViaComposedAnnotation() throws Exception { + void resolveRequestMappingViaComposedAnnotation() throws Exception { RequestMappingInfo info = assertComposedAnnotationMapping("postJson", "/postJson", RequestMethod.POST); assertThat(info.getConsumesCondition().getConsumableMediaTypes().iterator().next().toString()).isEqualTo(MediaType.APPLICATION_JSON_VALUE); @@ -102,7 +102,7 @@ public class RequestMappingHandlerMappingTests { } @Test // SPR-14988 - public void getMappingOverridesConsumesFromTypeLevelAnnotation() throws Exception { + void getMappingOverridesConsumesFromTypeLevelAnnotation() throws Exception { RequestMappingInfo requestMappingInfo = assertComposedAnnotationMapping(RequestMethod.POST); ConsumesRequestCondition condition = requestMappingInfo.getConsumesCondition(); @@ -110,7 +110,7 @@ public class RequestMappingHandlerMappingTests { } @Test // gh-22010 - public void consumesWithOptionalRequestBody() { + void consumesWithOptionalRequestBody() { this.wac.registerSingleton("testController", ComposedAnnotationController.class); this.wac.refresh(); this.handlerMapping.afterPropertiesSet(); @@ -126,27 +126,27 @@ public class RequestMappingHandlerMappingTests { } @Test - public void getMapping() throws Exception { + void getMapping() throws Exception { assertComposedAnnotationMapping(RequestMethod.GET); } @Test - public void postMapping() throws Exception { + void postMapping() throws Exception { assertComposedAnnotationMapping(RequestMethod.POST); } @Test - public void putMapping() throws Exception { + void putMapping() throws Exception { assertComposedAnnotationMapping(RequestMethod.PUT); } @Test - public void deleteMapping() throws Exception { + void deleteMapping() throws Exception { assertComposedAnnotationMapping(RequestMethod.DELETE); } @Test - public void patchMapping() throws Exception { + void patchMapping() throws Exception { assertComposedAnnotationMapping(RequestMethod.PATCH); } @@ -234,7 +234,7 @@ public class RequestMappingHandlerMappingTests { @GetMapping("/{id}") public Principal getUser() { - return mock(Principal.class); + return mock(); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java index 09bb53bfce..2bdbf0a8d4 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java @@ -48,38 +48,35 @@ import static org.mockito.Mockito.mock; * Unit tests for {@link SessionAttributeMethodArgumentResolver}. * @author Rossen Stoyanchev */ -public class SessionAttributeMethodArgumentResolverTests { +class SessionAttributeMethodArgumentResolverTests { + + private WebSession session = mock(); + + private ServerWebExchange exchange = MockServerWebExchange.builder(MockServerHttpRequest.get("/")).session(this.session).build(); + + private Method handleMethod = ReflectionUtils.findMethod(getClass(), "handleWithSessionAttribute", (Class[]) null); private SessionAttributeMethodArgumentResolver resolver; - private ServerWebExchange exchange; - - private WebSession session; - - private Method handleMethod; - @BeforeEach @SuppressWarnings("resource") - public void setup() { + void setup() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.refresh(); ReactiveAdapterRegistry adapterRegistry = ReactiveAdapterRegistry.getSharedInstance(); this.resolver = new SessionAttributeMethodArgumentResolver(context.getBeanFactory(), adapterRegistry); - this.session = mock(WebSession.class); - this.exchange = MockServerWebExchange.builder(MockServerHttpRequest.get("/")).session(this.session).build(); - this.handleMethod = ReflectionUtils.findMethod(getClass(), "handleWithSessionAttribute", (Class[]) null); } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 0))).isTrue(); assertThat(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 4))).isFalse(); } @Test - public void resolve() { + void resolve() { MethodParameter param = initMethodParameter(0); Mono mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); StepVerifier.create(mono).expectError(ServerWebInputException.class).verify(); @@ -91,7 +88,7 @@ public class SessionAttributeMethodArgumentResolverTests { } @Test - public void resolveWithName() { + void resolveWithName() { MethodParameter param = initMethodParameter(1); Foo foo = new Foo(); given(this.session.getAttribute("specialFoo")).willReturn(foo); @@ -100,7 +97,7 @@ public class SessionAttributeMethodArgumentResolverTests { } @Test - public void resolveNotRequired() { + void resolveNotRequired() { MethodParameter param = initMethodParameter(2); Mono mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); assertThat(mono.block()).isNull(); @@ -113,7 +110,7 @@ public class SessionAttributeMethodArgumentResolverTests { @SuppressWarnings("unchecked") @Test - public void resolveOptional() { + void resolveOptional() { MethodParameter param = initMethodParameter(3); Optional actual = (Optional) this.resolver .resolveArgument(param, new BindingContext(), this.exchange).block(); @@ -129,9 +126,7 @@ public class SessionAttributeMethodArgumentResolverTests { given(this.session.getAttribute("foo")).willReturn(foo); actual = (Optional) this.resolver.resolveArgument(param, bindingContext, this.exchange).block(); - assertThat(actual).isNotNull(); - assertThat(actual.isPresent()).isTrue(); - assertThat(actual.get()).isSameAs(foo); + assertThat(actual).hasValue(foo); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java index 1914b8c41d..887578e3f1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java @@ -57,7 +57,7 @@ public class WebSessionMethodArgumentResolverTests { public void resolverArgument() { BindingContext context = new BindingContext(); - WebSession session = mock(WebSession.class); + WebSession session = mock(); MockServerHttpRequest request = MockServerHttpRequest.get("/").build(); ServerWebExchange exchange = MockServerWebExchange.builder(request).session(session).build(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java index 04b2963666..943cb885ae 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java @@ -67,13 +67,13 @@ import static org.springframework.web.testfixture.method.ResolvableMethod.on; * * @author Rossen Stoyanchev */ -public class ViewResolutionResultHandlerTests { +class ViewResolutionResultHandlerTests { private final BindingContext bindingContext = new BindingContext(); @Test - public void supports() { + void supports() { testSupports(on(Handler.class).annotPresent(ModelAttribute.class).resolveReturnType(String.class)); testSupports(on(Handler.class).annotNotPresent(ModelAttribute.class).resolveReturnType(String.class)); testSupports(on(Handler.class).resolveReturnType(Mono.class, String.class)); @@ -122,7 +122,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void viewResolverOrder() { + void viewResolverOrder() { TestViewResolver resolver1 = new TestViewResolver("account"); TestViewResolver resolver2 = new TestViewResolver("profile"); resolver1.setOrder(2); @@ -133,7 +133,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void handleReturnValueTypes() { + void handleReturnValueTypes() { Object returnValue; MethodParameter returnType; ViewResolver resolver = new TestViewResolver("account"); @@ -197,7 +197,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void handleWithMultipleResolvers() { + void handleWithMultipleResolvers() { testHandle("/account", on(Handler.class).annotNotPresent(ModelAttribute.class).resolveReturnType(String.class), "profile", "profile: {id=123}", @@ -205,7 +205,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void defaultViewName() { + void defaultViewName() { testDefaultViewName(null, on(Handler.class).annotPresent(ModelAttribute.class).resolveReturnType(String.class)); testDefaultViewName(Mono.empty(), on(Handler.class).resolveReturnType(Mono.class, String.class)); testDefaultViewName(Mono.empty(), on(Handler.class).resolveReturnType(Mono.class, Void.class)); @@ -231,7 +231,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void unresolvedViewName() { + void unresolvedViewName() { String returnValue = "account"; MethodParameter returnType = on(Handler.class).annotPresent(ModelAttribute.class).resolveReturnType(String.class); HandlerResult result = new HandlerResult(new Object(), returnValue, returnType, this.bindingContext); @@ -246,7 +246,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void contentNegotiation() { + void contentNegotiation() { TestBean value = new TestBean("Joe"); MethodParameter returnType = on(Handler.class).resolveReturnType(TestBean.class); HandlerResult handlerResult = new HandlerResult(new Object(), value, returnType, this.bindingContext); @@ -268,7 +268,7 @@ public class ViewResolutionResultHandlerTests { } @Test - public void contentNegotiationWith406() { + void contentNegotiationWith406() { TestBean value = new TestBean("Joe"); MethodParameter returnType = on(Handler.class).resolveReturnType(TestBean.class); HandlerResult handlerResult = new HandlerResult(new Object(), value, returnType, this.bindingContext); @@ -284,7 +284,7 @@ public class ViewResolutionResultHandlerTests { } @Test // SPR-15291 - public void contentNegotiationWithRedirect() { + void contentNegotiationWithRedirect() { HandlerResult handlerResult = new HandlerResult(new Object(), "redirect:/", on(Handler.class).annotNotPresent(ModelAttribute.class).resolveReturnType(String.class), this.bindingContext); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java index 0687038d14..297e4af13a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java @@ -16,12 +16,12 @@ package org.springframework.web.reactive.result.view.script; -import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -38,29 +38,30 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Sebastien Deleuze */ @Disabled("JRuby not compatible with JDK 9 yet") -public class JRubyScriptTemplateTests { +class JRubyScriptTemplateTests { @Test - public void renderTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); + void renderTemplate() throws Exception { + Map model = Map.of( + "title", "Layout example", + "body", "This is the body" + ); String url = "org/springframework/web/reactive/result/view/script/jruby/template.erb"; MockServerHttpResponse response = renderViewWithModel(url, model); - assertThat(response.getBodyAsString().block()).isEqualTo("Layout example

This is the body

"); + assertThat(response.getBodyAsString().block()) + .isEqualTo("Layout example

This is the body

"); } - private MockServerHttpResponse renderViewWithModel(String viewUrl, Map model) throws Exception { + + private static MockServerHttpResponse renderViewWithModel(String viewUrl, Map model) throws Exception { ScriptTemplateView view = createViewWithUrl(viewUrl); MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")); view.renderInternal(model, MediaType.TEXT_HTML, exchange).block(); return exchange.getResponse(); } - private ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(ScriptTemplatingConfiguration.class); - ctx.refresh(); + private static ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { + ApplicationContext ctx = new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class); ScriptTemplateView view = new ScriptTemplateView(); view.setApplicationContext(ctx); @@ -74,7 +75,7 @@ public class JRubyScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer jRubyConfigurer() { + ScriptTemplateConfigurer jRubyConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); configurer.setScripts("org/springframework/web/reactive/result/view/script/jruby/render.rb"); configurer.setEngineName("jruby"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java index b4633dec11..8238622914 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java @@ -40,10 +40,10 @@ import static org.mockito.Mockito.mock; * * @author Rossen Stoyanchev */ -public class HandshakeWebSocketServiceTests { +class HandshakeWebSocketServiceTests { @Test - public void sessionAttributePredicate() { + void sessionAttributePredicate() { MockWebSession session = new MockWebSession(); session.getAttributes().put("a1", "v1"); session.getAttributes().put("a2", "v2"); @@ -58,7 +58,7 @@ public class HandshakeWebSocketServiceTests { HandshakeWebSocketService service = new HandshakeWebSocketService(upgradeStrategy); service.setSessionAttributePredicate(name -> Arrays.asList("a1", "a3", "a5").contains(name)); - service.handleRequest(exchange, mock(WebSocketHandler.class)).block(); + service.handleRequest(exchange, mock()).block(); HandshakeInfo info = upgradeStrategy.handshakeInfo; assertThat(info).isNotNull(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java index e0b98eb402..14d49913e4 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java @@ -40,7 +40,7 @@ public class WebSocketUpgradeHandlerPredicateTests { private final WebSocketUpgradeHandlerPredicate predicate = new WebSocketUpgradeHandlerPredicate(); - private final WebSocketHandler webSocketHandler = mock(WebSocketHandler.class); + private final WebSocketHandler webSocketHandler = mock(); ServerWebExchange httpGetExchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path")); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java index efe279e4fb..779d5171be 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java @@ -16,7 +16,6 @@ package org.springframework.web.servlet; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; @@ -30,47 +29,28 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; /** - * A test fixture with HandlerExecutionChain and mock handler interceptors. + * Tests for {@link HandlerExecutionChain} with mock handler interceptors. * * @author Rossen Stoyanchev + * @author Sam Brannen */ -public class HandlerExecutionChainTests { +class HandlerExecutionChainTests { - private HandlerExecutionChain chain; + private Object handler = new Object(); - private Object handler; + private AsyncHandlerInterceptor interceptor1 = mock(); + private AsyncHandlerInterceptor interceptor2 = mock(); + private AsyncHandlerInterceptor interceptor3 = mock(); - private MockHttpServletRequest request; + private HandlerExecutionChain chain = new HandlerExecutionChain(handler, interceptor1, interceptor2, interceptor3); - private MockHttpServletResponse response; + private MockHttpServletRequest request = new MockHttpServletRequest(); - private AsyncHandlerInterceptor interceptor1; - - private AsyncHandlerInterceptor interceptor2; - - private AsyncHandlerInterceptor interceptor3; - - - @BeforeEach - public void setup() { - this.request = new MockHttpServletRequest(); - this.response= new MockHttpServletResponse() ; - - this.handler = new Object(); - this.chain = new HandlerExecutionChain(this.handler); - - this.interceptor1 = mock(AsyncHandlerInterceptor.class); - this.interceptor2 = mock(AsyncHandlerInterceptor.class); - this.interceptor3 = mock(AsyncHandlerInterceptor.class); - - this.chain.addInterceptor(this.interceptor1); - this.chain.addInterceptor(this.interceptor2); - this.chain.addInterceptor(this.interceptor3); - } + private MockHttpServletResponse response = new MockHttpServletResponse() ; @Test - public void successScenario() throws Exception { + void successScenario() throws Exception { ModelAndView mav = new ModelAndView(); given(this.interceptor1.preHandle(this.request, this.response, this.handler)).willReturn(true); @@ -91,7 +71,7 @@ public class HandlerExecutionChainTests { } @Test - public void successAsyncScenario() throws Exception { + void successAsyncScenario() throws Exception { given(this.interceptor1.preHandle(this.request, this.response, this.handler)).willReturn(true); given(this.interceptor2.preHandle(this.request, this.response, this.handler)).willReturn(true); given(this.interceptor3.preHandle(this.request, this.response, this.handler)).willReturn(true); @@ -106,7 +86,7 @@ public class HandlerExecutionChainTests { } @Test - public void earlyExitInPreHandle() throws Exception { + void earlyExitInPreHandle() throws Exception { given(this.interceptor1.preHandle(this.request, this.response, this.handler)).willReturn(true); given(this.interceptor2.preHandle(this.request, this.response, this.handler)).willReturn(false); @@ -116,13 +96,13 @@ public class HandlerExecutionChainTests { } @Test - public void exceptionBeforePreHandle() throws Exception { + void exceptionBeforePreHandle() throws Exception { this.chain.triggerAfterCompletion(this.request, this.response, null); verifyNoInteractions(this.interceptor1, this.interceptor2, this.interceptor3); } @Test - public void exceptionDuringPreHandle() throws Exception { + void exceptionDuringPreHandle() throws Exception { Exception ex = new Exception(""); given(this.interceptor1.preHandle(this.request, this.response, this.handler)).willReturn(true); @@ -141,7 +121,7 @@ public class HandlerExecutionChainTests { } @Test - public void exceptionAfterPreHandle() throws Exception { + void exceptionAfterPreHandle() throws Exception { Exception ex = new Exception(""); given(this.interceptor1.preHandle(this.request, this.response, this.handler)).willReturn(true); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java index 5ac3850750..e4d4e3b002 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java @@ -120,7 +120,7 @@ public class DelegatingWebMvcConfigurationTests { @Test public void configureMessageConverters() { - HttpMessageConverter customConverter = mock(HttpMessageConverter.class); + HttpMessageConverter customConverter = mock(); StringHttpMessageConverter stringConverter = new StringHttpMessageConverter(); WebMvcConfigurer configurer = new WebMvcConfigurer() { @Override @@ -206,8 +206,8 @@ public class DelegatingWebMvcConfigurationTests { @Test @SuppressWarnings("deprecation") public void configurePathMatcher() { - PathMatcher pathMatcher = mock(PathMatcher.class); - UrlPathHelper pathHelper = mock(UrlPathHelper.class); + PathMatcher pathMatcher = mock(); + UrlPathHelper pathHelper = mock(); WebMvcConfigurer configurer = new WebMvcConfigurer() { @Override @@ -275,8 +275,8 @@ public class DelegatingWebMvcConfigurationTests { @Test public void configurePathPatternParser() { PathPatternParser patternParser = new PathPatternParser(); - PathMatcher pathMatcher = mock(PathMatcher.class); - UrlPathHelper pathHelper = mock(UrlPathHelper.class); + PathMatcher pathMatcher = mock(); + UrlPathHelper pathHelper = mock(); WebMvcConfigurer configurer = new WebMvcConfigurer() { @Override diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index 355e3814c4..da3638a446 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.core.Ordered; import org.springframework.lang.Nullable; @@ -42,6 +41,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; /** * Test fixture with a {@link InterceptorRegistry}, two {@link HandlerInterceptor}s and two @@ -122,7 +122,7 @@ public class InterceptorRegistryTests { @Test public void addInterceptorsWithCustomPathMatcher() { - PathMatcher pathMatcher = Mockito.mock(PathMatcher.class); + PathMatcher pathMatcher = mock(); this.registry.addInterceptor(interceptor1).addPathPatterns("/path1/**").pathMatcher(pathMatcher); MappedInterceptor mappedInterceptor = (MappedInterceptor) this.registry.getInterceptors().get(0); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java index 359ac12efa..1e812006cf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java @@ -23,7 +23,6 @@ import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.cache.concurrent.ConcurrentMapCache; import org.springframework.core.io.Resource; @@ -47,6 +46,7 @@ import org.springframework.web.testfixture.servlet.MockServletContext; import org.springframework.web.util.UrlPathHelper; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link ResourceHandlerRegistry}. @@ -132,8 +132,8 @@ public class ResourceHandlerRegistryTests { @Test public void resourceChain() { - ResourceResolver mockResolver = Mockito.mock(ResourceResolver.class); - ResourceTransformer mockTransformer = Mockito.mock(ResourceTransformer.class); + ResourceResolver mockResolver = mock(); + ResourceTransformer mockTransformer = mock(); this.registration.resourceChain(true).addResolver(mockResolver).addTransformer(mockTransformer); ResourceHttpRequestHandler handler = getHandler("/resources/**"); @@ -190,11 +190,11 @@ public class ResourceHandlerRegistryTests { @Test public void resourceChainWithOverrides() { - CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class); - VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class); - WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class); + CachingResourceResolver cachingResolver = mock(); + VersionResourceResolver versionResolver = mock(); + WebJarsResourceResolver webjarsResolver = mock(); PathResourceResolver pathResourceResolver = new PathResourceResolver(); - CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class); + CachingResourceTransformer cachingTransformer = mock(); CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer(); this.registration.setCachePeriod(3600) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index b03c84fb63..848526b108 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java @@ -487,7 +487,7 @@ public class WebMvcConfigurationSupportExtensionTests { @GetMapping("/{id}") public Principal getUser() { - return mock(Principal.class); + return mock(); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java index 787e2e7099..595d2430f6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionsTests.java @@ -41,7 +41,7 @@ public class RouterFunctionsTests { public void routeMatch() { HandlerFunction handlerFunction = request -> ServerResponse.ok().build(); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.test(request)).willReturn(true); RouterFunction @@ -57,7 +57,7 @@ public class RouterFunctionsTests { public void routeNoMatch() { HandlerFunction handlerFunction = request -> ServerResponse.ok().build(); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.test(request)).willReturn(false); RouterFunction result = RouterFunctions.route(requestPredicate, handlerFunction); @@ -72,7 +72,7 @@ public class RouterFunctionsTests { HandlerFunction handlerFunction = request -> ServerResponse.ok().build(); RouterFunction routerFunction = request -> Optional.of(handlerFunction); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.nest(request)).willReturn(Optional.of(request)); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); @@ -88,7 +88,7 @@ public class RouterFunctionsTests { HandlerFunction handlerFunction = request -> ServerResponse.ok().build(); RouterFunction routerFunction = request -> Optional.of(handlerFunction); - RequestPredicate requestPredicate = mock(RequestPredicate.class); + RequestPredicate requestPredicate = mock(); given(requestPredicate.nest(request)).willReturn(Optional.empty()); RouterFunction result = RouterFunctions.nest(requestPredicate, routerFunction); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java index 3d90a24fd3..7d28e12532 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java @@ -48,11 +48,10 @@ class HandlerMappingTests { @PathPatternsParameterizedTest void orderedInterceptors(Function requestFactory, TestHandlerMapping mapping) throws Exception { - MappedInterceptor i1 = new MappedInterceptor(new String[] {"/**"}, mock(HandlerInterceptor.class)); - HandlerInterceptor i2 = mock(HandlerInterceptor.class); + HandlerInterceptor i2 = mock(); MappedInterceptor i3 = new MappedInterceptor(new String[] {"/**"}, mock(HandlerInterceptor.class)); - HandlerInterceptor i4 = mock(HandlerInterceptor.class); + HandlerInterceptor i4 = mock(); mapping.setInterceptors(i1, i2, i3, i4); mapping.setApplicationContext(new StaticWebApplicationContext()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java index 04878bc3d2..103ce30f7b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test; import org.springframework.util.PathMatcher; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; @@ -109,30 +108,27 @@ class MappedInterceptorTests { @Test void preHandle() throws Exception { - HandlerInterceptor delegate = mock(HandlerInterceptor.class); + HandlerInterceptor delegate = mock(); - new MappedInterceptor(null, delegate).preHandle( - mock(HttpServletRequest.class), mock(HttpServletResponse.class), null); + new MappedInterceptor(null, delegate).preHandle(mock(), mock(), null); then(delegate).should().preHandle(any(HttpServletRequest.class), any(HttpServletResponse.class), any()); } @Test void postHandle() throws Exception { - HandlerInterceptor delegate = mock(HandlerInterceptor.class); + HandlerInterceptor delegate = mock(); - new MappedInterceptor(null, delegate).postHandle( - mock(HttpServletRequest.class), mock(HttpServletResponse.class), null, mock(ModelAndView.class)); + new MappedInterceptor(null, delegate).postHandle(mock(), mock(), null, mock()); then(delegate).should().postHandle(any(), any(), any(), any()); } @Test void afterCompletion() throws Exception { - HandlerInterceptor delegate = mock(HandlerInterceptor.class); + HandlerInterceptor delegate = mock(); - new MappedInterceptor(null, delegate).afterCompletion( - mock(HttpServletRequest.class), mock(HttpServletResponse.class), null, mock(Exception.class)); + new MappedInterceptor(null, delegate).afterCompletion(mock(), mock(), null, mock()); then(delegate).should().afterCompletion(any(), any(), any(), any()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java index 7da7119b54..dc942a735f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java @@ -81,10 +81,10 @@ public class ControllerTests { private void doTestServletForwardingController(ServletForwardingController sfc, boolean include) throws Exception { - HttpServletRequest request = mock(HttpServletRequest.class); - HttpServletResponse response = mock(HttpServletResponse.class); - ServletContext context = mock(ServletContext.class); - RequestDispatcher dispatcher = mock(RequestDispatcher.class); + HttpServletRequest request = mock(); + HttpServletResponse response = mock(); + ServletContext context = mock(); + RequestDispatcher dispatcher = mock(); given(request.getMethod()).willReturn("GET"); given(context.getNamedDispatcher("action")).willReturn(dispatcher); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java index 3417dc8520..a0a08b62cf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java @@ -121,7 +121,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests { public void resolveOptional() throws Exception { WebDataBinder dataBinder = new WebRequestDataBinder(null); dataBinder.setConversionService(new DefaultConversionService()); - WebDataBinderFactory factory = mock(WebDataBinderFactory.class); + WebDataBinderFactory factory = mock(); given(factory.createBinder(this.webRequest, null, "foo")).willReturn(dataBinder); MethodParameter param = initMethodParameter(3); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java index 455bd0c894..93ce548d75 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java @@ -96,20 +96,24 @@ import static org.springframework.web.servlet.HandlerMapping.PRODUCIBLE_MEDIA_TY * @author Rossen Stoyanchev * @author Brian Clozel */ -public class HttpEntityMethodProcessorMockTests { +class HttpEntityMethodProcessorMockTests { private static final ZoneId GMT = ZoneId.of("GMT"); private HttpEntityMethodProcessor processor; - private HttpMessageConverter stringHttpMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter stringHttpMessageConverter = mock(); - private HttpMessageConverter resourceMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter resourceMessageConverter = mock(); - private HttpMessageConverter resourceRegionMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter resourceRegionMessageConverter = mock(); - private HttpMessageConverter jsonMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter jsonMessageConverter = mock(); private MethodParameter paramHttpEntity; @@ -135,31 +139,25 @@ public class HttpEntityMethodProcessorMockTests { private MethodParameter returnTypeProblemDetail; - private ModelAndViewContainer mavContainer; + private ModelAndViewContainer mavContainer = new ModelAndViewContainer(); - private MockHttpServletRequest servletRequest; + private MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/foo"); - private MockHttpServletResponse servletResponse; + private MockHttpServletResponse servletResponse = new MockHttpServletResponse(); - private ServletWebRequest webRequest; + private ServletWebRequest webRequest = new ServletWebRequest(servletRequest, servletResponse); @BeforeEach - @SuppressWarnings("unchecked") - public void setup() throws Exception { - - stringHttpMessageConverter = mock(HttpMessageConverter.class); + void setup() throws Exception { given(stringHttpMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(TEXT_PLAIN)); - resourceMessageConverter = mock(HttpMessageConverter.class); given(resourceMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.ALL)); given(resourceMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.ALL)); - resourceRegionMessageConverter = mock(HttpMessageConverter.class); given(resourceRegionMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.ALL)); given(resourceRegionMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.ALL)); - jsonMessageConverter = mock(HttpMessageConverter.class); given(jsonMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.APPLICATION_PROBLEM_JSON)); given(jsonMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.APPLICATION_PROBLEM_JSON)); @@ -181,16 +179,11 @@ public class HttpEntityMethodProcessorMockTests { returnTypeResponseEntityResource = new MethodParameter(getClass().getMethod("handle5"), -1); returnTypeErrorResponse = new MethodParameter(getClass().getMethod("handle6"), -1); returnTypeProblemDetail = new MethodParameter(getClass().getMethod("handle7"), -1); - - mavContainer = new ModelAndViewContainer(); - servletRequest = new MockHttpServletRequest("GET", "/foo"); - servletResponse = new MockHttpServletResponse(); - webRequest = new ServletWebRequest(servletRequest, servletResponse); } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(processor.supportsParameter(paramHttpEntity)).as("HttpEntity parameter not supported").isTrue(); assertThat(processor.supportsParameter(paramRequestEntity)).as("RequestEntity parameter not supported").isTrue(); assertThat(processor.supportsParameter(paramResponseEntity)).as("ResponseEntity parameter supported").isFalse(); @@ -198,7 +191,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void supportsReturnType() { + void supportsReturnType() { assertThat(processor.supportsReturnType(returnTypeResponseEntity)).as("ResponseEntity return type not supported").isTrue(); assertThat(processor.supportsReturnType(returnTypeHttpEntity)).as("HttpEntity return type not supported").isTrue(); assertThat(processor.supportsReturnType(returnTypeHttpEntitySubclass)).as("Custom HttpEntity subclass not supported").isTrue(); @@ -209,7 +202,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldResolveHttpEntityArgument() throws Exception { + void shouldResolveHttpEntityArgument() throws Exception { String body = "Foo"; MediaType contentType = TEXT_PLAIN; @@ -227,7 +220,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldResolveRequestEntityArgument() throws Exception { + void shouldResolveRequestEntityArgument() throws Exception { String body = "Foo"; MediaType contentType = TEXT_PLAIN; @@ -254,7 +247,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldFailResolvingWhenConverterCannotRead() throws Exception { + void shouldFailResolvingWhenConverterCannotRead() throws Exception { MediaType contentType = TEXT_PLAIN; servletRequest.setMethod("POST"); servletRequest.addHeader("Content-Type", contentType.toString()); @@ -267,7 +260,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldFailResolvingWhenContentTypeNotSupported() throws Exception { + void shouldFailResolvingWhenContentTypeNotSupported() throws Exception { servletRequest.setMethod("POST"); servletRequest.setContent("some content".getBytes(StandardCharsets.UTF_8)); assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class).isThrownBy(() -> @@ -275,7 +268,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleReturnValue() throws Exception { + void shouldHandleReturnValue() throws Exception { String body = "Foo"; ResponseEntity returnValue = new ResponseEntity<>(body, HttpStatus.OK); MediaType accepted = TEXT_PLAIN; @@ -289,7 +282,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleErrorResponse() throws Exception { + void shouldHandleErrorResponse() throws Exception { ErrorResponseException ex = new ErrorResponseException(HttpStatus.BAD_REQUEST); ex.getHeaders().add("foo", "bar"); servletRequest.addHeader("Accept", APPLICATION_PROBLEM_JSON_VALUE); @@ -307,7 +300,6 @@ public class HttpEntityMethodProcessorMockTests { .as("Instance was not set to the request path") .isEqualTo(servletRequest.getRequestURI()); - // But if instance is set, it should be respected ex.getBody().setInstance(URI.create("/something/else")); processor.handleReturnValue(ex, returnTypeProblemDetail, mavContainer, webRequest); @@ -320,7 +312,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleProblemDetail() throws Exception { + void shouldHandleProblemDetail() throws Exception { ProblemDetail problemDetail = ProblemDetail.forStatus(HttpStatus.BAD_REQUEST); servletRequest.addHeader("Accept", APPLICATION_PROBLEM_JSON_VALUE); given(jsonMessageConverter.canWrite(ProblemDetail.class, APPLICATION_PROBLEM_JSON)).willReturn(true); @@ -350,7 +342,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleReturnValueWithProducibleMediaType() throws Exception { + void shouldHandleReturnValueWithProducibleMediaType() throws Exception { String body = "Foo"; ResponseEntity returnValue = new ResponseEntity<>(body, HttpStatus.OK); servletRequest.addHeader("Accept", "text/*"); @@ -365,11 +357,11 @@ public class HttpEntityMethodProcessorMockTests { @Test @SuppressWarnings("unchecked") - public void shouldHandleReturnValueWithResponseBodyAdvice() throws Exception { + void shouldHandleReturnValueWithResponseBodyAdvice() throws Exception { servletRequest.addHeader("Accept", "text/*"); servletRequest.setAttribute(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, Collections.singleton(MediaType.TEXT_HTML)); ResponseEntity returnValue = new ResponseEntity<>(HttpStatus.OK); - ResponseBodyAdvice advice = mock(ResponseBodyAdvice.class); + ResponseBodyAdvice advice = mock(); given(advice.supports(any(), any())).willReturn(true); given(advice.beforeBodyWrite(any(), any(), any(), any(), any(), any())).willReturn("Foo"); @@ -386,7 +378,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldFailHandlingWhenContentTypeNotSupported() throws Exception { + void shouldFailHandlingWhenContentTypeNotSupported() throws Exception { String body = "Foo"; ResponseEntity returnValue = new ResponseEntity<>(body, HttpStatus.OK); MediaType accepted = MediaType.APPLICATION_ATOM_XML; @@ -401,7 +393,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // gh-23205 - public void shouldFailWithServerErrorIfContentTypeFromResponseEntity() { + void shouldFailWithServerErrorIfContentTypeFromResponseEntity() { ResponseEntity returnValue = ResponseEntity.ok() .contentType(MediaType.APPLICATION_XML) .body(""); @@ -417,7 +409,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // gh-23287 - public void shouldFailWithServerErrorIfContentTypeFromProducibleAttribute() { + void shouldFailWithServerErrorIfContentTypeFromProducibleAttribute() { Set mediaTypes = Collections.singleton(MediaType.APPLICATION_XML); servletRequest.setAttribute(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes); @@ -434,7 +426,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldFailHandlingWhenConverterCannotWrite() throws Exception { + void shouldFailHandlingWhenConverterCannotWrite() throws Exception { String body = "Foo"; ResponseEntity returnValue = new ResponseEntity<>(body, HttpStatus.OK); MediaType accepted = TEXT_PLAIN; @@ -450,7 +442,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-9142 - public void shouldFailHandlingWhenAcceptHeaderIllegal() throws Exception { + void shouldFailHandlingWhenAcceptHeaderIllegal() throws Exception { ResponseEntity returnValue = new ResponseEntity<>("Body", HttpStatus.ACCEPTED); servletRequest.addHeader("Accept", "01"); @@ -459,7 +451,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleResponseHeaderNoBody() throws Exception { + void shouldHandleResponseHeaderNoBody() throws Exception { HttpHeaders headers = new HttpHeaders(); headers.set("headerName", "headerValue"); ResponseEntity returnValue = new ResponseEntity<>(headers, HttpStatus.ACCEPTED); @@ -471,7 +463,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleResponseHeaderAndBody() throws Exception { + void shouldHandleResponseHeaderAndBody() throws Exception { HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.set("header", "headerValue"); ResponseEntity returnValue = new ResponseEntity<>("body", responseHeaders, HttpStatus.ACCEPTED); @@ -486,7 +478,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleLastModifiedWithHttp304() throws Exception { + void shouldHandleLastModifiedWithHttp304() throws Exception { long currentTime = new Date().getTime(); long oneMinuteAgo = currentTime - (1000 * 60); ZonedDateTime dateTime = ofEpochMilli(currentTime).atZone(GMT); @@ -500,7 +492,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void handleEtagWithHttp304() throws Exception { + void handleEtagWithHttp304() throws Exception { String etagValue = "\"deadb33f8badf00d\""; servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue); ResponseEntity returnValue = ResponseEntity.ok().eTag(etagValue).body("body"); @@ -512,8 +504,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void handleEtagWithHttp304AndEtagFilterHasNoImpact() throws Exception { - + void handleEtagWithHttp304AndEtagFilterHasNoImpact() throws Exception { String eTagValue = "\"deadb33f8badf00d\""; FilterChain chain = (req, res) -> { @@ -534,7 +525,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-14559 - public void shouldHandleInvalidIfNoneMatchWithHttp200() throws Exception { + void shouldHandleInvalidIfNoneMatchWithHttp200() throws Exception { String etagValue = "\"deadb33f8badf00d\""; servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, "unquoted"); ResponseEntity returnValue = ResponseEntity.ok().eTag(etagValue).body("body"); @@ -546,7 +537,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleETagAndLastModifiedWithHttp304() throws Exception { + void shouldHandleETagAndLastModifiedWithHttp304() throws Exception { long currentTime = new Date().getTime(); long oneMinuteAgo = currentTime - (1000 * 60); String etagValue = "\"deadb33f8badf00d\""; @@ -563,7 +554,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleNotModifiedResponse() throws Exception { + void shouldHandleNotModifiedResponse() throws Exception { long currentTime = new Date().getTime(); long oneMinuteAgo = currentTime - (1000 * 60); String etagValue = "\"deadb33f8badf00d\""; @@ -577,7 +568,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleChangedETagAndLastModified() throws Exception { + void shouldHandleChangedETagAndLastModified() throws Exception { long currentTime = new Date().getTime(); long oneMinuteAgo = currentTime - (1000 * 60); String etagValue = "\"deadb33f8badf00d\""; @@ -595,7 +586,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-13496 - public void shouldHandleConditionalRequestIfNoneMatchWildcard() throws Exception { + void shouldHandleConditionalRequestIfNoneMatchWildcard() throws Exception { String wildcardValue = "*"; String etagValue = "\"some-etag\""; servletRequest.setMethod("POST"); @@ -609,7 +600,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-13626 - public void shouldHandleGetIfNoneMatchWildcard() throws Exception { + void shouldHandleGetIfNoneMatchWildcard() throws Exception { String wildcardValue = "*"; String etagValue = "\"some-etag\""; servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, wildcardValue); @@ -622,7 +613,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-13626 - public void shouldHandleIfNoneMatchIfMatch() throws Exception { + void shouldHandleIfNoneMatchIfMatch() throws Exception { String etagValue = "\"some-etag\""; servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue); servletRequest.addHeader(HttpHeaders.IF_MATCH, "ifmatch"); @@ -635,7 +626,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test // SPR-13626 - public void shouldHandleIfNoneMatchIfUnmodifiedSince() throws Exception { + void shouldHandleIfNoneMatchIfUnmodifiedSince() throws Exception { String etagValue = "\"some-etag\""; servletRequest.addHeader(HttpHeaders.IF_NONE_MATCH, etagValue); ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(GMT); @@ -649,7 +640,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleResource() throws Exception { + void shouldHandleResource() throws Exception { ResponseEntity returnValue = ResponseEntity .ok(new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8))); @@ -665,7 +656,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldHandleResourceByteRange() throws Exception { + void shouldHandleResourceByteRange() throws Exception { ResponseEntity returnValue = ResponseEntity .ok(new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8))); servletRequest.addHeader("Range", "bytes=0-5"); @@ -682,7 +673,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void handleReturnTypeResourceIllegalByteRange() throws Exception { + void handleReturnTypeResourceIllegalByteRange() throws Exception { ResponseEntity returnValue = ResponseEntity .ok(new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8))); servletRequest.addHeader("Range", "illegal"); @@ -698,7 +689,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test //SPR-16754 - public void disableRangeSupportForStreamingResponses() throws Exception { + void disableRangeSupportForStreamingResponses() throws Exception { InputStream is = new ByteArrayInputStream("Content".getBytes(StandardCharsets.UTF_8)); InputStreamResource resource = new InputStreamResource(is, "test"); ResponseEntity returnValue = ResponseEntity.ok(resource); @@ -715,7 +706,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test //SPR-16921 - public void disableRangeSupportIfContentRangePresent() throws Exception { + void disableRangeSupportIfContentRangePresent() throws Exception { ResponseEntity returnValue = ResponseEntity .status(HttpStatus.PARTIAL_CONTENT) .header(HttpHeaders.RANGE, "bytes=0-5") @@ -731,7 +722,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test //SPR-14767 - public void shouldHandleValidatorHeadersInputResponses() throws Exception { + void shouldHandleValidatorHeadersInputResponses() throws Exception { servletRequest.setMethod("PUT"); String etagValue = "\"some-etag\""; ResponseEntity returnValue = ResponseEntity.ok().header(HttpHeaders.ETAG, etagValue).body("body"); @@ -743,7 +734,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void shouldNotFailPreconditionForPutRequests() throws Exception { + void shouldNotFailPreconditionForPutRequests() throws Exception { servletRequest.setMethod("PUT"); ZonedDateTime dateTime = ofEpochMilli(new Date().getTime()).atZone(GMT); servletRequest.addHeader(HttpHeaders.IF_UNMODIFIED_SINCE, RFC_1123_DATE_TIME.format(dateTime)); @@ -758,7 +749,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void varyHeader() throws Exception { + void varyHeader() throws Exception { String[] entityValues = {"Accept-Language", "User-Agent"}; String[] existingValues = {}; String[] expected = {"Accept-Language, User-Agent"}; @@ -766,7 +757,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void varyHeaderWithExistingWildcard() throws Exception { + void varyHeaderWithExistingWildcard() throws Exception { String[] entityValues = {"Accept-Language"}; String[] existingValues = {"*"}; String[] expected = {"*"}; @@ -774,7 +765,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void varyHeaderWithExistingCommaValues() throws Exception { + void varyHeaderWithExistingCommaValues() throws Exception { String[] entityValues = {"Accept-Language", "User-Agent"}; String[] existingValues = {"Accept-Encoding", "Accept-Language"}; String[] expected = {"Accept-Encoding", "Accept-Language", "User-Agent"}; @@ -782,7 +773,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void varyHeaderWithExistingCommaSeparatedValues() throws Exception { + void varyHeaderWithExistingCommaSeparatedValues() throws Exception { String[] entityValues = {"Accept-Language", "User-Agent"}; String[] existingValues = {"Accept-Encoding, Accept-Language"}; String[] expected = {"Accept-Encoding, Accept-Language", "User-Agent"}; @@ -790,7 +781,7 @@ public class HttpEntityMethodProcessorMockTests { } @Test - public void handleReturnValueVaryHeader() throws Exception { + void handleReturnValueVaryHeader() throws Exception { String[] entityValues = {"Accept-Language", "User-Agent"}; String[] existingValues = {"Accept-Encoding, Accept-Language"}; String[] expected = {"Accept-Encoding, Accept-Language", "User-Agent"}; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java index 1f9537ec4c..8d47f3b509 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java @@ -363,7 +363,7 @@ public class RequestMappingHandlerMappingTests { @GetMapping("/{id}") public Principal getUser() { - return mock(Principal.class); + return mock(); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index 2c075f1b63..9b9b4857c6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -70,14 +70,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; /** - * Test fixture with {@link RequestPartMethodArgumentResolver} and mock {@link HttpMessageConverter}. + * Tests for {@link RequestPartMethodArgumentResolver} with a mock {@link HttpMessageConverter}. * * @author Rossen Stoyanchev * @author Brian Clozel */ -public class RequestPartMethodArgumentResolverTests { +class RequestPartMethodArgumentResolverTests { - private HttpMessageConverter messageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter messageConverter = mock(); private RequestPartMethodArgumentResolver resolver; @@ -112,8 +113,7 @@ public class RequestPartMethodArgumentResolverTests { @BeforeEach @SuppressWarnings("unchecked") - public void setup() throws Exception { - messageConverter = mock(HttpMessageConverter.class); + void setup() throws Exception { given(messageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); resolver = new RequestPartMethodArgumentResolver(Collections.singletonList(messageConverter)); @@ -164,7 +164,7 @@ public class RequestPartMethodArgumentResolverTests { @Test - public void supportsParameter() { + void supportsParameter() { assertThat(resolver.supportsParameter(paramRequestPart)).isTrue(); assertThat(resolver.supportsParameter(paramNamedRequestPart)).isTrue(); assertThat(resolver.supportsParameter(paramValidRequestPart)).isTrue(); @@ -185,20 +185,20 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveMultipartFile() throws Exception { + void resolveMultipartFile() throws Exception { Object actual = resolver.resolveArgument(paramMultipartFile, null, webRequest, null); assertThat(actual).isSameAs(multipartFile1); } @Test - public void resolveMultipartFileList() throws Exception { + void resolveMultipartFileList() throws Exception { Object actual = resolver.resolveArgument(paramMultipartFileList, null, webRequest, null); assertThat(actual instanceof List).isTrue(); assertThat(actual).isEqualTo(Arrays.asList(multipartFile1, multipartFile2)); } @Test - public void resolveMultipartFileArray() throws Exception { + void resolveMultipartFileArray() throws Exception { Object actual = resolver.resolveArgument(paramMultipartFileArray, null, webRequest, null); assertThat(actual).isNotNull(); assertThat(actual instanceof MultipartFile[]).isTrue(); @@ -209,7 +209,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveMultipartFileNotAnnotArgument() throws Exception { + void resolveMultipartFileNotAnnotArgument() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected = new MockMultipartFile("multipartFileNotAnnot", "Hello World".getBytes()); request.addFile(expected); @@ -223,7 +223,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolvePartArgument() throws Exception { + void resolvePartArgument() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -238,7 +238,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolvePartListArgument() throws Exception { + void resolvePartListArgument() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -255,7 +255,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolvePartArrayArgument() throws Exception { + void resolvePartArrayArgument() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -275,22 +275,22 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveRequestPart() throws Exception { + void resolveRequestPart() throws Exception { testResolveArgument(new SimpleBean("foo"), paramRequestPart); } @Test - public void resolveNamedRequestPart() throws Exception { + void resolveNamedRequestPart() throws Exception { testResolveArgument(new SimpleBean("foo"), paramNamedRequestPart); } @Test - public void resolveNamedRequestPartNotPresent() throws Exception { + void resolveNamedRequestPartNotPresent() throws Exception { testResolveArgument(null, paramNamedRequestPart); } @Test - public void resolveRequestPartNotValid() throws Exception { + void resolveRequestPartNotValid() throws Exception { assertThatExceptionOfType(MethodArgumentNotValidException.class).isThrownBy(() -> testResolveArgument(new SimpleBean(null), paramValidRequestPart)) .satisfies(ex -> { @@ -302,24 +302,24 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveRequestPartValid() throws Exception { + void resolveRequestPartValid() throws Exception { testResolveArgument(new SimpleBean("foo"), paramValidRequestPart); } @Test - public void resolveRequestPartRequired() throws Exception { + void resolveRequestPartRequired() throws Exception { assertThatExceptionOfType(MissingServletRequestPartException.class).isThrownBy(() -> testResolveArgument(null, paramValidRequestPart)) .satisfies(ex -> assertThat(ex.getRequestPartName()).isEqualTo("requestPart")); } @Test - public void resolveRequestPartNotRequired() throws Exception { + void resolveRequestPartNotRequired() throws Exception { testResolveArgument(new SimpleBean("foo"), paramValidRequestPart); } @Test // gh-26501 - public void resolveRequestPartWithoutContentType() throws Exception { + void resolveRequestPartWithoutContentType() throws Exception { MockMultipartHttpServletRequest servletRequest = new MockMultipartHttpServletRequest(); servletRequest.addPart(new MockPart("requestPartString", "part value".getBytes(StandardCharsets.UTF_8))); ServletWebRequest webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse()); @@ -335,21 +335,21 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void isMultipartRequest() throws Exception { + void isMultipartRequest() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); assertThatExceptionOfType(MultipartException.class).isThrownBy(() -> resolver.resolveArgument(paramMultipartFile, new ModelAndViewContainer(), new ServletWebRequest(request), null)); } @Test // SPR-9079 - public void isMultipartRequestPut() throws Exception { + void isMultipartRequestPut() throws Exception { this.multipartRequest.setMethod("PUT"); Object actualValue = resolver.resolveArgument(paramMultipartFile, null, webRequest, null); assertThat(actualValue).isSameAs(multipartFile1); } @Test - public void resolveOptionalMultipartFileArgument() throws Exception { + void resolveOptionalMultipartFileArgument() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected = new MockMultipartFile("optionalMultipartFile", "Hello World".getBytes()); request.addFile(expected); @@ -367,7 +367,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalMultipartFileArgumentNotPresent() throws Exception { + void resolveOptionalMultipartFileArgumentNotPresent() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); webRequest = new ServletWebRequest(request); @@ -379,7 +379,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalMultipartFileArgumentWithoutMultipartRequest() throws Exception { + void resolveOptionalMultipartFileArgumentWithoutMultipartRequest() throws Exception { webRequest = new ServletWebRequest(new MockHttpServletRequest()); Object actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null); @@ -390,7 +390,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalMultipartFileList() throws Exception { + void resolveOptionalMultipartFileList() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected = new MockMultipartFile("requestPart", "Hello World".getBytes()); request.addFile(expected); @@ -408,7 +408,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalMultipartFileListNotPresent() throws Exception { + void resolveOptionalMultipartFileListNotPresent() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); webRequest = new ServletWebRequest(request); @@ -420,7 +420,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalMultipartFileListWithoutMultipartRequest() throws Exception { + void resolveOptionalMultipartFileListWithoutMultipartRequest() throws Exception { webRequest = new ServletWebRequest(new MockHttpServletRequest()); Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null); @@ -431,7 +431,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartArgument() throws Exception { + void resolveOptionalPartArgument() throws Exception { MockPart expected = new MockPart("optionalPart", "Hello World".getBytes()); MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); @@ -451,7 +451,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartArgumentNotPresent() throws Exception { + void resolveOptionalPartArgumentNotPresent() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -465,7 +465,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartArgumentWithoutMultipartRequest() throws Exception { + void resolveOptionalPartArgumentWithoutMultipartRequest() throws Exception { webRequest = new ServletWebRequest(new MockHttpServletRequest()); Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null); @@ -476,7 +476,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartList() throws Exception { + void resolveOptionalPartList() throws Exception { MockPart expected = new MockPart("requestPart", "Hello World".getBytes()); MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); @@ -496,7 +496,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartListNotPresent() throws Exception { + void resolveOptionalPartListNotPresent() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -510,7 +510,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalPartListWithoutMultipartRequest() throws Exception { + void resolveOptionalPartListWithoutMultipartRequest() throws Exception { webRequest = new ServletWebRequest(new MockHttpServletRequest()); Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null); @@ -521,7 +521,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalRequestPart() throws Exception { + void resolveOptionalRequestPart() throws Exception { SimpleBean simpleBean = new SimpleBean("foo"); given(messageConverter.canRead(SimpleBean.class, MediaType.TEXT_PLAIN)).willReturn(true); given(messageConverter.read(eq(SimpleBean.class), isA(HttpInputMessage.class))).willReturn(simpleBean); @@ -539,7 +539,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalRequestPartNotPresent() throws Exception { + void resolveOptionalRequestPartNotPresent() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("POST"); request.setContentType("multipart/form-data"); @@ -553,7 +553,7 @@ public class RequestPartMethodArgumentResolverTests { } @Test - public void resolveOptionalRequestPartWithoutMultipartRequest() throws Exception { + void resolveOptionalRequestPartWithoutMultipartRequest() throws Exception { webRequest = new ServletWebRequest(new MockHttpServletRequest()); Object actualValue = resolver.resolveArgument(optionalRequestPart, null, webRequest, null); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChainTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChainTests.java index f98a2e2410..e80241dbdb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChainTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChainTests.java @@ -21,9 +21,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.core.MethodParameter; import org.springframework.http.HttpInputMessage; @@ -46,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link RequestResponseBodyAdviceChain}. @@ -53,38 +52,26 @@ import static org.mockito.BDDMockito.given; * @author Rossen Stoyanchev * @since 4.2 */ -public class RequestResponseBodyAdviceChainTests { +class RequestResponseBodyAdviceChainTests { - private String body; + private String body = "body"; - private MediaType contentType; + private MediaType contentType = MediaType.TEXT_PLAIN; - private Class> converterType; + private Class> converterType = StringHttpMessageConverter.class; - private MethodParameter paramType; - private MethodParameter returnType; + private MethodParameter paramType = new MethodParameter(ClassUtils.getMethod(this.getClass(), "handle", String.class), 0); + private MethodParameter returnType = new MethodParameter(ClassUtils.getMethod(this.getClass(), "handle", String.class), -1); - private ServerHttpRequest request; - private ServerHttpResponse response; + private ServerHttpRequest request = new ServletServerHttpRequest(new MockHttpServletRequest()); + private ServerHttpResponse response = new ServletServerHttpResponse(new MockHttpServletResponse()); - @BeforeEach - public void setup() { - this.body = "body"; - this.contentType = MediaType.TEXT_PLAIN; - this.converterType = StringHttpMessageConverter.class; - this.paramType = new MethodParameter(ClassUtils.getMethod(this.getClass(), "handle", String.class), 0); - this.returnType = new MethodParameter(ClassUtils.getMethod(this.getClass(), "handle", String.class), -1); - this.request = new ServletServerHttpRequest(new MockHttpServletRequest()); - this.response = new ServletServerHttpResponse(new MockHttpServletResponse()); - } - - - @SuppressWarnings("unchecked") @Test - public void requestBodyAdvice() throws IOException { - RequestBodyAdvice requestAdvice = Mockito.mock(RequestBodyAdvice.class); - ResponseBodyAdvice responseAdvice = Mockito.mock(ResponseBodyAdvice.class); + @SuppressWarnings("unchecked") + void requestBodyAdvice() throws IOException { + RequestBodyAdvice requestAdvice = mock(); + ResponseBodyAdvice responseAdvice = mock(); List advice = Arrays.asList(requestAdvice, responseAdvice); RequestResponseBodyAdviceChain chain = new RequestResponseBodyAdviceChain(advice); @@ -103,11 +90,11 @@ public class RequestResponseBodyAdviceChainTests { String.class, this.converterType)).isEqualTo(modified); } - @SuppressWarnings("unchecked") @Test - public void responseBodyAdvice() { - RequestBodyAdvice requestAdvice = Mockito.mock(RequestBodyAdvice.class); - ResponseBodyAdvice responseAdvice = Mockito.mock(ResponseBodyAdvice.class); + @SuppressWarnings("unchecked") + void responseBodyAdvice() { + RequestBodyAdvice requestAdvice = mock(); + ResponseBodyAdvice responseAdvice = mock(); List advice = Arrays.asList(requestAdvice, responseAdvice); RequestResponseBodyAdviceChain chain = new RequestResponseBodyAdviceChain(advice); @@ -123,7 +110,7 @@ public class RequestResponseBodyAdviceChainTests { } @Test - public void controllerAdvice() { + void controllerAdvice() { Object adviceBean = new ControllerAdviceBean(new MyControllerAdvice()); RequestResponseBodyAdviceChain chain = new RequestResponseBodyAdviceChain(Collections.singletonList(adviceBean)); @@ -134,7 +121,7 @@ public class RequestResponseBodyAdviceChainTests { } @Test - public void controllerAdviceNotApplicable() { + void controllerAdviceNotApplicable() { Object adviceBean = new ControllerAdviceBean(new TargetedControllerAdvice()); RequestResponseBodyAdviceChain chain = new RequestResponseBodyAdviceChain(Collections.singletonList(adviceBean)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java index e4cae1627c..1174f1be89 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java @@ -78,23 +78,26 @@ import static org.mockito.Mockito.verify; * @author Rossen Stoyanchev * @author Juergen Hoeller */ -public class RequestResponseBodyMethodProcessorMockTests { +class RequestResponseBodyMethodProcessorMockTests { - private HttpMessageConverter stringMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter stringMessageConverter = mock(); - private HttpMessageConverter resourceMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter resourceMessageConverter = mock(); - private HttpMessageConverter resourceRegionMessageConverter; + @SuppressWarnings("unchecked") + private HttpMessageConverter resourceRegionMessageConverter = mock(); private RequestResponseBodyMethodProcessor processor; - private ModelAndViewContainer mavContainer; + private ModelAndViewContainer mavContainer = new ModelAndViewContainer(); - private MockHttpServletRequest servletRequest; + private MockHttpServletRequest servletRequest = new MockHttpServletRequest(); - private MockHttpServletResponse servletResponse; + private MockHttpServletResponse servletResponse = new MockHttpServletResponse(); - private NativeWebRequest webRequest; + private NativeWebRequest webRequest = new ServletWebRequest(servletRequest, servletResponse); private MethodParameter paramRequestBodyString; private MethodParameter paramInt; @@ -109,25 +112,18 @@ public class RequestResponseBodyMethodProcessorMockTests { @BeforeEach @SuppressWarnings("unchecked") - public void setup() throws Exception { - stringMessageConverter = mock(HttpMessageConverter.class); + void setup() throws Exception { given(stringMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); given(stringMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); - resourceMessageConverter = mock(HttpMessageConverter.class); given(resourceMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.ALL)); given(resourceMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.ALL)); - resourceRegionMessageConverter = mock(HttpMessageConverter.class); given(resourceRegionMessageConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.ALL)); given(resourceRegionMessageConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.ALL)); processor = new RequestResponseBodyMethodProcessor( Arrays.asList(stringMessageConverter, resourceMessageConverter, resourceRegionMessageConverter)); - mavContainer = new ModelAndViewContainer(); - servletRequest = new MockHttpServletRequest(); servletRequest.setMethod("POST"); - servletResponse = new MockHttpServletResponse(); - webRequest = new ServletWebRequest(servletRequest, servletResponse); Method methodHandle1 = getClass().getMethod("handle1", String.class, Integer.TYPE); paramRequestBodyString = new MethodParameter(methodHandle1, 0); @@ -142,19 +138,19 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void supportsParameter() { + void supportsParameter() { assertThat(processor.supportsParameter(paramRequestBodyString)).as("RequestBody parameter not supported").isTrue(); assertThat(processor.supportsParameter(paramInt)).as("non-RequestBody parameter supported").isFalse(); } @Test - public void supportsReturnType() { + void supportsReturnType() { assertThat(processor.supportsReturnType(returnTypeString)).as("ResponseBody return type not supported").isTrue(); assertThat(processor.supportsReturnType(returnTypeInt)).as("non-ResponseBody return type supported").isFalse(); } @Test - public void resolveArgument() throws Exception { + void resolveArgument() throws Exception { MediaType contentType = MediaType.TEXT_PLAIN; servletRequest.addHeader("Content-Type", contentType.toString()); @@ -172,7 +168,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentNotValid() throws Exception { + void resolveArgumentNotValid() throws Exception { assertThatExceptionOfType(MethodArgumentNotValidException.class).isThrownBy(() -> testResolveArgumentWithValidation(new SimpleBean(null))) .satisfies(ex -> { @@ -184,7 +180,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentValid() throws Exception { + void resolveArgumentValid() throws Exception { testResolveArgumentWithValidation(new SimpleBean("name")); } @@ -194,7 +190,7 @@ public class RequestResponseBodyMethodProcessorMockTests { servletRequest.setContent("payload".getBytes(StandardCharsets.UTF_8)); @SuppressWarnings("unchecked") - HttpMessageConverter beanConverter = mock(HttpMessageConverter.class); + HttpMessageConverter beanConverter = mock(); given(beanConverter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); given(beanConverter.canRead(SimpleBean.class, contentType)).willReturn(true); given(beanConverter.read(eq(SimpleBean.class), isA(HttpInputMessage.class))).willReturn(simpleBean); @@ -204,7 +200,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentCannotRead() throws Exception { + void resolveArgumentCannotRead() throws Exception { MediaType contentType = MediaType.TEXT_PLAIN; servletRequest.addHeader("Content-Type", contentType.toString()); servletRequest.setContent("payload".getBytes(StandardCharsets.UTF_8)); @@ -216,7 +212,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentNoContentType() throws Exception { + void resolveArgumentNoContentType() throws Exception { servletRequest.setContent("payload".getBytes(StandardCharsets.UTF_8)); given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false); assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class).isThrownBy(() -> @@ -224,7 +220,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentInvalidContentType() throws Exception { + void resolveArgumentInvalidContentType() throws Exception { this.servletRequest.setContentType("bad"); servletRequest.setContent("payload".getBytes(StandardCharsets.UTF_8)); assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class).isThrownBy(() -> @@ -232,7 +228,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test // SPR-9942 - public void resolveArgumentRequiredNoContent() throws Exception { + void resolveArgumentRequiredNoContent() throws Exception { servletRequest.setContentType(MediaType.TEXT_PLAIN_VALUE); servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); @@ -243,7 +239,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentNotGetRequests() throws Exception { + void resolveArgumentNotGetRequests() throws Exception { servletRequest.setMethod("GET"); servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false); @@ -252,7 +248,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentNotRequiredWithContent() throws Exception { + void resolveArgumentNotRequiredWithContent() throws Exception { servletRequest.setContentType("text/plain"); servletRequest.setContent("body".getBytes()); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); @@ -262,7 +258,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentNotRequiredNoContent() throws Exception { + void resolveArgumentNotRequiredNoContent() throws Exception { servletRequest.setContentType("text/plain"); servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); @@ -271,7 +267,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test // SPR-13417 - public void resolveArgumentNotRequiredNoContentNoContentType() throws Exception { + void resolveArgumentNotRequiredNoContentNoContentType() throws Exception { servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false); @@ -280,7 +276,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentOptionalWithContent() throws Exception { + void resolveArgumentOptionalWithContent() throws Exception { servletRequest.setContentType("text/plain"); servletRequest.setContent("body".getBytes()); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); @@ -290,7 +286,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentOptionalNoContent() throws Exception { + void resolveArgumentOptionalNoContent() throws Exception { servletRequest.setContentType("text/plain"); servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); @@ -298,7 +294,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void resolveArgumentOptionalNoContentNoContentType() throws Exception { + void resolveArgumentOptionalNoContentNoContentType() throws Exception { servletRequest.setContent(new byte[0]); given(stringMessageConverter.canRead(String.class, MediaType.TEXT_PLAIN)).willReturn(true); given(stringMessageConverter.canRead(String.class, MediaType.APPLICATION_OCTET_STREAM)).willReturn(false); @@ -307,7 +303,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnValue() throws Exception { + void handleReturnValue() throws Exception { MediaType accepted = MediaType.TEXT_PLAIN; servletRequest.addHeader("Accept", accepted.toString()); @@ -323,7 +319,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnValueProduces() throws Exception { + void handleReturnValueProduces() throws Exception { String body = "Foo"; servletRequest.addHeader("Accept", "text/*"); @@ -340,7 +336,7 @@ public class RequestResponseBodyMethodProcessorMockTests { @Test - public void handleReturnValueNotAcceptable() throws Exception { + void handleReturnValueNotAcceptable() throws Exception { MediaType accepted = MediaType.APPLICATION_ATOM_XML; servletRequest.addHeader("Accept", accepted.toString()); @@ -353,7 +349,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnValueNotAcceptableProduces() throws Exception { + void handleReturnValueNotAcceptableProduces() throws Exception { MediaType accepted = MediaType.TEXT_PLAIN; servletRequest.addHeader("Accept", accepted.toString()); @@ -366,7 +362,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnTypeResource() throws Exception { + void handleReturnTypeResource() throws Exception { Resource returnValue = new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8)); given(resourceMessageConverter.canWrite(ByteArrayResource.class, null)).willReturn(true); @@ -382,7 +378,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test // SPR-9841 - public void handleReturnValueMediaTypeSuffix() throws Exception { + void handleReturnValueMediaTypeSuffix() throws Exception { String body = "Foo"; MediaType accepted = MediaType.APPLICATION_XHTML_XML; List supported = Collections.singletonList(MediaType.valueOf("application/*+xml")); @@ -400,7 +396,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnTypeResourceByteRange() throws Exception { + void handleReturnTypeResourceByteRange() throws Exception { Resource returnValue = new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8)); servletRequest.addHeader("Range", "bytes=0-5"); @@ -416,7 +412,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } @Test - public void handleReturnTypeResourceIllegalByteRange() throws Exception { + void handleReturnTypeResourceIllegalByteRange() throws Exception { Resource returnValue = new ByteArrayResource("Content".getBytes(StandardCharsets.UTF_8)); servletRequest.addHeader("Range", "illegal"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java index 83b4fe44ec..9ea741a28c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java @@ -35,7 +35,6 @@ import reactor.core.scheduler.Schedulers; import org.springframework.core.MethodParameter; import org.springframework.core.ResolvableType; import org.springframework.http.ResponseEntity; -import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; @@ -57,33 +56,26 @@ import static org.springframework.core.ResolvableType.forClassWithGenerics; import static org.springframework.web.testfixture.method.ResolvableMethod.on; /** - * Unit tests for ResponseBodyEmitterReturnValueHandler. + * Unit tests for {@link ResponseBodyEmitterReturnValueHandler}. + * * @author Rossen Stoyanchev */ -public class ResponseBodyEmitterReturnValueHandlerTests { +class ResponseBodyEmitterReturnValueHandlerTests { - private ResponseBodyEmitterReturnValueHandler handler; + private ResponseBodyEmitterReturnValueHandler handler = + new ResponseBodyEmitterReturnValueHandler(List.of(new MappingJackson2HttpMessageConverter())); - private MockHttpServletRequest request; + private MockHttpServletRequest request = new MockHttpServletRequest(); - private MockHttpServletResponse response; + private MockHttpServletResponse response = new MockHttpServletResponse(); - private NativeWebRequest webRequest; + private NativeWebRequest webRequest = new ServletWebRequest(this.request, this.response); private final ModelAndViewContainer mavContainer = new ModelAndViewContainer(); @BeforeEach - public void setup() throws Exception { - - List> converters = - Collections.singletonList(new MappingJackson2HttpMessageConverter()); - - this.handler = new ResponseBodyEmitterReturnValueHandler(converters); - this.request = new MockHttpServletRequest(); - this.response = new MockHttpServletResponse(); - this.webRequest = new ServletWebRequest(this.request, this.response); - + void setup() throws Exception { AsyncWebRequest asyncWebRequest = new StandardServletAsyncWebRequest(this.request, this.response); WebAsyncUtils.getAsyncManager(this.webRequest).setAsyncWebRequest(asyncWebRequest); this.request.setAsyncSupported(true); @@ -91,8 +83,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { @Test - public void supportsReturnTypes() { - + void supportsReturnTypes() { assertThat(this.handler.supportsReturnType( on(TestController.class).resolveReturnType(ResponseBodyEmitter.class))).isTrue(); @@ -111,8 +102,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void doesNotSupportReturnTypes() { - + void doesNotSupportReturnTypes() { assertThat(this.handler.supportsReturnType( on(TestController.class).resolveReturnType(ResponseEntity.class, String.class))).isFalse(); @@ -125,7 +115,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseBodyEmitter() throws Exception { + void responseBodyEmitter() throws Exception { MethodParameter type = on(TestController.class).resolveReturnType(ResponseBodyEmitter.class); ResponseBodyEmitter emitter = new ResponseBodyEmitter(); this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest); @@ -161,14 +151,13 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseBodyEmitterWithTimeoutValue() throws Exception { - - AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class); + void responseBodyEmitterWithTimeoutValue() throws Exception { + AsyncWebRequest asyncWebRequest = mock(); WebAsyncUtils.getAsyncManager(this.request).setAsyncWebRequest(asyncWebRequest); ResponseBodyEmitter emitter = new ResponseBodyEmitter(19000L); - emitter.onTimeout(mock(Runnable.class)); - emitter.onCompletion(mock(Runnable.class)); + emitter.onTimeout(mock()); + emitter.onCompletion(mock()); MethodParameter type = on(TestController.class).resolveReturnType(ResponseBodyEmitter.class); this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest); @@ -179,16 +168,15 @@ public class ResponseBodyEmitterReturnValueHandlerTests { verify(asyncWebRequest).startAsync(); } - @SuppressWarnings("unchecked") @Test - public void responseBodyEmitterWithErrorValue() throws Exception { - - AsyncWebRequest asyncWebRequest = mock(AsyncWebRequest.class); + @SuppressWarnings("unchecked") + void responseBodyEmitterWithErrorValue() throws Exception { + AsyncWebRequest asyncWebRequest = mock(); WebAsyncUtils.getAsyncManager(this.request).setAsyncWebRequest(asyncWebRequest); ResponseBodyEmitter emitter = new ResponseBodyEmitter(19000L); - emitter.onError(mock(Consumer.class)); - emitter.onCompletion(mock(Runnable.class)); + emitter.onError(mock()); + emitter.onCompletion(mock()); MethodParameter type = on(TestController.class).resolveReturnType(ResponseBodyEmitter.class); this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest); @@ -199,7 +187,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void sseEmitter() throws Exception { + void sseEmitter() throws Exception { MethodParameter type = on(TestController.class).resolveReturnType(SseEmitter.class); SseEmitter emitter = new SseEmitter(); this.handler.handleReturnValue(emitter, type, this.mavContainer, this.webRequest); @@ -231,8 +219,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseBodyFlux() throws Exception { - + void responseBodyFlux() throws Exception { this.request.addHeader("Accept", "text/event-stream"); MethodParameter type = on(TestController.class).resolveReturnType(Flux.class, String.class); @@ -245,10 +232,9 @@ public class ResponseBodyEmitterReturnValueHandlerTests { assertThat(this.response.getContentAsString()).isEqualTo("data:foo\n\ndata:bar\n\ndata:baz\n\n"); } - @SuppressWarnings({"try","unused"}) @Test - public void responseBodyFluxWithThreadLocal() throws Exception { - + @SuppressWarnings({"try","unused"}) + void responseBodyFluxWithThreadLocal() throws Exception { this.request.addHeader("Accept", "text/event-stream"); ThreadLocal threadLocal = new ThreadLocal<>(); @@ -286,8 +272,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test // gh-21972 - public void responseBodyFluxWithError() throws Exception { - + void responseBodyFluxWithError() throws Exception { this.request.addHeader("Accept", "text/event-stream"); IllegalStateException ex = new IllegalStateException("wah wah"); @@ -302,7 +287,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseEntitySse() throws Exception { + void responseEntitySse() throws Exception { MethodParameter type = on(TestController.class).resolveReturnType(ResponseEntity.class, SseEmitter.class); SseEmitter emitter = new SseEmitter(); ResponseEntity entity = ResponseEntity.ok().header("foo", "bar").body(emitter); @@ -316,7 +301,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseEntitySseNoContent() throws Exception { + void responseEntitySseNoContent() throws Exception { MethodParameter type = on(TestController.class).resolveReturnType(ResponseEntity.class, SseEmitter.class); ResponseEntity entity = ResponseEntity.noContent().header("foo", "bar").build(); this.handler.handleReturnValue(entity, type, this.mavContainer, this.webRequest); @@ -327,8 +312,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test - public void responseEntityFlux() throws Exception { - + void responseEntityFlux() throws Exception { ResponseEntity> entity = ResponseEntity.ok().body(Flux.just("foo", "bar", "baz")); ResolvableType bodyType = forClassWithGenerics(Flux.class, String.class); MethodParameter type = on(TestController.class).resolveReturnType(ResponseEntity.class, bodyType); @@ -342,8 +326,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests { } @Test // SPR-17076 - public void responseEntityFluxWithCustomHeader() throws Exception { - + void responseEntityFluxWithCustomHeader() throws Exception { Sinks.Many sink = Sinks.many().unicast().onBackpressureBuffer(); ResponseEntity> entity = ResponseEntity.ok().header("x-foo", "bar").body(sink.asFlux()); ResolvableType bodyType = forClassWithGenerics(Flux.class, SimpleBean.class); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java index 902287db0f..82020a5b70 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java @@ -155,7 +155,7 @@ public class ResponseBodyEmitterTests { @Test public void onTimeoutBeforeHandlerInitialized() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); this.emitter.onTimeout(runnable); this.emitter.initialize(this.handler); @@ -176,7 +176,7 @@ public class ResponseBodyEmitterTests { verify(this.handler).onTimeout(captor.capture()); verify(this.handler).onCompletion(any()); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); this.emitter.onTimeout(runnable); assertThat(captor.getValue()).isNotNull(); @@ -186,7 +186,7 @@ public class ResponseBodyEmitterTests { @Test public void onCompletionBeforeHandlerInitialized() throws Exception { - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); this.emitter.onCompletion(runnable); this.emitter.initialize(this.handler); @@ -207,7 +207,7 @@ public class ResponseBodyEmitterTests { verify(this.handler).onTimeout(any()); verify(this.handler).onCompletion(captor.capture()); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); this.emitter.onCompletion(runnable); assertThat(captor.getValue()).isNotNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java index b6f8dc0027..06acfa8868 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java @@ -33,7 +33,6 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.PushBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.core.MethodParameter; import org.springframework.http.HttpMethod; @@ -48,6 +47,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse; import org.springframework.web.testfixture.servlet.MockHttpSession; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * @author Arjen Poutsma @@ -242,7 +242,7 @@ public class ServletRequestMethodArgumentResolverTests { @Test public void pushBuilder() throws Exception { - final PushBuilder pushBuilder = Mockito.mock(PushBuilder.class); + final PushBuilder pushBuilder = mock(); servletRequest = new MockHttpServletRequest("GET", "") { @Override public PushBuilder newPushBuilder() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java index 0dbe9e4a03..183892db94 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java @@ -23,7 +23,6 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import org.springframework.cache.Cache; import org.springframework.cache.concurrent.ConcurrentMapCache; @@ -33,6 +32,7 @@ import org.springframework.web.servlet.resource.GzipSupport.GzippedFiles; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Unit tests for @@ -76,7 +76,7 @@ public class CachingResourceResolverTests { @Test public void resolveResourceInternalFromCache() { - Resource expected = Mockito.mock(Resource.class); + Resource expected = mock(); this.cache.put(resourceKey("bar.css"), expected); Resource actual = this.chain.resolveResource(null, "bar.css", this.locations); @@ -157,8 +157,8 @@ public class CachingResourceResolverTests { @Test public void resolveResourceMatchingEncoding() { - Resource resource = Mockito.mock(Resource.class); - Resource gzipped = Mockito.mock(Resource.class); + Resource resource = mock(); + Resource gzipped = mock(); this.cache.put(resourceKey("bar.css"), resource); this.cache.put(resourceKey("bar.css+encoding=gzip"), gzipped); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java index 84108aabec..3a6fbe339d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java @@ -23,7 +23,6 @@ import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -33,6 +32,9 @@ import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; /** * Unit tests for {@link CssLinkResourceTransformer}. @@ -111,7 +113,7 @@ class CssLinkResourceTransformerTests { this.request = new MockHttpServletRequest("GET", "/static/external.css"); List transformers = Collections.singletonList(new CssLinkResourceTransformer()); - ResourceResolverChain mockChain = Mockito.mock(DefaultResourceResolverChain.class); + ResourceResolverChain mockChain = mock(); ResourceTransformerChain chain = new DefaultResourceTransformerChain(mockChain, transformers); Resource resource = getResource("external.css"); @@ -125,9 +127,9 @@ class CssLinkResourceTransformerTests { assertThat(result).isEqualToNormalizingNewlines(expected); List locations = List.of(resource); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("https://example.org/fonts/css", locations); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("file:///home/spring/image.png", locations); - Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("//example.org/style.css", locations); + verify(mockChain, never()).resolveUrlPath("https://example.org/fonts/css", locations); + verify(mockChain, never()).resolveUrlPath("file:///home/spring/image.png", locations); + verify(mockChain, never()).resolveUrlPath("//example.org/style.css", locations); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java index a844536611..5718f5e8c2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java @@ -336,10 +336,10 @@ class ResourceHttpRequestHandlerTests { void testInvalidPath() throws Exception { // Use mock ResourceResolver: i.e. we're only testing upfront validations... - Resource resource = mock(Resource.class); + Resource resource = mock(); given(resource.getFilename()).willThrow(new AssertionError("Resource should not be resolved")); given(resource.getInputStream()).willThrow(new AssertionError("Resource should not be resolved")); - ResourceResolver resolver = mock(ResourceResolver.class); + ResourceResolver resolver = mock(); given(resolver.resolveResource(any(), any(), any(), any())).willReturn(resource); ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java index 516edf06eb..ce809ec1ce 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java @@ -176,7 +176,7 @@ public class ResourceUrlProviderTests { @Test // SPR-16296 void getForLookupPathShouldNotFailIfPathContainsDoubleSlashes() { // given - ResourceResolver mockResourceResolver = mock(ResourceResolver.class); + ResourceResolver mockResourceResolver = mock(); given(mockResourceResolver.resolveUrlPath(any(), any(), any())).willReturn("some-path"); ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java index 740548a336..63d3469a30 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java @@ -16,13 +16,11 @@ package org.springframework.web.servlet.resource; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; @@ -42,30 +40,21 @@ import static org.mockito.Mockito.verify; * @author Brian Clozel * @author Sam Brannen */ -public class VersionResourceResolverTests { +class VersionResourceResolverTests { - private List locations; + private List locations = List.of( + new ClassPathResource("test/", getClass()), + new ClassPathResource("testalternatepath/", getClass())); - private VersionResourceResolver resolver; + private VersionResourceResolver resolver = new VersionResourceResolver(); - private ResourceResolverChain chain; + private ResourceResolverChain chain = mock(); - private VersionStrategy versionStrategy; + private VersionStrategy versionStrategy = mock(); - @BeforeEach - public void setup() { - this.locations = new ArrayList<>(); - this.locations.add(new ClassPathResource("test/", getClass())); - this.locations.add(new ClassPathResource("testalternatepath/", getClass())); - - this.resolver = new VersionResourceResolver(); - this.chain = mock(ResourceResolverChain.class); - this.versionStrategy = mock(VersionStrategy.class); - } - @Test - public void resolveResourceExisting() throws Exception { + void resolveResourceExisting() throws Exception { String file = "bar.css"; Resource expected = new ClassPathResource("test/" + file, getClass()); given(this.chain.resolveResource(null, file, this.locations)).willReturn(expected); @@ -78,7 +67,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoVersionStrategy() throws Exception { + void resolveResourceNoVersionStrategy() throws Exception { String file = "missing.css"; given(this.chain.resolveResource(null, file, this.locations)).willReturn(null); @@ -89,7 +78,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoVersionInPath() throws Exception { + void resolveResourceNoVersionInPath() throws Exception { String file = "bar.css"; given(this.chain.resolveResource(null, file, this.locations)).willReturn(null); given(this.versionStrategy.extractVersion(file)).willReturn(""); @@ -102,7 +91,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceNoResourceAfterVersionRemoved() throws Exception { + void resolveResourceNoResourceAfterVersionRemoved() throws Exception { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -118,7 +107,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceVersionDoesNotMatch() throws Exception { + void resolveResourceVersionDoesNotMatch() throws Exception { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -136,7 +125,7 @@ public class VersionResourceResolverTests { } @Test - public void resolveResourceSuccess() throws Exception { + void resolveResourceSuccess() throws Exception { String versionFile = "bar-version.css"; String version = "version"; String file = "bar.css"; @@ -158,10 +147,10 @@ public class VersionResourceResolverTests { } @Test - public void getStrategyForPath() throws Exception { + void getStrategyForPath() throws Exception { Map strategies = new HashMap<>(); - VersionStrategy jsStrategy = mock(VersionStrategy.class); - VersionStrategy catchAllStrategy = mock(VersionStrategy.class); + VersionStrategy jsStrategy = mock(); + VersionStrategy catchAllStrategy = mock(); strategies.put("/**", catchAllStrategy); strategies.put("/**/*.js", jsStrategy); this.resolver.setStrategyMap(strategies); @@ -174,8 +163,7 @@ public class VersionResourceResolverTests { // SPR-13883 @Test - public void shouldConfigureFixedPrefixAutomatically() throws Exception { - + void shouldConfigureFixedPrefixAutomatically() throws Exception { this.resolver.addFixedVersionStrategy("fixedversion", "/js/**", "/css/**", "/fixedversion/css/**"); assertThat(this.resolver.getStrategyMap()).hasSize(4); @@ -186,11 +174,10 @@ public class VersionResourceResolverTests { } @Test // SPR-15372 - public void resolveUrlPathNoVersionStrategy() throws Exception { + void resolveUrlPathNoVersionStrategy() throws Exception { given(this.chain.resolveUrlPath("/foo.css", this.locations)).willReturn("/foo.css"); String resolved = this.resolver.resolveUrlPathInternal("/foo.css", this.locations, this.chain); assertThat(resolved).isEqualTo("/foo.css"); } - } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java index 0c65d74038..b89b0a891c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java @@ -16,11 +16,9 @@ package org.springframework.web.servlet.resource; -import java.util.Collections; import java.util.List; import jakarta.servlet.http.HttpServletRequest; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; @@ -35,34 +33,25 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; /** - * Unit tests for - * {@link org.springframework.web.servlet.resource.WebJarsResourceResolver}. + * Unit tests for {@link WebJarsResourceResolver}. * * @author Brian Clozel + * @author Sam Brannen */ -public class WebJarsResourceResolverTests { +class WebJarsResourceResolverTests { - private List locations; + private List locations = List.of(new ClassPathResource("/META-INF/resources/webjars")); - private WebJarsResourceResolver resolver; + // for this to work, an actual WebJar must be on the test classpath + private WebJarsResourceResolver resolver = new WebJarsResourceResolver(); - private ResourceResolverChain chain; + private ResourceResolverChain chain = mock(); private HttpServletRequest request = new MockHttpServletRequest(); - @BeforeEach - public void setup() { - // for this to work, an actual WebJar must be on the test classpath - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars")); - this.resolver = new WebJarsResourceResolver(); - this.chain = mock(ResourceResolverChain.class); - } - - @Test - public void resolveUrlExisting() { - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveUrlExisting() { String file = "/foo/2.3/foo.txt"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(file); @@ -73,8 +62,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlExistingNotInJarFile() { - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveUrlExistingNotInJarFile() { String file = "foo/foo.txt"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); @@ -86,7 +74,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlWebJarResource() { + void resolveUrlWebJarResource() { String file = "underscorejs/underscore.js"; String expected = "underscorejs/1.8.3/underscore.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); @@ -100,7 +88,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveUrlWebJarResourceNotFound() { + void resolveUrlWebJarResourceNotFound() { String file = "something/something.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); @@ -112,9 +100,8 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceExisting() { - Resource expected = mock(Resource.class); - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); + void resolveResourceExisting() { + Resource expected = mock(); String file = "foo/2.3/foo.txt"; given(this.chain.resolveResource(this.request, file, this.locations)).willReturn(expected); @@ -125,7 +112,7 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceNotFound() { + void resolveResourceNotFound() { String file = "something/something.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); @@ -137,11 +124,10 @@ public class WebJarsResourceResolverTests { } @Test - public void resolveResourceWebJar() { - Resource expected = mock(Resource.class); + void resolveResourceWebJar() { + Resource expected = mock(); String file = "underscorejs/underscore.js"; String expectedPath = "underscorejs/1.8.3/underscore.js"; - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); given(this.chain.resolveResource(this.request, expectedPath, this.locations)).willReturn(expected); Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java index 4d2d4e5048..89b659784e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java @@ -104,7 +104,7 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests { } protected RequestDataValueProcessor getMockRequestDataValueProcessor() { - RequestDataValueProcessor mockProcessor = mock(RequestDataValueProcessor.class); + RequestDataValueProcessor mockProcessor = mock(); HttpServletRequest request = (HttpServletRequest) getPageContext().getRequest(); WebApplicationContext wac = RequestContextUtils.findWebApplicationContext(request); wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index c92ea46ffb..c691d25f52 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -51,7 +51,7 @@ public class BaseViewTests { @Test public void renderWithoutStaticAttributes() throws Exception { - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getServletContext()).willReturn(new MockServletContext()); HttpServletRequest request = new MockHttpServletRequest(); @@ -77,7 +77,7 @@ public class BaseViewTests { */ @Test public void renderWithStaticAttributesNoCollision() throws Exception { - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getServletContext()).willReturn(new MockServletContext()); HttpServletRequest request = new MockHttpServletRequest(); @@ -103,7 +103,7 @@ public class BaseViewTests { @Test public void pathVarsOverrideStaticAttributes() throws Exception { - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getServletContext()).willReturn(new MockServletContext()); HttpServletRequest request = new MockHttpServletRequest(); @@ -133,7 +133,7 @@ public class BaseViewTests { @Test public void dynamicModelOverridesStaticAttributesIfCollision() throws Exception { - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getServletContext()).willReturn(new MockServletContext()); HttpServletRequest request = new MockHttpServletRequest(); @@ -161,7 +161,7 @@ public class BaseViewTests { @Test public void dynamicModelOverridesPathVariables() throws Exception { - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getServletContext()).willReturn(new MockServletContext()); TestView tv = new TestView(wac); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java index 4534036b6f..ca3763003b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java @@ -93,7 +93,7 @@ public class ContentNegotiatingViewResolverTests { new ParameterContentNegotiationStrategy( Collections.singletonMap("xls", MediaType.parseMediaType(mediaType)))); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setContentNegotiationManager(manager); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -121,7 +121,7 @@ public class ContentNegotiatingViewResolverTests { manager.addFileExtensionResolvers(extensionsResolver); viewResolver.setContentNegotiationManager(manager); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); View viewMock = mock(View.class, "application_xls"); @@ -141,7 +141,7 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewNameWithInvalidAcceptHeader() throws Exception { request.addHeader("Accept", "application"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -157,7 +157,7 @@ public class ContentNegotiatingViewResolverTests { ParameterContentNegotiationStrategy paramStrategy = new ParameterContentNegotiationStrategy(mapping); viewResolver.setContentNegotiationManager(new ContentNegotiationManager(paramStrategy)); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -206,8 +206,8 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewNameAcceptHeader() throws Exception { request.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - ViewResolver viewResolverMock1 = mock(ViewResolver.class); - ViewResolver viewResolverMock2 = mock(ViewResolver.class); + ViewResolver viewResolverMock1 = mock(); + ViewResolver viewResolverMock2 = mock(); viewResolver.setViewResolvers(Arrays.asList(viewResolverMock1, viewResolverMock2)); viewResolver.afterPropertiesSet(); @@ -235,8 +235,8 @@ public class ContentNegotiatingViewResolverTests { viewResolver.setContentNegotiationManager(new ContentNegotiationManager(new HeaderContentNegotiationStrategy())); - ViewResolver htmlViewResolver = mock(ViewResolver.class); - ViewResolver jsonViewResolver = mock(ViewResolver.class); + ViewResolver htmlViewResolver = mock(); + ViewResolver jsonViewResolver = mock(); viewResolver.setViewResolvers(Arrays.asList(htmlViewResolver, jsonViewResolver)); View htmlView = mock(View.class, "text_html"); @@ -260,7 +260,7 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewNameAcceptHeaderWithSuffix() throws Exception { request.addHeader("Accept", "application/vnd.example-v2+xml"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Arrays.asList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -283,8 +283,8 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewNameAcceptHeaderDefaultView() throws Exception { request.addHeader("Accept", "application/json"); - ViewResolver viewResolverMock1 = mock(ViewResolver.class); - ViewResolver viewResolverMock2 = mock(ViewResolver.class); + ViewResolver viewResolverMock1 = mock(); + ViewResolver viewResolverMock2 = mock(); viewResolver.setViewResolvers(Arrays.asList(viewResolverMock1, viewResolverMock2)); View viewMock1 = mock(View.class, "application_xml"); @@ -352,8 +352,8 @@ public class ContentNegotiatingViewResolverTests { new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(mapping); viewResolver.setContentNegotiationManager(new ContentNegotiationManager(pathStrategy)); - ViewResolver viewResolverMock1 = mock(ViewResolver.class); - ViewResolver viewResolverMock2 = mock(ViewResolver.class); + ViewResolver viewResolverMock1 = mock(); + ViewResolver viewResolverMock2 = mock(); viewResolver.setViewResolvers(Arrays.asList(viewResolverMock1, viewResolverMock2)); View viewMock1 = mock(View.class, "application_xml"); @@ -385,7 +385,7 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewContentTypeNull() throws Exception { request.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -413,7 +413,7 @@ public class ContentNegotiatingViewResolverTests { UrlBasedViewResolver urlViewResolver = new InternalResourceViewResolver(); urlViewResolver.setApplicationContext(webAppContext); - ViewResolver xmlViewResolver = mock(ViewResolver.class); + ViewResolver xmlViewResolver = mock(); viewResolver.setViewResolvers(Arrays.asList(xmlViewResolver, urlViewResolver)); View xmlView = mock(View.class, "application_xml"); @@ -436,7 +436,7 @@ public class ContentNegotiatingViewResolverTests { public void resolveViewNoMatch() throws Exception { request.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -458,7 +458,7 @@ public class ContentNegotiatingViewResolverTests { viewResolver.setUseNotAcceptableStatusCode(true); request.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); @@ -505,7 +505,7 @@ public class ContentNegotiatingViewResolverTests { public void resolveQualityValue() throws Exception { request.addHeader("Accept", "text/html;q=0.9"); - ViewResolver viewResolverMock = mock(ViewResolver.class); + ViewResolver viewResolverMock = mock(); viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock)); viewResolver.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java index b1f492d0b0..f08a029b1f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java @@ -53,7 +53,7 @@ public class InternalResourceViewTests { private static final String url = "forward-to"; - private final HttpServletRequest request = mock(HttpServletRequest.class); + private final HttpServletRequest request = mock(); private final MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java index 50e0638500..03a43e26c6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java @@ -161,7 +161,7 @@ public class RedirectViewTests { wac.setServletContext(new MockServletContext()); wac.refresh(); - RequestDataValueProcessor mockProcessor = mock(RequestDataValueProcessor.class); + RequestDataValueProcessor mockProcessor = mock(); wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor); RedirectView rv = new RedirectView(); @@ -186,7 +186,7 @@ public class RedirectViewTests { contextLoader.initWebApplicationContext(servletContext); try { - RequestDataValueProcessor mockProcessor = mock(RequestDataValueProcessor.class); + RequestDataValueProcessor mockProcessor = mock(); wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor); RedirectView rv = new RedirectView(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java index 779ae6c0c0..24aefa4677 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java @@ -61,7 +61,7 @@ public class FreeMarkerViewTests { public void noFreeMarkerConfig() throws Exception { FreeMarkerView fv = new FreeMarkerView(); - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); given(wac.getBeansOfType(FreeMarkerConfig.class, true, false)).willReturn(new HashMap<>()); given(wac.getServletContext()).willReturn(new MockServletContext()); @@ -85,7 +85,7 @@ public class FreeMarkerViewTests { public void validTemplateName() throws Exception { FreeMarkerView fv = new FreeMarkerView(); - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); MockServletContext sc = new MockServletContext(); Map configs = new HashMap<>(); @@ -115,7 +115,7 @@ public class FreeMarkerViewTests { public void keepExistingContentType() throws Exception { FreeMarkerView fv = new FreeMarkerView(); - WebApplicationContext wac = mock(WebApplicationContext.class); + WebApplicationContext wac = mock(); MockServletContext sc = new MockServletContext(); Map configs = new HashMap<>(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java index 4e588a5de0..598bc49fab 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java @@ -48,37 +48,35 @@ import static org.mockito.Mockito.mock; /** * @author Brian Clozel */ -public class GroovyMarkupViewTests { +class GroovyMarkupViewTests { private static final String RESOURCE_LOADER_PATH = "classpath*:org/springframework/web/servlet/view/groovy/"; - private WebApplicationContext webAppContext; + private WebApplicationContext webAppContext = mock(); - private ServletContext servletContext; + private ServletContext servletContext = new MockServletContext(); @BeforeEach - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); + void setup() { this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); } @Test - public void missingGroovyMarkupConfig() throws Exception { + void missingGroovyMarkupConfig() throws Exception { GroovyMarkupView view = new GroovyMarkupView(); given(this.webAppContext.getBeansOfType(GroovyMarkupConfig.class, true, false)) .willReturn(new HashMap<>()); view.setUrl("sampleView"); - assertThatExceptionOfType(ApplicationContextException.class).isThrownBy(() -> - view.setApplicationContext(this.webAppContext)) + assertThatExceptionOfType(ApplicationContextException.class) + .isThrownBy(() -> view.setApplicationContext(this.webAppContext)) .withMessageContaining("GroovyMarkupConfig"); } @Test - public void customTemplateEngine() throws Exception { + void customTemplateEngine() throws Exception { GroovyMarkupView view = new GroovyMarkupView(); view.setTemplateEngine(new TestTemplateEngine()); view.setApplicationContext(this.webAppContext); @@ -90,7 +88,7 @@ public class GroovyMarkupViewTests { } @Test - public void detectTemplateEngine() throws Exception { + void detectTemplateEngine() throws Exception { GroovyMarkupView view = new GroovyMarkupView(); view.setTemplateEngine(new TestTemplateEngine()); view.setApplicationContext(this.webAppContext); @@ -102,41 +100,39 @@ public class GroovyMarkupViewTests { } @Test - public void checkResource() throws Exception { + void checkResource() throws Exception { GroovyMarkupView view = createViewWithUrl("test.tpl"); assertThat(view.checkResource(Locale.US)).isTrue(); } @Test - public void checkMissingResource() throws Exception { + void checkMissingResource() throws Exception { GroovyMarkupView view = createViewWithUrl("missing.tpl"); assertThat(view.checkResource(Locale.US)).isFalse(); } @Test - public void checkI18nResource() throws Exception { + void checkI18nResource() throws Exception { GroovyMarkupView view = createViewWithUrl("i18n.tpl"); assertThat(view.checkResource(Locale.FRENCH)).isTrue(); } @Test - public void checkI18nResourceMissingLocale() throws Exception { + void checkI18nResourceMissingLocale() throws Exception { GroovyMarkupView view = createViewWithUrl("i18n.tpl"); assertThat(view.checkResource(Locale.CHINESE)).isTrue(); } @Test - public void renderMarkupTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("name", "Spring"); + void renderMarkupTemplate() throws Exception { + Map model = Map.of("name", "Spring"); MockHttpServletResponse response = renderViewWithModel("test.tpl", model, Locale.US); assertThat(response.getContentAsString()).contains("

Hello Spring

"); } @Test - public void renderI18nTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("name", "Spring"); + void renderI18nTemplate() throws Exception { + Map model = Map.of("name", "Spring"); MockHttpServletResponse response = renderViewWithModel("i18n.tpl", model, Locale.FRANCE); assertThat(response.getContentAsString()).isEqualTo("

Bonjour Spring

"); @@ -148,14 +144,14 @@ public class GroovyMarkupViewTests { } @Test - public void renderLayoutTemplate() throws Exception { - Map model = new HashMap<>(); + void renderLayoutTemplate() throws Exception { + Map model = Map.of(); MockHttpServletResponse response = renderViewWithModel("content.tpl", model, Locale.US); assertThat(response.getContentAsString()).isEqualTo("Layout example

This is the body

"); } - private MockHttpServletResponse renderViewWithModel(String viewUrl, Map model, Locale locale) throws Exception { GroovyMarkupView view = createViewWithUrl(viewUrl); @@ -167,10 +163,8 @@ public class GroovyMarkupViewTests { return response; } - private GroovyMarkupView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(GroovyMarkupConfiguration.class); - ctx.refresh(); + private static GroovyMarkupView createViewWithUrl(String viewUrl) throws Exception { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(GroovyMarkupConfiguration.class); GroovyMarkupView view = new GroovyMarkupView(); view.setUrl(viewUrl); @@ -180,9 +174,9 @@ public class GroovyMarkupViewTests { } - public class TestTemplateEngine extends MarkupTemplateEngine { + static class TestTemplateEngine extends MarkupTemplateEngine { - public TestTemplateEngine() { + TestTemplateEngine() { super(new TemplateConfiguration()); } @@ -197,7 +191,7 @@ public class GroovyMarkupViewTests { static class GroovyMarkupConfiguration { @Bean - public GroovyMarkupConfig groovyMarkupConfigurer() { + GroovyMarkupConfig groovyMarkupConfigurer() { GroovyMarkupConfigurer configurer = new GroovyMarkupConfigurer(); configurer.setResourceLoaderPath(RESOURCE_LOADER_PATH); return configurer; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java index 46854fde99..cd0fd8b10f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java @@ -16,7 +16,6 @@ package org.springframework.web.servlet.view.script; -import java.util.HashMap; import java.util.Map; import jakarta.servlet.ServletContext; @@ -24,6 +23,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -39,44 +39,43 @@ import static org.mockito.Mockito.mock; * Unit tests for ERB templates running on JRuby. * * @author Sebastien Deleuze + * @author Sam Brannen */ @Disabled("JRuby not compatible with JDK 9 yet") -public class JRubyScriptTemplateTests { +class JRubyScriptTemplateTests { - private WebApplicationContext webAppContext; + private WebApplicationContext webAppContext = mock(); - private ServletContext servletContext; + private ServletContext servletContext = new MockServletContext(); @BeforeEach - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); + void setup() { this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); } @Test - public void renderTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); + void renderTemplate() throws Exception { + Map model = Map.of( + "title", "Layout example", + "body", "This is the body" + ); String url = "org/springframework/web/servlet/view/script/jruby/template.erb"; MockHttpServletResponse response = render(url, model); - assertThat(response.getContentAsString()).isEqualTo("Layout example

This is the body

"); + assertThat(response.getContentAsString()) + .isEqualTo("Layout example

This is the body

"); } - private MockHttpServletResponse render(String viewUrl, Map model) throws Exception { + private static MockHttpServletResponse render(String viewUrl, Map model) throws Exception { ScriptTemplateView view = createViewWithUrl(viewUrl); - MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); view.renderMergedOutputModel(model, request, response); return response; } - private ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(ScriptTemplatingConfiguration.class); - ctx.refresh(); + private static ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { + ApplicationContext ctx = new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class); ScriptTemplateView view = new ScriptTemplateView(); view.setApplicationContext(ctx); @@ -90,7 +89,7 @@ public class JRubyScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer jRubyConfigurer() { + ScriptTemplateConfigurer jRubyConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); configurer.setScripts("org/springframework/web/servlet/view/script/jruby/render.rb"); configurer.setEngineName("jruby"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java index 468a5e66d6..30bb423c05 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java @@ -16,13 +16,13 @@ package org.springframework.web.servlet.view.script; -import java.util.HashMap; import java.util.Map; import jakarta.servlet.ServletContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -38,32 +38,33 @@ import static org.mockito.Mockito.mock; * Unit tests for String templates running on Jython. * * @author Sebastien Deleuze + * @author Sam Brannen */ -public class JythonScriptTemplateTests { +class JythonScriptTemplateTests { - private WebApplicationContext webAppContext; + private WebApplicationContext webAppContext = mock(); - private ServletContext servletContext; + private ServletContext servletContext = new MockServletContext(); @BeforeEach - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); + void setup() { this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); } @Test - public void renderTemplate() throws Exception { - Map model = new HashMap<>(); - model.put("title", "Layout example"); - model.put("body", "This is the body"); + void renderTemplate() throws Exception { + Map model = Map.of( + "title", "Layout example", + "body", "This is the body" + ); String url = "org/springframework/web/servlet/view/script/jython/template.html"; MockHttpServletResponse response = render(url, model); - assertThat(response.getContentAsString()).isEqualTo("Layout example

This is the body

"); + assertThat(response.getContentAsString()) + .isEqualTo("Layout example

This is the body

"); } - private MockHttpServletResponse render(String viewUrl, Map model) throws Exception { + private static MockHttpServletResponse render(String viewUrl, Map model) throws Exception { ScriptTemplateView view = createViewWithUrl(viewUrl); MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -71,10 +72,8 @@ public class JythonScriptTemplateTests { return response; } - private ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(ScriptTemplatingConfiguration.class); - ctx.refresh(); + private static ScriptTemplateView createViewWithUrl(String viewUrl) throws Exception { + ApplicationContext ctx = new AnnotationConfigApplicationContext(ScriptTemplatingConfiguration.class); ScriptTemplateView view = new ScriptTemplateView(); view.setApplicationContext(ctx); @@ -88,7 +87,7 @@ public class JythonScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer jythonConfigurer() { + ScriptTemplateConfigurer jythonConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); configurer.setScripts("org/springframework/web/servlet/view/script/jython/render.py"); configurer.setEngineName("jython"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java index 680e188108..f0a6c7b2d1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java @@ -42,24 +42,23 @@ import static org.mockito.Mockito.mock; * Unit tests for Kotlin script templates running on Kotlin JSR-223 support. * * @author Sebastien Deleuze + * @author Sam Brannen */ @DisabledOnJre(value = JRE.JAVA_19, disabledReason = "Kotlin doesn't support Java 19 yet") -public class KotlinScriptTemplateTests { +class KotlinScriptTemplateTests { - private WebApplicationContext webAppContext; + private WebApplicationContext webAppContext = mock(); - private ServletContext servletContext; + private ServletContext servletContext = new MockServletContext(); @BeforeEach - public void setup() { - this.webAppContext = mock(WebApplicationContext.class); - this.servletContext = new MockServletContext(); + void setup() { this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.webAppContext); } @Test - public void renderTemplateWithFrenchLocale() throws Exception { + void renderTemplateWithFrenchLocale() throws Exception { Map model = new HashMap<>(); model.put("foo", "Foo"); String url = "org/springframework/web/servlet/view/script/kotlin/template.kts"; @@ -68,7 +67,7 @@ public class KotlinScriptTemplateTests { } @Test - public void renderTemplateWithEnglishLocale() throws Exception { + void renderTemplateWithEnglishLocale() throws Exception { Map model = new HashMap<>(); model.put("foo", "Foo"); String url = "org/springframework/web/servlet/view/script/kotlin/template.kts"; @@ -77,7 +76,7 @@ public class KotlinScriptTemplateTests { } @Test - public void renderTemplateWithoutRenderFunction() throws Exception { + void renderTemplateWithoutRenderFunction() throws Exception { Map model = new HashMap<>(); model.put("header", ""); model.put("hello", "Hello"); @@ -89,7 +88,7 @@ public class KotlinScriptTemplateTests { } - private MockHttpServletResponse render(String viewUrl, Map model, + private static MockHttpServletResponse render(String viewUrl, Map model, Locale locale, Class configuration) throws Exception { ScriptTemplateView view = createViewWithUrl(viewUrl, configuration); @@ -100,10 +99,8 @@ public class KotlinScriptTemplateTests { return response; } - private ScriptTemplateView createViewWithUrl(String viewUrl, Class configuration) throws Exception { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(configuration); - ctx.refresh(); + private static ScriptTemplateView createViewWithUrl(String viewUrl, Class configuration) throws Exception { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(configuration); ScriptTemplateView view = new ScriptTemplateView(); view.setApplicationContext(ctx); @@ -117,7 +114,7 @@ public class KotlinScriptTemplateTests { static class ScriptTemplatingConfiguration { @Bean - public ScriptTemplateConfigurer kotlinScriptConfigurer() { + ScriptTemplateConfigurer kotlinScriptConfigurer() { ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer(); configurer.setEngineName("kotlin"); configurer.setScripts("org/springframework/web/servlet/view/script/kotlin/render.kts"); @@ -126,7 +123,7 @@ public class KotlinScriptTemplateTests { } @Bean - public ResourceBundleMessageSource messageSource() { + ResourceBundleMessageSource messageSource() { ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource(); messageSource.setBasename("org/springframework/web/servlet/view/script/messages"); return messageSource; @@ -137,7 +134,7 @@ public class KotlinScriptTemplateTests { static class ScriptTemplatingConfigurationWithoutRenderFunction { @Bean - public ScriptTemplateConfigurer kotlinScriptConfigurer() { + ScriptTemplateConfigurer kotlinScriptConfigurer() { return new ScriptTemplateConfigurer("kotlin"); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java index a2394a93f3..aeec1ba8b0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java @@ -24,7 +24,6 @@ import javax.xml.namespace.QName; import javax.xml.transform.stream.StreamResult; import jakarta.xml.bind.JAXBElement; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.oxm.Marshaller; @@ -45,37 +44,30 @@ import static org.mockito.Mockito.verify; * @author Arjen Poutsma * @author Juergen Hoeller */ -public class MarshallingViewTests { +class MarshallingViewTests { - private Marshaller marshallerMock; + private Marshaller marshallerMock = mock(); - private MarshallingView view; - - - @BeforeEach - public void createView() throws Exception { - marshallerMock = mock(Marshaller.class); - view = new MarshallingView(marshallerMock); - } + private MarshallingView view = new MarshallingView(marshallerMock); @Test - public void getContentType() { + void getContentType() { assertThat(view.getContentType()).as("Invalid content type").isEqualTo("application/xml"); } @Test - public void isExposePathVars() { + void isExposePathVars() { assertThat(view.isExposePathVariables()).as("Must not expose path variables").isFalse(); } @Test - public void isExposePathVarsDefaultConstructor() { + void isExposePathVarsDefaultConstructor() { assertThat(new MarshallingView().isExposePathVariables()).as("Must not expose path variables").isFalse(); } @Test - public void renderModelKey() throws Exception { + void renderModelKey() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; view.setModelKey(modelKey); @@ -94,7 +86,7 @@ public class MarshallingViewTests { } @Test - public void renderModelKeyWithJaxbElement() throws Exception { + void renderModelKeyWithJaxbElement() throws Exception { String toBeMarshalled = "value"; String modelKey = "key"; view.setModelKey(modelKey); @@ -113,7 +105,7 @@ public class MarshallingViewTests { } @Test - public void renderInvalidModelKey() throws Exception { + void renderInvalidModelKey() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; view.setModelKey("invalidKey"); @@ -130,7 +122,7 @@ public class MarshallingViewTests { } @Test - public void renderNullModelValue() throws Exception { + void renderNullModelValue() throws Exception { String modelKey = "key"; Map model = new HashMap<>(); model.put(modelKey, null); @@ -145,7 +137,7 @@ public class MarshallingViewTests { } @Test - public void renderModelKeyUnsupported() throws Exception { + void renderModelKeyUnsupported() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; view.setModelKey(modelKey); @@ -162,7 +154,7 @@ public class MarshallingViewTests { } @Test - public void renderNoModelKey() throws Exception { + void renderNoModelKey() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; Map model = new HashMap<>(); @@ -180,7 +172,7 @@ public class MarshallingViewTests { } @Test - public void renderNoModelKeyAndBindingResultFirst() throws Exception { + void renderNoModelKeyAndBindingResultFirst() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; Map model = new LinkedHashMap<>(); @@ -200,7 +192,7 @@ public class MarshallingViewTests { } @Test - public void testRenderUnsupportedModel() throws Exception { + void testRenderUnsupportedModel() throws Exception { Object toBeMarshalled = new Object(); String modelKey = "key"; Map model = new HashMap<>(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java index 84baa9552d..d52d181f34 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java @@ -17,11 +17,8 @@ package org.springframework.web.socket.adapter.jetty; import org.eclipse.jetty.websocket.api.Session; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; @@ -31,46 +28,41 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; /** - * Test fixture for {@link org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter}. + * Tests for {@link JettyWebSocketHandlerAdapter}. * * @author Rossen Stoyanchev */ -public class JettyWebSocketHandlerAdapterTests { +class JettyWebSocketHandlerAdapterTests { - private JettyWebSocketHandlerAdapter adapter; + private Session session = mock(); - private WebSocketHandler webSocketHandler; + private WebSocketHandler webSocketHandler = mock(); - private JettyWebSocketSession webSocketSession; + private JettyWebSocketSession webSocketSession = new JettyWebSocketSession(null, null); - private Session session; + private JettyWebSocketHandlerAdapter adapter = new JettyWebSocketHandlerAdapter(this.webSocketHandler, this.webSocketSession); @BeforeEach - public void setup() { - this.session = mock(Session.class); - given(this.session.getUpgradeRequest()).willReturn(Mockito.mock(UpgradeRequest.class)); - given(this.session.getUpgradeResponse()).willReturn(Mockito.mock(UpgradeResponse.class)); - - this.webSocketHandler = mock(WebSocketHandler.class); - this.webSocketSession = new JettyWebSocketSession(null, null); - this.adapter = new JettyWebSocketHandlerAdapter(this.webSocketHandler, this.webSocketSession); + void setup() { + given(this.session.getUpgradeRequest()).willReturn(mock()); + given(this.session.getUpgradeResponse()).willReturn(mock()); } @Test - public void onOpen() throws Throwable { + void onOpen() throws Exception { this.adapter.onWebSocketConnect(this.session); verify(this.webSocketHandler).afterConnectionEstablished(this.webSocketSession); } @Test - public void onClose() throws Throwable { + void onClose() throws Exception { this.adapter.onWebSocketClose(1000, "reason"); verify(this.webSocketHandler).afterConnectionClosed(this.webSocketSession, CloseStatus.NORMAL.withReason("reason")); } @Test - public void onError() throws Throwable { + void onError() throws Exception { Exception exception = new Exception(); this.adapter.onWebSocketError(exception); verify(this.webSocketHandler).handleTransportError(this.webSocketSession, exception); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java index c717017d65..ed2b0a4b7c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java @@ -16,35 +16,40 @@ package org.springframework.web.socket.adapter.jetty; -import java.util.HashMap; import java.util.Map; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.core.testfixture.security.TestPrincipal; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verifyNoMoreInteractions; /** - * Unit tests for {@link org.springframework.web.socket.adapter.jetty.JettyWebSocketSession}. + * Unit tests for {@link JettyWebSocketSession}. * * @author Rossen Stoyanchev */ -public class JettyWebSocketSessionTests { +class JettyWebSocketSessionTests { - private final Map attributes = new HashMap<>(); + private final Map attributes = Map.of(); + + private final UpgradeRequest request = mock(); + + private final UpgradeResponse response = mock(); + + private final Session nativeSession = mock(); @Test @SuppressWarnings("resource") - public void getPrincipalWithConstructorArg() { + void getPrincipalWithConstructorArg() { TestPrincipal user = new TestPrincipal("joe"); JettyWebSocketSession session = new JettyWebSocketSession(attributes, user); @@ -53,16 +58,13 @@ public class JettyWebSocketSessionTests { @Test @SuppressWarnings("resource") - public void getPrincipalFromNativeSession() { + void getPrincipalFromNativeSession() { TestPrincipal user = new TestPrincipal("joe"); - UpgradeRequest request = Mockito.mock(UpgradeRequest.class); given(request.getUserPrincipal()).willReturn(user); - UpgradeResponse response = Mockito.mock(UpgradeResponse.class); given(response.getAcceptedSubProtocol()).willReturn(null); - Session nativeSession = Mockito.mock(Session.class); given(nativeSession.getUpgradeRequest()).willReturn(request); given(nativeSession.getUpgradeResponse()).willReturn(response); @@ -77,14 +79,11 @@ public class JettyWebSocketSessionTests { @Test @SuppressWarnings("resource") - public void getPrincipalNotAvailable() { - UpgradeRequest request = Mockito.mock(UpgradeRequest.class); + void getPrincipalNotAvailable() { given(request.getUserPrincipal()).willReturn(null); - UpgradeResponse response = Mockito.mock(UpgradeResponse.class); given(response.getAcceptedSubProtocol()).willReturn(null); - Session nativeSession = Mockito.mock(Session.class); given(nativeSession.getUpgradeRequest()).willReturn(request); given(nativeSession.getUpgradeResponse()).willReturn(response); @@ -99,16 +98,13 @@ public class JettyWebSocketSessionTests { @Test @SuppressWarnings("resource") - public void getAcceptedProtocol() { + void getAcceptedProtocol() { String protocol = "foo"; - UpgradeRequest request = Mockito.mock(UpgradeRequest.class); given(request.getUserPrincipal()).willReturn(null); - UpgradeResponse response = Mockito.mock(UpgradeResponse.class); given(response.getAcceptedSubProtocol()).willReturn(protocol); - Session nativeSession = Mockito.mock(Session.class); given(nativeSession.getUpgradeRequest()).willReturn(request); given(nativeSession.getUpgradeResponse()).willReturn(response); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java index a2f3501d12..7dda365c08 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java @@ -22,7 +22,6 @@ import jakarta.websocket.CloseReason; import jakarta.websocket.CloseReason.CloseCodes; import jakarta.websocket.MessageHandler; import jakarta.websocket.Session; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.web.socket.CloseStatus; @@ -36,31 +35,23 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; /** - * Test fixture for {@link org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter}. + * Tests for {@link StandardWebSocketHandlerAdapter}. * * @author Rossen Stoyanchev */ -public class StandardWebSocketHandlerAdapterTests { +class StandardWebSocketHandlerAdapterTests { - private StandardWebSocketHandlerAdapter adapter; + private WebSocketHandler webSocketHandler = mock(); - private WebSocketHandler webSocketHandler; + private Session session = mock(); - private StandardWebSocketSession webSocketSession; + private StandardWebSocketSession webSocketSession = new StandardWebSocketSession(null, null, null, null); - private Session session; + private StandardWebSocketHandlerAdapter adapter = new StandardWebSocketHandlerAdapter(this.webSocketHandler, this.webSocketSession); - @BeforeEach - public void setup() { - this.session = mock(Session.class); - this.webSocketHandler = mock(WebSocketHandler.class); - this.webSocketSession = new StandardWebSocketSession(null, null, null, null); - this.adapter = new StandardWebSocketHandlerAdapter(this.webSocketHandler, this.webSocketSession); - } - @Test - public void onOpen() throws Throwable { + void onOpen() throws Throwable { URI uri = URI.create("https://example.org"); given(this.session.getRequestURI()).willReturn(uri); this.adapter.onOpen(this.session, null); @@ -73,13 +64,13 @@ public class StandardWebSocketHandlerAdapterTests { } @Test - public void onClose() throws Throwable { + void onClose() throws Throwable { this.adapter.onClose(this.session, new CloseReason(CloseCodes.NORMAL_CLOSURE, "reason")); verify(this.webSocketHandler).afterConnectionClosed(this.webSocketSession, CloseStatus.NORMAL.withReason("reason")); } @Test - public void onError() throws Throwable { + void onError() throws Throwable { Exception exception = new Exception(); this.adapter.onError(this.session, exception); verify(this.webSocketHandler).handleTransportError(this.webSocketSession, exception); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java index b40955d222..a2fa71fdf3 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java @@ -21,23 +21,23 @@ import java.util.Map; import jakarta.websocket.Session; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.core.testfixture.security.TestPrincipal; import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verifyNoMoreInteractions; /** - * Unit tests for {@link org.springframework.web.socket.adapter.standard.StandardWebSocketSession}. + * Unit tests for {@link StandardWebSocketSession}. * * @author Rossen Stoyanchev */ @SuppressWarnings("resource") -public class StandardWebSocketSessionTests { +class StandardWebSocketSessionTests { private final HttpHeaders headers = new HttpHeaders(); @@ -46,7 +46,7 @@ public class StandardWebSocketSessionTests { @Test @SuppressWarnings("resource") - public void getPrincipalWithConstructorArg() { + void getPrincipalWithConstructorArg() { TestPrincipal user = new TestPrincipal("joe"); StandardWebSocketSession session = new StandardWebSocketSession(this.headers, this.attributes, null, null, user); @@ -54,10 +54,10 @@ public class StandardWebSocketSessionTests { } @Test - public void getPrincipalWithNativeSession() { + void getPrincipalWithNativeSession() { TestPrincipal user = new TestPrincipal("joe"); - Session nativeSession = Mockito.mock(Session.class); + Session nativeSession = mock(); given(nativeSession.getUserPrincipal()).willReturn(user); StandardWebSocketSession session = new StandardWebSocketSession(this.headers, this.attributes, null, null); @@ -67,8 +67,8 @@ public class StandardWebSocketSessionTests { } @Test - public void getPrincipalNone() { - Session nativeSession = Mockito.mock(Session.class); + void getPrincipalNone() { + Session nativeSession = mock(); given(nativeSession.getUserPrincipal()).willReturn(null); StandardWebSocketSession session = new StandardWebSocketSession(this.headers, this.attributes, null, null); @@ -81,10 +81,10 @@ public class StandardWebSocketSessionTests { } @Test - public void getAcceptedProtocol() { + void getAcceptedProtocol() { String protocol = "foo"; - Session nativeSession = Mockito.mock(Session.class); + Session nativeSession = mock(); given(nativeSession.getNegotiatedSubprotocol()).willReturn(protocol); StandardWebSocketSession session = new StandardWebSocketSession(this.headers, this.attributes, null, null); @@ -97,7 +97,7 @@ public class StandardWebSocketSessionTests { } @Test // gh-29315 - public void addAttributesWithNullKeyOrValue() { + void addAttributesWithNullKeyOrValue() { this.attributes.put(null, "value"); this.attributes.put("key", null); this.attributes.put("foo", "bar"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java index 94a682e86a..d23dd6f111 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java @@ -51,7 +51,7 @@ class StandardWebSocketClientTests { private final WebSocketHttpHeaders headers = new WebSocketHttpHeaders(); - private final WebSocketContainer wsContainer = mock(WebSocketContainer.class); + private final WebSocketContainer wsContainer = mock(); private final StandardWebSocketClient wsClient = new StandardWebSocketClient(this.wsContainer); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java index 324dc4942d..e2a24dc007 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java @@ -60,7 +60,7 @@ class WebSocketMessageBrokerStatsTests { @Test void inboundAndOutboundChannelsWithMockedTaskExecutor() { - TaskExecutor executor = mock(TaskExecutor.class); + TaskExecutor executor = mock(); stats.setInboundChannelExecutor(executor); stats.setOutboundChannelExecutor(executor); @@ -82,7 +82,7 @@ class WebSocketMessageBrokerStatsTests { @Test void sockJsTaskSchedulerWithMockedTaskScheduler() { - TaskScheduler scheduler = mock(TaskScheduler.class); + TaskScheduler scheduler = mock(); stats.setSockJsTaskScheduler(scheduler); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java index f29d6d38b4..dc3f38fa81 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java @@ -48,12 +48,12 @@ public class WebMvcStompEndpointRegistryTests { @BeforeEach public void setup() { - SubscribableChannel inChannel = mock(SubscribableChannel.class); - SubscribableChannel outChannel = mock(SubscribableChannel.class); + SubscribableChannel inChannel = mock(); + SubscribableChannel outChannel = mock(); this.webSocketHandler = new SubProtocolWebSocketHandler(inChannel, outChannel); WebSocketTransportRegistration transport = new WebSocketTransportRegistration(); - TaskScheduler scheduler = mock(TaskScheduler.class); + TaskScheduler scheduler = mock(); this.endpointRegistry = new WebMvcStompEndpointRegistry(this.webSocketHandler, transport, scheduler); } @@ -91,7 +91,7 @@ public class WebMvcStompEndpointRegistryTests { @Test public void errorHandler() throws Exception { - StompSubProtocolErrorHandler errorHandler = mock(StompSubProtocolErrorHandler.class); + StompSubProtocolErrorHandler errorHandler = mock(); this.endpointRegistry.setErrorHandler(errorHandler); this.endpointRegistry.addEndpoint("/stompOverWebSocket"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java index 5e343483ee..aa6682bce3 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java @@ -21,8 +21,6 @@ import java.util.Map; import org.junit.jupiter.api.Test; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.SubscribableChannel; import org.springframework.scheduling.TaskScheduler; import org.springframework.util.MultiValueMap; import org.springframework.web.HttpRequestHandler; @@ -41,17 +39,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** - * Test fixture for - * {@link org.springframework.web.socket.config.annotation.WebMvcStompWebSocketEndpointRegistration}. + * Tests for {@link WebMvcStompWebSocketEndpointRegistration}. * * @author Rossen Stoyanchev */ class WebMvcStompWebSocketEndpointRegistrationTests { - private final SubProtocolWebSocketHandler handler = - new SubProtocolWebSocketHandler(mock(MessageChannel.class), mock(SubscribableChannel.class)); + private final SubProtocolWebSocketHandler handler = new SubProtocolWebSocketHandler(mock(), mock()); - private final TaskScheduler scheduler = mock(TaskScheduler.class); + private final TaskScheduler scheduler = mock(); @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java index 21c64d2b2f..8fba957782 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java @@ -46,7 +46,7 @@ public class WebSocketHandlerRegistrationTests { private TestWebSocketHandlerRegistration registration = new TestWebSocketHandlerRegistration(); - private TaskScheduler taskScheduler = mock(TaskScheduler.class); + private TaskScheduler taskScheduler = mock(); @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java index c56ae0f5c5..fa836cf531 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java @@ -44,7 +44,6 @@ import org.springframework.messaging.support.AbstractSubscribableChannel; import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.ExecutorSubscribableChannel; import org.springframework.messaging.support.ImmutableMessageChannelInterceptor; -import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.stereotype.Controller; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; @@ -239,7 +238,7 @@ class WebSocketMessageBrokerConfigurationSupportTests { @Override public void configureMessageBroker(MessageBrokerRegistry registry) { registry.enableSimpleBroker() - .setTaskScheduler(mock(TaskScheduler.class)) + .setTaskScheduler(mock()) .setHeartbeatValue(new long[] {15000, 15000}); } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecoratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecoratorTests.java index 0001722a13..dda1b809ed 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecoratorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecoratorTests.java @@ -16,7 +16,6 @@ package org.springframework.web.socket.handler; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.web.socket.CloseStatus; @@ -32,28 +31,17 @@ import static org.mockito.Mockito.mock; * * @author Rossen Stoyanchev */ -public class ExceptionWebSocketHandlerDecoratorTests { +class ExceptionWebSocketHandlerDecoratorTests { - private TestWebSocketSession session; + private TestWebSocketSession session = new TestWebSocketSession(true); - private ExceptionWebSocketHandlerDecorator decorator; + private WebSocketHandler delegate = mock(); - private WebSocketHandler delegate; + private ExceptionWebSocketHandlerDecorator decorator = new ExceptionWebSocketHandlerDecorator(this.delegate); - @BeforeEach - public void setup() { - - this.delegate = mock(WebSocketHandler.class); - this.decorator = new ExceptionWebSocketHandlerDecorator(this.delegate); - - this.session = new TestWebSocketSession(); - this.session.setOpen(true); - } - @Test - public void afterConnectionEstablished() throws Exception { - + void afterConnectionEstablished() throws Exception { willThrow(new IllegalStateException("error")) .given(this.delegate).afterConnectionEstablished(this.session); @@ -63,8 +51,7 @@ public class ExceptionWebSocketHandlerDecoratorTests { } @Test - public void handleMessage() throws Exception { - + void handleMessage() throws Exception { TextMessage message = new TextMessage("payload"); willThrow(new IllegalStateException("error")) @@ -76,8 +63,7 @@ public class ExceptionWebSocketHandlerDecoratorTests { } @Test - public void handleTransportError() throws Exception { - + void handleTransportError() throws Exception { Exception exception = new Exception("transport error"); willThrow(new IllegalStateException("error")) @@ -89,8 +75,7 @@ public class ExceptionWebSocketHandlerDecoratorTests { } @Test - public void afterConnectionClosed() throws Exception { - + void afterConnectionClosed() throws Exception { CloseStatus closeStatus = CloseStatus.NORMAL; willThrow(new IllegalStateException("error")) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java index cff8952651..0692a0b5dd 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java @@ -69,6 +69,10 @@ public class TestWebSocketSession implements WebSocketSession { this.id = id; } + public TestWebSocketSession(boolean open) { + this.open = open; + } + @Override public String getId() { return this.id; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index 40edce46f0..13dc2f5c81 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; @@ -70,34 +69,30 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; /** - * Test fixture for {@link StompSubProtocolHandler} tests. + * Tests for {@link StompSubProtocolHandler}. + * * @author Rossen Stoyanchev */ -public class StompSubProtocolHandlerTests { +class StompSubProtocolHandlerTests { private static final byte[] EMPTY_PAYLOAD = new byte[0]; - private StompSubProtocolHandler protocolHandler; + private StompSubProtocolHandler protocolHandler = new StompSubProtocolHandler(); - private TestWebSocketSession session; + private TestWebSocketSession session = new TestWebSocketSession(); - private MessageChannel channel; + private MessageChannel channel = mock(); @SuppressWarnings("rawtypes") - private ArgumentCaptor messageCaptor; + private ArgumentCaptor messageCaptor = ArgumentCaptor.forClass(Message.class); @BeforeEach void setup() { - this.protocolHandler = new StompSubProtocolHandler(); - this.channel = Mockito.mock(MessageChannel.class); - this.messageCaptor = ArgumentCaptor.forClass(Message.class); - - given(this.channel.send(any())).willReturn(true); - - this.session = new TestWebSocketSession(); this.session.setId("s1"); this.session.setPrincipal(new TestPrincipal("joe")); + + given(this.channel.send(any())).willReturn(true); } @Test @@ -234,7 +229,7 @@ public class StompSubProtocolHandlerTests { @Test void handleMessageToClientWithHeartbeatSuppressingSockJsHeartbeat() throws IOException { - SockJsSession sockJsSession = Mockito.mock(SockJsSession.class); + SockJsSession sockJsSession = mock(); given(sockJsSession.getId()).willReturn("s1"); StompHeaderAccessor accessor = StompHeaderAccessor.create(StompCommand.CONNECTED); accessor.setHeartbeat(0, 10); @@ -247,7 +242,7 @@ public class StompSubProtocolHandlerTests { verify(sockJsSession).sendMessage(any(WebSocketMessage.class)); verifyNoMoreInteractions(sockJsSession); - sockJsSession = Mockito.mock(SockJsSession.class); + sockJsSession = mock(); given(sockJsSession.getId()).willReturn("s1"); accessor = StompHeaderAccessor.create(StompCommand.CONNECTED); accessor.setHeartbeat(0, 0); @@ -463,7 +458,7 @@ public class StompSubProtocolHandlerTests { @Test void eventPublicationWithExceptions() { - ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class); + ApplicationEventPublisher publisher = mock(); this.protocolHandler.setApplicationEventPublisher(publisher); this.protocolHandler.afterSessionStarted(this.session, this.channel); @@ -504,7 +499,7 @@ public class StompSubProtocolHandlerTests { @Test void webSocketScope() { - Runnable runnable = Mockito.mock(Runnable.class); + Runnable runnable = mock(); SimpAttributes simpAttributes = new SimpAttributes(this.session.getId(), this.session.getAttributes()); simpAttributes.setAttribute("name", "value"); simpAttributes.registerDestructionCallback("name", runnable); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketAnnotationMethodMessageHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketAnnotationMethodMessageHandlerTests.java index 84eaf35146..15ebd54742 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketAnnotationMethodMessageHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketAnnotationMethodMessageHandlerTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.context.support.StaticApplicationContext; import org.springframework.messaging.Message; @@ -36,9 +35,11 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ControllerAdvice; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * Unit tests for {@link WebSocketAnnotationMethodMessageHandler}. + * * @author Rossen Stoyanchev */ public class WebSocketAnnotationMethodMessageHandlerTests { @@ -55,7 +56,7 @@ public class WebSocketAnnotationMethodMessageHandlerTests { this.applicationContext.registerSingleton("controllerAdvice", TestControllerAdvice.class); this.applicationContext.refresh(); - SubscribableChannel channel = Mockito.mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); SimpMessageSendingOperations brokerTemplate = new SimpMessagingTemplate(channel); this.messageHandler = new TestWebSocketAnnotationMethodMessageHandler(brokerTemplate, channel, channel); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java index 5abe874d08..faab7847b9 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java @@ -67,7 +67,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Rossen Stoyanchev */ @MockitoSettings(strictness = Strictness.LENIENT) -public class WebSocketStompClientTests { +class WebSocketStompClientTests { @Mock private TaskScheduler taskScheduler; @@ -86,8 +86,8 @@ public class WebSocketStompClientTests { @BeforeEach - public void setUp() throws Exception { - WebSocketClient webSocketClient = mock(WebSocketClient.class); + void setUp() throws Exception { + WebSocketClient webSocketClient = mock(); this.stompClient = new TestWebSocketStompClient(webSocketClient); this.stompClient.setTaskScheduler(this.taskScheduler); this.stompClient.setStompSession(this.stompSession); @@ -100,7 +100,7 @@ public class WebSocketStompClientTests { @Test - public void webSocketHandshakeFailure() throws Exception { + void webSocketHandshakeFailure() throws Exception { connect(); IllegalStateException handshakeFailure = new IllegalStateException("simulated exception"); @@ -110,13 +110,13 @@ public class WebSocketStompClientTests { } @Test - public void webSocketConnectionEstablished() throws Exception { + void webSocketConnectionEstablished() throws Exception { connect().afterConnectionEstablished(this.webSocketSession); verify(this.stompSession).afterConnected(notNull()); } @Test - public void webSocketTransportError() throws Exception { + void webSocketTransportError() throws Exception { IllegalStateException exception = new IllegalStateException("simulated exception"); connect().handleTransportError(this.webSocketSession, exception); @@ -124,14 +124,14 @@ public class WebSocketStompClientTests { } @Test - public void webSocketConnectionClosed() throws Exception { + void webSocketConnectionClosed() throws Exception { connect().afterConnectionClosed(this.webSocketSession, CloseStatus.NORMAL); verify(this.stompSession).afterConnectionClosed(); } @Test @SuppressWarnings({"unchecked", "rawtypes"}) - public void handleWebSocketMessage() throws Exception { + void handleWebSocketMessage() throws Exception { String text = "SEND\na:alpha\n\nMessage payload\0"; connect().handleMessage(this.webSocketSession, new TextMessage(text)); @@ -149,7 +149,7 @@ public class WebSocketStompClientTests { @Test @SuppressWarnings({"unchecked", "rawtypes"}) - public void handleWebSocketMessageSplitAcrossTwoMessage() throws Exception { + void handleWebSocketMessageSplitAcrossTwoMessage() throws Exception { WebSocketHandler webSocketHandler = connect(); String part1 = "SEND\na:alpha\n\nMessage"; @@ -174,7 +174,7 @@ public class WebSocketStompClientTests { @Test @SuppressWarnings({"unchecked", "rawtypes"}) - public void handleWebSocketMessageBinary() throws Exception { + void handleWebSocketMessageBinary() throws Exception { String text = "SEND\na:alpha\n\nMessage payload\0"; connect().handleMessage(this.webSocketSession, new BinaryMessage(text.getBytes(StandardCharsets.UTF_8))); @@ -191,13 +191,13 @@ public class WebSocketStompClientTests { } @Test - public void handleWebSocketMessagePong() throws Exception { + void handleWebSocketMessagePong() throws Exception { connect().handleMessage(this.webSocketSession, new PongMessage()); verifyNoMoreInteractions(this.stompSession); } @Test - public void sendWebSocketMessage() throws Exception { + void sendWebSocketMessage() throws Exception { StompHeaderAccessor accessor = StompHeaderAccessor.create(StompCommand.SEND); accessor.setDestination("/topic/foo"); byte[] payload = "payload".getBytes(StandardCharsets.UTF_8); @@ -212,7 +212,7 @@ public class WebSocketStompClientTests { } @Test - public void sendWebSocketBinary() throws Exception { + void sendWebSocketBinary() throws Exception { StompHeaderAccessor accessor = StompHeaderAccessor.create(StompCommand.SEND); accessor.setDestination("/b"); accessor.setContentType(MimeTypeUtils.APPLICATION_OCTET_STREAM); @@ -224,12 +224,13 @@ public class WebSocketStompClientTests { verify(this.webSocketSession).sendMessage(binaryMessageCaptor.capture()); BinaryMessage binaryMessage = binaryMessageCaptor.getValue(); assertThat(binaryMessage).isNotNull(); - assertThat(new String(binaryMessage.getPayload().array(), StandardCharsets.UTF_8)).isEqualTo("SEND\ndestination:/b\ncontent-type:application/octet-stream\ncontent-length:7\n\npayload\0"); + assertThat(new String(binaryMessage.getPayload().array(), StandardCharsets.UTF_8)) + .isEqualTo("SEND\ndestination:/b\ncontent-type:application/octet-stream\ncontent-length:7\n\npayload\0"); } @Test - public void heartbeatDefaultValue() throws Exception { - WebSocketStompClient stompClient = new WebSocketStompClient(mock(WebSocketClient.class)); + void heartbeatDefaultValue() throws Exception { + WebSocketStompClient stompClient = new WebSocketStompClient(mock()); assertThat(stompClient.getDefaultHeartbeat()).isEqualTo(new long[] {0, 0}); StompHeaders connectHeaders = stompClient.processConnectHeaders(null); @@ -237,9 +238,9 @@ public class WebSocketStompClientTests { } @Test - public void heartbeatDefaultValueWithScheduler() throws Exception { - WebSocketStompClient stompClient = new WebSocketStompClient(mock(WebSocketClient.class)); - stompClient.setTaskScheduler(mock(TaskScheduler.class)); + void heartbeatDefaultValueWithScheduler() throws Exception { + WebSocketStompClient stompClient = new WebSocketStompClient(mock()); + stompClient.setTaskScheduler(mock()); assertThat(stompClient.getDefaultHeartbeat()).isEqualTo(new long[] {10000, 10000}); StompHeaders connectHeaders = stompClient.processConnectHeaders(null); @@ -247,44 +248,44 @@ public class WebSocketStompClientTests { } @Test - public void heartbeatDefaultValueSetWithoutScheduler() throws Exception { - WebSocketStompClient stompClient = new WebSocketStompClient(mock(WebSocketClient.class)); + void heartbeatDefaultValueSetWithoutScheduler() throws Exception { + WebSocketStompClient stompClient = new WebSocketStompClient(mock()); stompClient.setDefaultHeartbeat(new long[] {5, 5}); assertThatIllegalStateException().isThrownBy(() -> stompClient.processConnectHeaders(null)); } @Test - public void readInactivityAfterDelayHasElapsed() throws Exception { + void readInactivityAfterDelayHasElapsed() throws Exception { TcpConnection tcpConnection = getTcpConnection(); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); long delay = 2; tcpConnection.onReadInactivity(runnable, delay); testInactivityTaskScheduling(runnable, delay, 10); } @Test - public void readInactivityBeforeDelayHasElapsed() throws Exception { + void readInactivityBeforeDelayHasElapsed() throws Exception { TcpConnection tcpConnection = getTcpConnection(); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); long delay = 10000; tcpConnection.onReadInactivity(runnable, delay); testInactivityTaskScheduling(runnable, delay, 0); } @Test - public void writeInactivityAfterDelayHasElapsed() throws Exception { + void writeInactivityAfterDelayHasElapsed() throws Exception { TcpConnection tcpConnection = getTcpConnection(); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); long delay = 2; tcpConnection.onWriteInactivity(runnable, delay); testInactivityTaskScheduling(runnable, delay, 10); } @Test - public void writeInactivityBeforeDelayHasElapsed() throws Exception { + void writeInactivityBeforeDelayHasElapsed() throws Exception { TcpConnection tcpConnection = getTcpConnection(); - Runnable runnable = mock(Runnable.class); + Runnable runnable = mock(); long delay = 1000; tcpConnection.onWriteInactivity(runnable, delay); testInactivityTaskScheduling(runnable, delay, 0); @@ -292,14 +293,14 @@ public class WebSocketStompClientTests { @Test @SuppressWarnings({"rawtypes", "unchecked"}) - public void cancelInactivityTasks() throws Exception { + void cancelInactivityTasks() throws Exception { TcpConnection tcpConnection = getTcpConnection(); - ScheduledFuture future = mock(ScheduledFuture.class); + ScheduledFuture future = mock(); given(this.taskScheduler.scheduleWithFixedDelay(any(), eq(Duration.ofMillis(1)))).willReturn(future); - tcpConnection.onReadInactivity(mock(Runnable.class), 2L); - tcpConnection.onWriteInactivity(mock(Runnable.class), 2L); + tcpConnection.onReadInactivity(mock(), 2L); + tcpConnection.onWriteInactivity(mock(), 2L); this.webSocketHandlerCaptor.getValue().afterConnectionClosed(this.webSocketSession, CloseStatus.NORMAL); @@ -309,7 +310,7 @@ public class WebSocketStompClientTests { private WebSocketHandler connect() { - this.stompClient.connectAsync("/foo", mock(StompSessionHandler.class)); + this.stompClient.connectAsync("/foo", mock()); verify(this.stompSession).getSession(); verifyNoMoreInteractions(this.stompSession); @@ -323,8 +324,8 @@ public class WebSocketStompClientTests { private TcpConnection getTcpConnection() throws Exception { WebSocketHandler handler = connect(); handler.afterConnectionEstablished(this.webSocketSession); - if (handler instanceof WebSocketHandlerDecorator) { - handler = ((WebSocketHandlerDecorator) handler).getLastHandler(); + if (handler instanceof WebSocketHandlerDecorator handlerDecorator) { + handler = handlerDecorator.getLastHandler(); } return (TcpConnection) handler; } @@ -357,11 +358,11 @@ public class WebSocketStompClientTests { private ConnectionHandlingStompSession stompSession; - public TestWebSocketStompClient(WebSocketClient webSocketClient) { + TestWebSocketStompClient(WebSocketClient webSocketClient) { super(webSocketClient); } - public void setStompSession(ConnectionHandlingStompSession stompSession) { + void setStompSession(ConnectionHandlingStompSession stompSession) { this.stompSession = stompSession; } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java index c8a4868bdc..ac13605045 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.verify; */ public class DefaultHandshakeHandlerTests extends AbstractHttpRequestTests { - private RequestUpgradeStrategy upgradeStrategy = mock(RequestUpgradeStrategy.class); + private RequestUpgradeStrategy upgradeStrategy = mock(); private DefaultHandshakeHandler handshakeHandler = new DefaultHandshakeHandler(this.upgradeStrategy); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java index f170340f69..9123d913a9 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java @@ -34,40 +34,35 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; /** - * Test fixture for {@link ServerEndpointExporter}. + * Tests for {@link ServerEndpointExporter}. * * @author Rossen Stoyanchev * @author Juergen Hoeller */ -public class ServerEndpointExporterTests { +class ServerEndpointExporterTests { - private ServerContainer serverContainer; + private ServerContainer serverContainer = mock(); - private ServletContext servletContext; + private ServletContext servletContext = new MockServletContext(); + + private ServerEndpointExporter exporter = new ServerEndpointExporter(); private AnnotationConfigWebApplicationContext webAppContext; - private ServerEndpointExporter exporter; - @BeforeEach - public void setup() { - this.serverContainer = mock(ServerContainer.class); - - this.servletContext = new MockServletContext(); + void setup() { this.servletContext.setAttribute("jakarta.websocket.server.ServerContainer", this.serverContainer); this.webAppContext = new AnnotationConfigWebApplicationContext(); this.webAppContext.register(Config.class); this.webAppContext.setServletContext(this.servletContext); this.webAppContext.refresh(); - - this.exporter = new ServerEndpointExporter(); } @Test - public void addAnnotatedEndpointClasses() throws Exception { + void addAnnotatedEndpointClasses() throws Exception { this.exporter.setAnnotatedEndpointClasses(AnnotatedDummyEndpoint.class); this.exporter.setApplicationContext(this.webAppContext); this.exporter.afterPropertiesSet(); @@ -78,7 +73,7 @@ public class ServerEndpointExporterTests { } @Test - public void addAnnotatedEndpointClassesWithServletContextOnly() throws Exception { + void addAnnotatedEndpointClassesWithServletContextOnly() throws Exception { this.exporter.setAnnotatedEndpointClasses(AnnotatedDummyEndpoint.class, AnnotatedDummyEndpointBean.class); this.exporter.setServletContext(this.servletContext); this.exporter.afterPropertiesSet(); @@ -89,7 +84,7 @@ public class ServerEndpointExporterTests { } @Test - public void addAnnotatedEndpointClassesWithExplicitServerContainerOnly() throws Exception { + void addAnnotatedEndpointClassesWithExplicitServerContainerOnly() throws Exception { this.exporter.setAnnotatedEndpointClasses(AnnotatedDummyEndpoint.class, AnnotatedDummyEndpointBean.class); this.exporter.setServerContainer(this.serverContainer); this.exporter.afterPropertiesSet(); @@ -100,7 +95,7 @@ public class ServerEndpointExporterTests { } @Test - public void addServerEndpointConfigBean() throws Exception { + void addServerEndpointConfigBean() throws Exception { ServerEndpointRegistration endpointRegistration = new ServerEndpointRegistration("/dummy", new DummyEndpoint()); this.webAppContext.getBeanFactory().registerSingleton("dummyEndpoint", endpointRegistration); @@ -112,7 +107,7 @@ public class ServerEndpointExporterTests { } @Test - public void addServerEndpointConfigBeanWithExplicitServletContext() throws Exception { + void addServerEndpointConfigBeanWithExplicitServletContext() throws Exception { ServerEndpointRegistration endpointRegistration = new ServerEndpointRegistration("/dummy", new DummyEndpoint()); this.webAppContext.getBeanFactory().registerSingleton("dummyEndpoint", endpointRegistration); @@ -125,7 +120,7 @@ public class ServerEndpointExporterTests { } @Test - public void addServerEndpointConfigBeanWithExplicitServerContainer() throws Exception { + void addServerEndpointConfigBeanWithExplicitServerContainer() throws Exception { ServerEndpointRegistration endpointRegistration = new ServerEndpointRegistration("/dummy", new DummyEndpoint()); this.webAppContext.getBeanFactory().registerSingleton("dummyEndpoint", endpointRegistration); this.servletContext.removeAttribute("jakarta.websocket.server.ServerContainer"); @@ -161,7 +156,7 @@ public class ServerEndpointExporterTests { static class Config { @Bean - public AnnotatedDummyEndpointBean annotatedEndpoint1() { + AnnotatedDummyEndpointBean annotatedEndpoint1() { return new AnnotatedDummyEndpointBean(); } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java index aa8f29a6d7..622196446a 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java @@ -16,12 +16,10 @@ package org.springframework.web.socket.server.support; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.web.socket.AbstractHttpRequestTests; @@ -34,46 +32,30 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; /** - * Test fixture for {@link HandshakeInterceptorChain}. + * Tests for {@link HandshakeInterceptorChain}. * * @author Rossen Stoyanchev + * @author Sam Brannen */ -public class HandshakeInterceptorChainTests extends AbstractHttpRequestTests { +class HandshakeInterceptorChainTests extends AbstractHttpRequestTests { - private HandshakeInterceptor i1; + private Map attributes = new HashMap<>(); - private HandshakeInterceptor i2; + private HandshakeInterceptor i1 = mock(); + private HandshakeInterceptor i2 = mock(); + private HandshakeInterceptor i3 = mock(); - private HandshakeInterceptor i3; + private WebSocketHandler wsHandler = mock(); - private List interceptors; - - private WebSocketHandler wsHandler; - - private Map attributes; - - - @Override - @BeforeEach - public void setup() { - super.setup(); - - i1 = mock(HandshakeInterceptor.class); - i2 = mock(HandshakeInterceptor.class); - i3 = mock(HandshakeInterceptor.class); - interceptors = Arrays.asList(i1, i2, i3); - wsHandler = mock(WebSocketHandler.class); - attributes = new HashMap<>(); - } + private HandshakeInterceptorChain chain = new HandshakeInterceptorChain(List.of(i1, i2, i3), wsHandler); @Test - public void success() throws Exception { + void success() throws Exception { given(i1.beforeHandshake(request, response, wsHandler, attributes)).willReturn(true); given(i2.beforeHandshake(request, response, wsHandler, attributes)).willReturn(true); given(i3.beforeHandshake(request, response, wsHandler, attributes)).willReturn(true); - HandshakeInterceptorChain chain = new HandshakeInterceptorChain(interceptors, wsHandler); chain.applyBeforeHandshake(request, response, attributes); verify(i1).beforeHandshake(request, response, wsHandler, attributes); @@ -83,11 +65,10 @@ public class HandshakeInterceptorChainTests extends AbstractHttpRequestTests { } @Test - public void applyBeforeHandshakeWithFalseReturnValue() throws Exception { + void applyBeforeHandshakeWithFalseReturnValue() throws Exception { given(i1.beforeHandshake(request, response, wsHandler, attributes)).willReturn(true); given(i2.beforeHandshake(request, response, wsHandler, attributes)).willReturn(false); - HandshakeInterceptorChain chain = new HandshakeInterceptorChain(interceptors, wsHandler); chain.applyBeforeHandshake(request, response, attributes); verify(i1).beforeHandshake(request, response, wsHandler, attributes); @@ -97,8 +78,7 @@ public class HandshakeInterceptorChainTests extends AbstractHttpRequestTests { } @Test - public void applyAfterHandshakeOnly() { - HandshakeInterceptorChain chain = new HandshakeInterceptorChain(interceptors, wsHandler); + void applyAfterHandshakeOnly() { chain.applyAfterHandshake(request, response, null); verifyNoMoreInteractions(i1, i2, i3); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java index 371da633cd..debcebcefa 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTests { private final Map attributes = new HashMap<>(); - private final WebSocketHandler wsHandler = mock(WebSocketHandler.class); + private final WebSocketHandler wsHandler = mock(); @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java index f7af50cc39..b32c02e802 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { private final Map attributes = new HashMap<>(); - private final WebSocketHandler wsHandler = mock(WebSocketHandler.class); + private final WebSocketHandler wsHandler = mock(); @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java index 30e9aab5be..d665c5dbd1 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test; import org.springframework.web.HttpRequestHandler; import org.springframework.web.context.support.StaticWebApplicationContext; import org.springframework.web.servlet.HandlerExecutionChain; -import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -34,12 +33,11 @@ import static org.mockito.Mockito.mock; * * @author Rossen Stoyanchev */ -public class WebSocketHandlerMappingTests { - +class WebSocketHandlerMappingTests { @Test void webSocketHandshakeMatch() throws Exception { - HttpRequestHandler handler = new WebSocketHttpRequestHandler(mock(WebSocketHandler.class)); + HttpRequestHandler handler = new WebSocketHttpRequestHandler(mock()); WebSocketHandlerMapping mapping = new WebSocketHandlerMapping(); mapping.setUrlMap(Collections.singletonMap("/path", handler)); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java index 618e0441a9..bb9c64e0d5 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java @@ -46,17 +46,17 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Rossen Stoyanchev * @since 5.1.9 */ -public class WebSocketHttpRequestHandlerTests { +class WebSocketHttpRequestHandlerTests { - private final HandshakeHandler handshakeHandler = mock(HandshakeHandler.class); + private final HandshakeHandler handshakeHandler = mock(); - private final WebSocketHttpRequestHandler requestHandler = new WebSocketHttpRequestHandler(mock(WebSocketHandler.class), this.handshakeHandler); + private final WebSocketHttpRequestHandler requestHandler = new WebSocketHttpRequestHandler(mock(), this.handshakeHandler); private final MockHttpServletResponse response = new MockHttpServletResponse(); @Test - public void success() throws ServletException, IOException { + void success() throws ServletException, IOException { TestInterceptor interceptor = new TestInterceptor(true); this.requestHandler.setHandshakeInterceptors(Collections.singletonList(interceptor)); this.requestHandler.handleRequest(new MockHttpServletRequest(), this.response); @@ -66,7 +66,7 @@ public class WebSocketHttpRequestHandlerTests { } @Test - public void failure() { + void failure() { TestInterceptor interceptor = new TestInterceptor(true); this.requestHandler.setHandshakeInterceptors(Collections.singletonList(interceptor)); @@ -83,7 +83,7 @@ public class WebSocketHttpRequestHandlerTests { } @Test // gh-23179 - public void handshakeNotAllowed() throws ServletException, IOException { + void handshakeNotAllowed() throws ServletException, IOException { TestInterceptor interceptor = new TestInterceptor(false); this.requestHandler.setHandshakeInterceptors(Collections.singletonList(interceptor)); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java index db91f067d4..8af363c650 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java @@ -43,8 +43,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; /** - * Unit tests for - * {@link org.springframework.web.socket.sockjs.client.AbstractClientSockJsSession}. + * Unit tests for {@link AbstractClientSockJsSession}. * * @author Rossen Stoyanchev */ @@ -52,20 +51,18 @@ class ClientSockJsSessionTests { private static final Jackson2SockJsMessageCodec CODEC = new Jackson2SockJsMessageCodec(); + private WebSocketHandler handler = mock(); + + private CompletableFuture connectFuture = new CompletableFuture<>(); + private TestClientSockJsSession session; - private WebSocketHandler handler; - - private CompletableFuture connectFuture; - @BeforeEach void setup() { SockJsUrlInfo urlInfo = new SockJsUrlInfo(URI.create("https://example.com")); - Transport transport = mock(Transport.class); + Transport transport = mock(); TransportRequest request = new DefaultTransportRequest(urlInfo, null, null, transport, TransportType.XHR, CODEC); - this.handler = mock(WebSocketHandler.class); - this.connectFuture = new CompletableFuture<>(); this.session = new TestClientSockJsSession(request, this.handler, this.connectFuture); } @@ -188,16 +185,16 @@ class ClientSockJsSessionTests { @Test void closeWithNullStatus() throws Exception { this.session.handleFrame(SockJsFrame.openFrame().getContent()); - assertThatIllegalArgumentException().isThrownBy(() -> - this.session.close(null)) + assertThatIllegalArgumentException() + .isThrownBy(() -> this.session.close(null)) .withMessageContaining("Invalid close status"); } @Test void closeWithStatusOutOfRange() throws Exception { this.session.handleFrame(SockJsFrame.openFrame().getContent()); - assertThatIllegalArgumentException().isThrownBy(() -> - this.session.close(new CloseStatus(2999, "reason"))) + assertThatIllegalArgumentException() + .isThrownBy(() -> this.session.close(new CloseStatus(2999, "reason"))) .withMessageContaining("Invalid close status"); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequestTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequestTests.java index 4172bf55e0..d8f978c228 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequestTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequestTests.java @@ -49,23 +49,19 @@ class DefaultTransportRequestTests { private final Jackson2SockJsMessageCodec CODEC = new Jackson2SockJsMessageCodec(); - private CompletableFuture connectFuture; - - private BiConsumer connectCallback; - - private TestTransport webSocketTransport; - - private TestTransport xhrTransport; - + private CompletableFuture connectFuture = new CompletableFuture<>(); @SuppressWarnings("unchecked") + private BiConsumer connectCallback = mock(); + + private TestTransport webSocketTransport = new TestTransport("WebSocketTestTransport"); + + private TestTransport xhrTransport = new TestTransport("XhrTestTransport"); + + @BeforeEach void setup() { - this.connectCallback = mock(BiConsumer.class); - this.connectFuture = new CompletableFuture<>(); this.connectFuture.whenComplete(this.connectCallback); - this.webSocketTransport = new TestTransport("WebSocketTestTransport"); - this.xhrTransport = new TestTransport("XhrTestTransport"); } @@ -73,7 +69,7 @@ class DefaultTransportRequestTests { void connect() throws Exception { DefaultTransportRequest request = createTransportRequest(this.webSocketTransport, TransportType.WEBSOCKET); request.connect(null, this.connectFuture); - WebSocketSession session = mock(WebSocketSession.class); + WebSocketSession session = mock(); this.webSocketTransport.getConnectCallback().accept(session, null); assertThat(this.connectFuture.get()).isSameAs(session); } @@ -93,15 +89,15 @@ class DefaultTransportRequestTests { // Transport error => no more fallback this.xhrTransport.getConnectCallback().accept(null, new IOException("Fake exception 2")); assertThat(this.connectFuture.isDone()).isTrue(); - assertThatExceptionOfType(ExecutionException.class).isThrownBy( - this.connectFuture::get) + assertThatExceptionOfType(ExecutionException.class) + .isThrownBy(this.connectFuture::get) .withMessageContaining("Fake exception 2"); } @Test void fallbackAfterTimeout() { - TaskScheduler scheduler = mock(TaskScheduler.class); - Runnable sessionCleanupTask = mock(Runnable.class); + TaskScheduler scheduler = mock(); + Runnable sessionCleanupTask = mock(); DefaultTransportRequest request1 = createTransportRequest(this.webSocketTransport, TransportType.WEBSOCKET); DefaultTransportRequest request2 = createTransportRequest(this.xhrTransport, TransportType.XHR_STREAMING); request1.setFallbackRequest(request2); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java index cffdec9d61..22f4b8ff8c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java @@ -70,7 +70,7 @@ class RestTemplateXhrTransportTests { private static final Jackson2SockJsMessageCodec CODEC = new Jackson2SockJsMessageCodec(); - private final WebSocketHandler webSocketHandler = mock(WebSocketHandler.class); + private final WebSocketHandler webSocketHandler = mock(); @Test @@ -132,7 +132,7 @@ class RestTemplateXhrTransportTests { @SuppressWarnings("deprecation") void connectFailure() { final HttpServerErrorException expected = new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR); - RestOperations restTemplate = mock(RestOperations.class); + RestOperations restTemplate = mock(); given(restTemplate.execute((URI) any(), eq(HttpMethod.POST), any(), any())).willThrow(expected); final CountDownLatch latch = new CountDownLatch(1); @@ -201,7 +201,7 @@ class RestTemplateXhrTransportTests { } private ClientHttpResponse response(HttpStatus status, String body) throws IOException { - ClientHttpResponse response = mock(ClientHttpResponse.class); + ClientHttpResponse response = mock(); InputStream inputStream = getInputStream(body); given(response.getStatusCode()).willReturn(status); given(response.getBody()).willReturn(inputStream); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java index 1baed5cc53..41bf991681 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java @@ -49,18 +49,17 @@ class SockJsClientTests { private static final String URL = "https://example.com"; - private static final WebSocketHandler handler = mock(WebSocketHandler.class); + private static final WebSocketHandler handler = mock(); - private final InfoReceiver infoReceiver = mock(InfoReceiver.class); + private final InfoReceiver infoReceiver = mock(); private final TestTransport webSocketTransport = new TestTransport("WebSocketTestTransport"); private final XhrTestTransport xhrTransport = new XhrTestTransport("XhrTestTransport"); @SuppressWarnings({ "deprecation", "unchecked" }) - private org.springframework.util.concurrent.ListenableFutureCallback connectCallback = - mock(org.springframework.util.concurrent.ListenableFutureCallback.class); + private org.springframework.util.concurrent.ListenableFutureCallback connectCallback = mock(); private SockJsClient sockJsClient = new SockJsClient(List.of(this.webSocketTransport, this.xhrTransport)); @@ -76,7 +75,7 @@ class SockJsClientTests { setupInfoRequest(true); this.sockJsClient.doHandshake(handler, URL).addCallback(this.connectCallback); assertThat(this.webSocketTransport.invoked()).isTrue(); - WebSocketSession session = mock(WebSocketSession.class); + WebSocketSession session = mock(); this.webSocketTransport.getConnectCallback().accept(session, null); verify(this.connectCallback).onSuccess(session); verifyNoMoreInteractions(this.connectCallback); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/TestTransport.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/TestTransport.java index 7654cc53c3..78e8112750 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/TestTransport.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/TestTransport.java @@ -79,7 +79,7 @@ class TestTransport implements Transport { @Override public CompletableFuture connectAsync(TransportRequest request, WebSocketHandler handler) { this.request = request; - this.future = mock(CompletableFuture.class); + this.future = mock(); return this.future; } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java index 788281d727..b5d201c100 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java @@ -89,13 +89,13 @@ class XhrTransportTests { HttpHeaders handshakeHeaders = new HttpHeaders(); handshakeHeaders.setOrigin("foo"); - TransportRequest request = mock(TransportRequest.class); + TransportRequest request = mock(); given(request.getSockJsUrlInfo()).willReturn(new SockJsUrlInfo(URI.create("https://example.com"))); given(request.getHandshakeHeaders()).willReturn(handshakeHeaders); given(request.getHttpRequestHeaders()).willReturn(new HttpHeaders()); TestXhrTransport transport = new TestXhrTransport(); - WebSocketHandler handler = mock(WebSocketHandler.class); + WebSocketHandler handler = mock(); transport.connect(request, handler); ArgumentCaptor captor = ArgumentCaptor.forClass(Runnable.class); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java index 4ae00158ad..bfd51c0a13 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java @@ -140,8 +140,8 @@ class SockJsServiceTests extends AbstractHttpRequestTests { @Test // SPR-11919 void handleInfoGetWildflyNPE() throws IOException { - HttpServletResponse mockResponse = mock(HttpServletResponse.class); - ServletOutputStream ous = mock(ServletOutputStream.class); + HttpServletResponse mockResponse = mock(); + ServletOutputStream ous = mock(); given(mockResponse.getHeaders(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).willThrow(NullPointerException.class); given(mockResponse.getOutputStream()).willReturn(ous); this.response = new ServletServerHttpResponse(mockResponse); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java index 4489c2eb79..d2ee15e0f6 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java @@ -60,7 +60,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Ben Kiefer */ @MockitoSettings(strictness = Strictness.LENIENT) -public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { +class DefaultSockJsServiceTests extends AbstractHttpRequestTests { private static final String sockJsPrefix = "/mysockjs"; @@ -107,8 +107,8 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { @Test - public void defaultTransportHandlers() { - DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class)); + void defaultTransportHandlers() { + DefaultSockJsService service = new DefaultSockJsService(mock()); Map handlers = service.getTransportHandlers(); assertThat(handlers).hasSize(6); @@ -121,10 +121,10 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void defaultTransportHandlersWithOverride() { + void defaultTransportHandlersWithOverride() { XhrReceivingTransportHandler xhrHandler = new XhrReceivingTransportHandler(); - DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class), xhrHandler); + DefaultSockJsService service = new DefaultSockJsService(mock(), xhrHandler); Map handlers = service.getTransportHandlers(); assertThat(handlers).hasSize(6); @@ -132,22 +132,22 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void invalidAllowedOrigins() { + void invalidAllowedOrigins() { assertThatIllegalArgumentException().isThrownBy(() -> this.service.setAllowedOrigins(null)); } @Test - public void customizedTransportHandlerList() { + void customizedTransportHandlerList() { TransportHandlingSockJsService service = new TransportHandlingSockJsService( - mock(TaskScheduler.class), new XhrPollingTransportHandler(), new XhrReceivingTransportHandler()); + mock(), new XhrPollingTransportHandler(), new XhrReceivingTransportHandler()); Map actualHandlers = service.getTransportHandlers(); assertThat(actualHandlers).hasSize(2); } @Test - public void handleTransportRequestXhr() throws Exception { + void handleTransportRequestXhr() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); @@ -162,7 +162,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test // SPR-12226 - public void handleTransportRequestXhrAllowedOriginsMatch() throws Exception { + void handleTransportRequestXhrAllowedOriginsMatch() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.setAllowedOrigins(Arrays.asList("https://mydomain1.example", "https://mydomain2.example")); @@ -173,7 +173,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test // SPR-12226 - public void handleTransportRequestXhrAllowedOriginsNoMatch() throws Exception { + void handleTransportRequestXhrAllowedOriginsNoMatch() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.setAllowedOrigins(Arrays.asList("https://mydomain1.example", "https://mydomain2.example")); @@ -184,7 +184,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test // SPR-13464 - public void handleTransportRequestXhrSameOrigin() throws Exception { + void handleTransportRequestXhrSameOrigin() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.setAllowedOrigins(List.of("https://mydomain1.example")); @@ -196,7 +196,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test // SPR-13545 - public void handleInvalidTransportType() throws Exception { + void handleInvalidTransportType() throws Exception { String sockJsPath = sessionUrlPrefix + "invalid"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.setAllowedOrigins(List.of("https://mydomain1.example")); @@ -208,7 +208,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestXhrOptions() throws Exception { + void handleTransportRequestXhrOptions() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("OPTIONS", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); @@ -220,7 +220,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestNoSuitableHandler() throws Exception { + void handleTransportRequestNoSuitableHandler() throws Exception { String sockJsPath = sessionUrlPrefix + "eventsource"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); @@ -229,7 +229,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestXhrSend() throws Exception { + void handleTransportRequestXhrSend() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr_send"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); @@ -258,7 +258,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestXhrSendWithDifferentUser() throws Exception { + void handleTransportRequestXhrSendWithDifferentUser() throws Exception { String sockJsPath = sessionUrlPrefix + "xhr"; setRequest("POST", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); @@ -281,7 +281,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestWebsocket() throws Exception { + void handleTransportRequestWebsocket() throws Exception { TransportHandlingSockJsService wsService = new TransportHandlingSockJsService( this.taskScheduler, this.wsTransportHandler); String sockJsPath = "/websocket"; @@ -306,7 +306,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { } @Test - public void handleTransportRequestIframe() throws Exception { + void handleTransportRequestIframe() throws Exception { String sockJsPath = "/iframe.html"; setRequest("GET", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java index 669b0f7bd1..2df97f6e24 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java @@ -62,7 +62,7 @@ class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTests { @Test void readMessagesNoSession() throws Exception { - WebSocketHandler webSocketHandler = mock(WebSocketHandler.class); + WebSocketHandler webSocketHandler = mock(); assertThatIllegalArgumentException().isThrownBy(() -> new XhrReceivingTransportHandler().handleRequest(this.request, this.response, webSocketHandler, null)); } @@ -72,7 +72,7 @@ class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTests { StubSockJsServiceConfig sockJsConfig = new StubSockJsServiceConfig(); this.servletRequest.setContent("[\"x\"]".getBytes(UTF_8)); - WebSocketHandler wsHandler = mock(WebSocketHandler.class); + WebSocketHandler wsHandler = mock(); TestHttpSockJsSession session = new TestHttpSockJsSession("1", sockJsConfig, wsHandler, null); session.delegateConnectionEstablished(); @@ -87,7 +87,7 @@ class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTests { private void handleRequest(AbstractHttpReceivingTransportHandler transportHandler) throws Exception { - WebSocketHandler wsHandler = mock(WebSocketHandler.class); + WebSocketHandler wsHandler = mock(); AbstractSockJsSession session = new TestHttpSockJsSession("1", new StubSockJsServiceConfig(), wsHandler, null); transportHandler.initialize(new StubSockJsServiceConfig()); @@ -100,7 +100,7 @@ class HttpReceivingTransportHandlerTests extends AbstractHttpRequestTests { private void handleRequestAndExpectFailure() throws Exception { resetResponse(); - WebSocketHandler wsHandler = mock(WebSocketHandler.class); + WebSocketHandler wsHandler = mock(); AbstractSockJsSession session = new TestHttpSockJsSession("1", new StubSockJsServiceConfig(), wsHandler, null); new XhrReceivingTransportHandler().handleRequest(this.request, this.response, wsHandler, session); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java index ada0cfe8d9..2002d63d4f 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java @@ -42,22 +42,18 @@ import static org.mockito.Mockito.verify; */ class HttpSendingTransportHandlerTests extends AbstractHttpRequestTests { - private WebSocketHandler webSocketHandler; + private WebSocketHandler webSocketHandler = mock(); - private StubSockJsServiceConfig sockJsConfig; + private TaskScheduler taskScheduler = mock(); - private TaskScheduler taskScheduler; + private StubSockJsServiceConfig sockJsConfig = new StubSockJsServiceConfig(); - @Override @BeforeEach + @Override protected void setup() { super.setup(); - this.webSocketHandler = mock(WebSocketHandler.class); - this.taskScheduler = mock(TaskScheduler.class); - - this.sockJsConfig = new StubSockJsServiceConfig(); this.sockJsConfig.setTaskScheduler(this.taskScheduler); setRequest("POST", "/"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandlerTests.java index 3da4b9b4a7..d68e1e5b5f 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandlerTests.java @@ -40,12 +40,12 @@ public class SockJsWebSocketHandlerTests { @Test public void getSubProtocols() throws Exception { - SubscribableChannel channel = mock(SubscribableChannel.class); + SubscribableChannel channel = mock(); SubProtocolWebSocketHandler handler = new SubProtocolWebSocketHandler(channel, channel); StompSubProtocolHandler stompHandler = new StompSubProtocolHandler(); handler.addProtocolHandler(stompHandler); - TaskScheduler scheduler = mock(TaskScheduler.class); + TaskScheduler scheduler = mock(); DefaultSockJsService service = new DefaultSockJsService(scheduler); WebSocketServerSockJsSession session = new WebSocketServerSockJsSession("1", service, handler, null); SockJsWebSocketHandler sockJsHandler = new SockJsWebSocketHandler(service, handler, session); @@ -56,7 +56,7 @@ public class SockJsWebSocketHandlerTests { @Test public void getSubProtocolsNone() throws Exception { WebSocketHandler handler = new TextWebSocketHandler(); - TaskScheduler scheduler = mock(TaskScheduler.class); + TaskScheduler scheduler = mock(); DefaultSockJsService service = new DefaultSockJsService(scheduler); WebSocketServerSockJsSession session = new WebSocketServerSockJsSession("1", service, handler, null); SockJsWebSocketHandler sockJsHandler = new SockJsWebSocketHandler(service, handler, session); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSessionTests.java index 2a2d85a655..75ee2a1787 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSessionTests.java @@ -31,9 +31,9 @@ import static org.mockito.Mockito.mock; */ abstract class AbstractSockJsSessionTests { - protected WebSocketHandler webSocketHandler = mock(WebSocketHandler.class); + protected WebSocketHandler webSocketHandler = mock(); - protected TaskScheduler taskScheduler = mock(TaskScheduler.class); + protected TaskScheduler taskScheduler = mock(); protected StubSockJsServiceConfig sockJsConfig = new StubSockJsServiceConfig(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java index a7afe2777f..0b06df7fb9 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java @@ -281,7 +281,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests { @Test void scheduleAndCancelHeartbeat() { - ScheduledFuture task = mock(ScheduledFuture.class); + ScheduledFuture task = mock(); willReturn(task).given(this.taskScheduler).schedule(any(Runnable.class), any(Instant.class)); this.session.setActive(true);