From 4c14abf0cd8391f36d1a7969249824e7e7161ba1 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 16 Mar 2026 13:37:56 +0100 Subject: [PATCH] Remove obsolete "test" prefix from test method names Although this commit also changes the visibility of some test methods to package-private, the remainder of that task will be addressed in conjunction with gh-36496. Closes gh-36495 --- ...NamespaceHandlerScopeIntegrationTests.java | 6 +- ...visorAutoProxyCreatorIntegrationTests.java | 16 +-- .../ComponentBeanDefinitionParserTests.java | 6 +- ...ionScannerJsr330ScopeIntegrationTests.java | 20 +-- .../AspectJExpressionPointcutTests.java | 80 +++++------ .../BeanNamePointcutMatchingTests.java | 4 +- ...hodInvocationProceedingJoinPointTests.java | 6 +- .../TrickyAspectJPointcutExpressionTests.java | 10 +- .../aspectj/TypePatternClassFilterTests.java | 6 +- .../AspectJPointcutAdvisorTests.java | 8 +- .../annotation/AspectProxyFactoryTests.java | 18 +-- .../AspectJNamespaceHandlerTests.java | 8 +- .../AspectJPrecedenceComparatorTests.java | 18 +-- .../aop/framework/MethodInvocationTests.java | 4 +- .../aop/framework/NullPrimitiveTests.java | 4 +- .../aop/framework/PrototypeTargetTests.java | 4 +- .../adapter/ThrowsAdviceInterceptorTests.java | 12 +- .../interceptor/DebugInterceptorTests.java | 4 +- .../ExposeBeanNameAdvisorsTests.java | 4 +- .../ExposeInvocationInterceptorTests.java | 2 +- .../PerformanceMonitorInterceptorTests.java | 6 +- .../SimpleTraceInterceptorTests.java | 4 +- .../aop/scope/DefaultScopedObjectTests.java | 8 +- .../aop/scope/ScopedProxyAutowireTests.java | 4 +- .../aop/support/AopUtilsTests.java | 10 +- .../aop/support/ComposablePointcutTests.java | 10 +- .../aop/support/ControlFlowPointcutTests.java | 2 +- ...elegatingIntroductionInterceptorTests.java | 20 +-- .../aop/support/MethodMatchersTests.java | 12 +- .../aop/support/PointcutsTests.java | 14 +- ...MethodPointcutAdvisorIntegrationTests.java | 6 +- .../aop/support/RootClassFilterTests.java | 6 +- .../CommonsPool2TargetSourceProxyTests.java | 2 +- .../target/HotSwappableTargetSourceTests.java | 10 +- .../target/LazyCreationTargetSourceTests.java | 2 +- .../PrototypeBasedTargetSourceTests.java | 2 +- .../target/PrototypeTargetSourceTests.java | 2 +- .../target/ThreadLocalTargetSourceTests.java | 10 +- .../dynamic/RefreshableTargetSourceTests.java | 8 +- .../aspectj/AbstractCacheAnnotationTests.java | 127 ++++++++--------- .../aspectj/AspectJCacheAnnotationTests.java | 2 +- .../AspectJEnableCachingIsolatedTests.java | 17 +-- ...tationDrivenBeanDefinitionParserTests.java | 4 +- .../aspectj/TransactionAspectTests.java | 4 +- .../beans/AbstractPropertyAccessorTests.java | 2 +- .../beans/BeanWrapperEnumTests.java | 30 ++-- .../beans/BeanWrapperGenericsTests.java | 84 ++++++------ .../beans/ConcurrentBeanWrapperTests.java | 4 +- .../beans/MutablePropertyValuesTests.java | 10 +- .../beans/factory/BeanFactoryUtilsTests.java | 38 +++--- .../beans/factory/FactoryBeanTests.java | 12 +- ...AnnotationBeanWiringInfoResolverTests.java | 10 +- .../CustomAutowireConfigurerTests.java | 2 +- ...njectAnnotationBeanPostProcessorTests.java | 84 ++++++------ .../annotation/LookupAnnotationTests.java | 20 +-- ...ultBeanRegistrationCodeFragmentsTests.java | 4 +- .../config/CustomEditorConfigurerTests.java | 6 +- .../config/CustomScopeConfigurerTests.java | 14 +- .../config/DeprecatedBeanWarnerTests.java | 2 +- .../FieldRetrievingFactoryBeanTests.java | 20 +-- .../MethodInvokingFactoryBeanTests.java | 14 +- ...ObjectFactoryCreatingFactoryBeanTests.java | 18 +-- .../config/PropertiesFactoryBeanTests.java | 14 +- .../config/PropertyPathFactoryBeanTests.java | 12 +- .../PropertyResourceConfigurerTests.java | 62 ++++----- .../ServiceLocatorFactoryBeanTests.java | 24 ++-- .../factory/config/SimpleScopeTests.java | 2 +- .../config/YamlMapFactoryBeanTests.java | 16 +-- .../ConstructorArgumentEntryTests.java | 2 +- .../parsing/CustomProblemReporterTests.java | 2 +- .../parsing/FailFastProblemReporterTests.java | 4 +- .../parsing/NullSourceExtractorTests.java | 4 +- .../factory/parsing/ParseStateTests.java | 6 +- .../PassThroughSourceExtractorTests.java | 4 +- .../factory/parsing/PropertyEntryTests.java | 6 +- .../serviceloader/ServiceLoaderTests.java | 6 +- .../factory/support/LookupMethodTests.java | 14 +- .../support/ManagedPropertiesTests.java | 6 +- ...ierAnnotationAutowireBeanFactoryTests.java | 16 +-- .../xml/CollectionsWithDefaultTypesTests.java | 10 +- .../xml/DelegatingEntityResolverTests.java | 6 +- .../beans/factory/xml/FactoryMethodTests.java | 38 +++--- .../xml/ProfileXmlBeanDefinitionTests.java | 8 +- .../xml/UtilNamespaceHandlerTests.java | 58 ++++---- .../factory/xml/XmlBeanCollectionTests.java | 68 +++++----- .../xml/XmlListableBeanFactoryTests.java | 2 +- .../DefaultNamespaceHandlerResolverTests.java | 12 +- .../beans/propertyeditors/BeanInfoTests.java | 2 +- .../CustomCollectionEditorTests.java | 12 +- .../propertyeditors/FileEditorTests.java | 14 +- .../InputStreamEditorTests.java | 8 +- .../propertyeditors/PathEditorTests.java | 18 +-- .../propertyeditors/ReaderEditorTests.java | 8 +- .../ResourceBundleEditorTests.java | 18 +-- .../beans/propertyeditors/URLEditorTests.java | 14 +- .../beans/support/PagedListHolderTests.java | 2 +- .../support/PropertyComparatorTests.java | 8 +- .../cache/caffeine/CaffeineCacheTests.java | 8 +- .../jcache/JCacheEhCacheAnnotationTests.java | 10 +- .../cache/jcache/JCacheEhCacheApiTests.java | 2 +- .../config/JCacheNamespaceDrivenTests.java | 2 +- .../mail/SimpleMailMessageTests.java | 21 ++- .../mail/javamail/JavaMailSenderTests.java | 4 +- .../quartz/QuartzSchedulerLifecycleTests.java | 4 +- ...eeMarkerConfigurationFactoryBeanTests.java | 4 +- .../aop/aspectj/AroundAdviceBindingTests.java | 8 +- .../aspectj/AroundAdviceCircularTests.java | 2 +- .../AspectAndAdvicePrecedenceTests.java | 2 +- .../aop/aspectj/BeanNamePointcutTests.java | 12 +- ...licitJPArgumentMatchingAtAspectJTests.java | 2 +- .../ImplicitJPArgumentMatchingTests.java | 2 +- .../aop/aspectj/OverloadedAdviceTests.java | 4 +- .../aop/aspectj/ProceedTests.java | 8 +- ...xyCreatorAndLazyInitTargetSourceTests.java | 2 +- .../AtAspectJAnnotationBindingTests.java | 6 +- ...icBridgeMethodMatchingClassProxyTests.java | 4 +- .../GenericBridgeMethodMatchingTests.java | 4 +- .../GenericParameterMatchingTests.java | 6 +- .../AopNamespaceHandlerAdviceTypeTests.java | 4 +- .../AopNamespaceHandlerArgNamesTests.java | 4 +- ...NamespaceHandlerProxyTargetClassTests.java | 2 +- .../AopNamespaceHandlerReturningTests.java | 4 +- .../aop/config/AopNamespaceHandlerTests.java | 10 +- .../AopNamespaceHandlerThrowingTests.java | 4 +- .../MethodLocatingFactoryBeanTests.java | 18 +-- .../aop/framework/AbstractAopProxyTests.java | 2 +- .../aop/framework/ProxyFactoryBeanTests.java | 85 ++++++------ .../target/CommonsPool2TargetSourceTests.java | 22 +-- .../LookupMethodWrappedByCglibProxyTests.java | 4 +- .../factory/xml/QualifierAnnotationTests.java | 26 ++-- .../support/CustomNamespaceHandlerTests.java | 18 +-- .../cache/NoOpCacheManagerTests.java | 10 +- .../ConcurrentMapCacheManagerTests.java | 6 +- .../concurrent/ConcurrentMapCacheTests.java | 8 +- .../AnnotationNamespaceDrivenTests.java | 4 +- .../config/CacheAdviceNamespaceTests.java | 2 +- .../config/EnableCachingIntegrationTests.java | 2 +- .../ExpressionCachingIntegrationTests.java | 2 +- .../interceptor/CacheErrorHandlerTests.java | 8 +- ...acheOperationExpressionEvaluatorTests.java | 4 +- .../ClassPathBeanDefinitionScannerTests.java | 60 ++++---- ...PathFactoryBeanDefinitionScannerTests.java | 2 +- ...ScanParserBeanDefinitionDefaultsTests.java | 24 ++-- .../ComponentScanParserScopedProxyTests.java | 10 +- .../context/annotation/SimpleConfigTests.java | 2 +- .../context/annotation/SimpleScanTests.java | 2 +- .../context/annotation/Spr16217Tests.java | 2 +- .../context/annotation/Spr6602Tests.java | 4 +- .../AutowiredConfigurationTests.java | 36 ++--- ...assWithPlaceholderConfigurerBeanTests.java | 10 +- .../configuration/ScopingTests.java | 12 +- .../configuration/Spr10668Tests.java | 2 +- .../configuration/Spr10744Tests.java | 2 +- .../configuration/Spr12526Tests.java | 2 +- .../ConversionServiceContextConfigTests.java | 2 +- .../event/ApplicationContextEventTests.java | 12 +- ...enericApplicationListenerAdapterTests.java | 12 +- .../event/PayloadApplicationEventTests.java | 24 ++-- .../i18n/LocaleContextHolderTests.java | 10 +- ...ertySourcesPlaceholderConfigurerTests.java | 10 +- ...ticApplicationContextMulticasterTests.java | 4 +- .../StaticApplicationContextTests.java | 2 +- .../support/StaticMessageSourceTests.java | 4 +- .../config/JeeNamespaceHandlerEventTests.java | 6 +- .../ejb/config/JeeNamespaceHandlerTests.java | 18 +-- .../format/datetime/DateFormattingTests.java | 28 ++-- .../standard/DateTimeFormattingTests.java | 86 ++++++------ .../format/number/NumberFormattingTests.java | 18 +-- .../number/money/MoneyFormattingTests.java | 12 +- ...tingConversionServiceFactoryBeanTests.java | 10 +- .../InstrumentableClassLoaderTests.java | 2 +- .../ReflectiveLoadTimeWeaverTests.java | 12 +- ...ceOverridingShadowingClassLoaderTests.java | 12 +- .../export/MBeanExporterOperationsTests.java | 8 +- .../jmx/export/NotificationListenerTests.java | 26 ++-- .../export/NotificationPublisherTests.java | 10 +- .../AnnotationMetadataAssemblerTests.java | 8 +- .../EnableMBeanExportConfigurationTests.java | 16 +-- .../AbstractMetadataAssemblerTests.java | 30 ++-- ...aceBasedMBeanInfoAssemblerCustomTests.java | 2 +- ...aceBasedMBeanInfoAssemblerMappedTests.java | 10 +- ...ExclusionMBeanInfoAssemblerComboTests.java | 4 +- ...xclusionMBeanInfoAssemblerMappedTests.java | 4 +- ...usionMBeanInfoAssemblerNotMappedTests.java | 4 +- ...ethodExclusionMBeanInfoAssemblerTests.java | 4 +- ...ameBasedMBeanInfoAssemblerMappedTests.java | 6 +- ...ethodNameBasedMBeanInfoAssemblerTests.java | 4 +- .../ModelMBeanNotificationPublisherTests.java | 14 +- .../jndi/JndiObjectFactoryBeanTests.java | 50 +++---- .../jndi/JndiTemplateEditorTests.java | 6 +- .../jndi/JndiTemplateTests.java | 14 +- ...otationAsyncExecutionInterceptorTests.java | 2 +- ...AsyncAnnotationBeanPostProcessorTests.java | 2 +- .../annotation/EnableAsyncTests.java | 6 +- .../bsh/BshScriptEvaluatorTests.java | 6 +- .../scripting/groovy/GroovyAspectTests.java | 6 +- .../groovy/GroovyClassLoadingTests.java | 2 +- .../groovy/GroovyScriptEvaluatorTests.java | 16 +-- .../groovy/GroovyScriptFactoryTests.java | 76 +++++------ .../ScriptFactoryPostProcessorTests.java | 18 +-- .../org/springframework/ui/ModelMapTests.java | 50 +++---- .../validation/ValidationUtilsTests.java | 18 +-- .../validation/ValidatorTests.java | 4 +- .../BeanValidationPostProcessorTests.java | 12 +- .../MethodValidationProxyTests.java | 12 +- .../SpringValidatorAdapterTests.java | 22 +-- .../cache/AbstractCacheAnnotationTests.java | 128 +++++++++--------- .../testfixture/cache/AbstractCacheTests.java | 24 ++-- .../AbstractValueAdaptingCacheTests.java | 2 +- .../core/BridgeMethodResolverTests.java | 4 +- .../core/GenericTypeResolverTests.java | 4 +- .../core/MethodParameterTests.java | 4 +- .../SynthesizingMethodParameterTests.java | 2 +- .../core/codec/StringDecoderTests.java | 2 +- .../core/io/buffer/JettyDataBufferTests.java | 2 +- .../type/AbstractMethodMetadataTests.java | 2 +- .../util/CompositeSetTests.java | 2 +- .../util/FilteredSetTests.java | 2 +- .../springframework/util/MimeTypeTests.java | 2 +- .../AbstractDataBufferAllocatingTests.java | 2 +- .../spel/BooleanExpressionTests.java | 18 +-- .../spel/CachedMethodExecutorTests.java | 4 +- .../expression/spel/ComparatorTests.java | 10 +- .../spel/ExpressionLanguageScenarioTests.java | 14 +- .../spel/ParserErrorMessagesTests.java | 10 +- ...ariosForSpringSecurityExpressionTests.java | 18 +-- .../spel/SpelCompilationCoverageTests.java | 14 +- .../expression/spel/SpelExceptionTests.java | 8 +- .../expression/spel/SpelReproTests.java | 2 +- .../spel/StandardTypeComparatorTests.java | 10 +- .../spel/standard/SpelParserTests.java | 4 +- .../InitializeDatabaseIntegrationTests.java | 14 +- .../jdbc/core/JdbcTemplateQueryTests.java | 56 ++++---- .../jdbc/core/JdbcTemplateTests.java | 112 +++++++-------- .../jdbc/core/RowMapperTests.java | 2 +- .../jdbc/core/SingleColumnRowMapperTests.java | 6 +- .../jdbc/core/StatementCreatorUtilsTests.java | 51 +++---- .../NamedParameterJdbcTemplateTests.java | 44 +++--- .../namedparam/NamedParameterQueryTests.java | 28 ++-- .../namedparam/NamedParameterUtilsTests.java | 2 +- .../core/simple/CallMetaDataContextTests.java | 2 +- .../simple/TableMetaDataContextTests.java | 4 +- .../core/support/JdbcDaoSupportTests.java | 4 +- .../jdbc/core/support/LobSupportTests.java | 10 +- .../jdbc/core/support/SqlLobValueTests.java | 6 +- .../DataSourceTransactionManagerTests.java | 58 ++++---- .../jdbc/datasource/DataSourceUtilsTests.java | 4 +- ...UserCredentialsDataSourceAdapterTests.java | 6 +- .../EmbeddedDatabaseFactoryBeanTests.java | 2 +- .../EmbeddedDatabaseFactoryTests.java | 2 +- .../BeanFactoryDataSourceLookupTests.java | 6 +- .../lookup/JndiDataSourceLookupTests.java | 4 +- .../lookup/MapDataSourceLookupTests.java | 4 +- .../jdbc/object/BatchSqlUpdateTests.java | 4 +- .../jdbc/object/GenericSqlQueryTests.java | 6 +- .../object/GenericStoredProcedureTests.java | 2 +- .../jdbc/object/SqlQueryTests.java | 42 +++--- .../jdbc/object/SqlUpdateTests.java | 28 ++-- .../jdbc/object/StoredProcedureTests.java | 38 +++--- .../jdbc/support/DefaultLobHandlerTests.java | 26 ++-- .../rowset/ResultSetWrappingRowSetTests.java | 44 +++--- ...tenerAnnotationBeanPostProcessorTests.java | 5 +- .../jms/config/JmsNamespaceHandlerTests.java | 26 ++-- .../JmsTransactionManagerTests.java | 18 +-- .../SingleConnectionFactoryTests.java | 38 +++--- .../jms/core/JmsTemplateTests.java | 104 +++++++------- .../core/support/JmsGatewaySupportTests.java | 4 +- .../SimpleMessageListenerContainerTests.java | 28 ++-- .../adapter/MessageListenerAdapterTests.java | 38 +++--- .../support/SimpleMessageConverterTests.java | 20 +-- .../JmsDestinationAccessorTests.java | 4 +- .../JndiDestinationResolverTests.java | 8 +- .../messaging/MessageHeadersTests.java | 32 ++--- .../JacksonJsonMessageConverterTests.java | 6 +- .../MappingJackson2MessageConverterTests.java | 6 +- .../converter/MessageConverterTests.java | 2 +- .../HeaderMethodArgumentResolverTests.java | 2 +- .../HeaderMethodArgumentResolverTests.java | 2 +- .../MessageMethodArgumentResolverTests.java | 2 +- .../InvocableHandlerMethodTests.java | 2 +- .../reactive/MethodMessageHandlerTests.java | 6 +- .../rsocket/DefaultRSocketRequesterTests.java | 16 +-- ...RSocketClientToServerIntegrationTests.java | 2 +- .../simp/SimpMessagingTemplateTests.java | 2 +- .../SendToMethodReturnValueHandlerTests.java | 8 +- ...mpAnnotationMethodMessageHandlerTests.java | 6 +- ...criptionMethodReturnValueHandlerTests.java | 10 +- .../SimpleBrokerMessageHandlerTests.java | 2 +- .../MessageBrokerConfigurationTests.java | 4 +- .../simp/stomp/DefaultStompSessionTests.java | 8 +- .../stomp/SplittingStompEncoderTests.java | 38 +++--- .../simp/stomp/StompDecoderTests.java | 6 +- .../DefaultUserDestinationResolverTests.java | 10 +- .../messaging/support/ErrorMessageTests.java | 2 +- .../support/MessageHeaderAccessorTests.java | 4 +- ...rEntityManagerFactoryIntegrationTests.java | 46 +++---- ...nManagedEntityManagerIntegrationTests.java | 20 +-- ...rManagedEntityManagerIntegrationTests.java | 24 ++-- .../orm/jpa/DefaultJpaDialectTests.java | 6 +- .../EntityManagerFactoryBeanSupportTests.java | 2 +- .../jpa/EntityManagerFactoryUtilsTests.java | 12 +- .../orm/jpa/JpaTransactionManagerTests.java | 44 +++--- ...kEntityManagerFactoryIntegrationTests.java | 4 +- ...yManagerFactorySimpleIntegrationTests.java | 3 +- ...eEntityManagerFactoryIntegrationTests.java | 10 +- ...yManagerFactorySimpleIntegrationTests.java | 3 +- .../hibernate/HibernateJpaDialectTests.java | 2 +- ...iEntityManagerFactoryIntegrationTests.java | 4 +- ...eEntityManagerFactoryIntegrationTests.java | 12 +- ...rySpringBeanContainerIntegrationTests.java | 26 ++-- .../PersistenceXmlParsingTests.java | 28 ++-- .../support/OpenEntityManagerInViewTests.java | 12 +- .../PersistenceContextTransactionTests.java | 22 +-- .../PersistenceInjectionIntegrationTests.java | 4 +- .../support/PersistenceInjectionTests.java | 54 ++++---- .../SharedEntityManagerFactoryTests.java | 2 +- .../oxm/jaxb/Jaxb2MarshallerTests.java | 2 +- .../oxm/jaxb/Jaxb2UnmarshallerTests.java | 4 +- .../R2dbcTransactionManagerTests.java | 28 ++-- .../connection/init/ScriptUtilsTests.java | 8 +- .../MapConnectionFactoryLookupTests.java | 2 +- ...amicPropertyRegistrarIntegrationTests.java | 2 +- ...extManagerListenerExecutionOrderTests.java | 6 +- .../TestContextManagerMethodInvokerTests.java | 6 +- .../TestPropertySourceRuntimeHintsTests.java | 4 +- .../TestBeanInheritanceIntegrationTests.java | 4 +- ...esContextBeforeMethodIntegrationTests.java | 2 +- ...itoBeanAndScopedProxyIntegrationTests.java | 2 +- ...esContextBeforeMethodIntegrationTests.java | 2 +- ...OnTestFieldForNewBeanIntegrationTests.java | 2 +- ...esContextBeforeMethodIntegrationTests.java | 2 +- ...orExistingGenericBeanIntegrationTests.java | 2 +- ...ProducedByFactoryBeanIntegrationTests.java | 2 +- ...ingBeansAndOnePrimaryIntegrationTests.java | 2 +- .../AotMergedContextConfigurationTests.java | 4 +- .../DirtiesContextInterfaceTests.java | 2 +- .../context/event/CustomTestEventTests.java | 2 +- .../DirtiesContextEventPublishingTests.java | 6 +- ...agerTestExecutionEventPublishingTests.java | 2 +- ...TestExecutionListenerIntegrationTests.java | 36 ++--- .../expression/ExpressionUsageTests.java | 4 +- ...lizerConfiguredViaMetaAnnotationTests.java | 2 +- ...lizerWithoutConfigFilesOrClassesTests.java | 2 +- ...rgedInitializersAnnotationConfigTests.java | 2 +- ...ipleInitializersAnnotationConfigTests.java | 2 +- ...eredInitializersAnnotationConfigTests.java | 6 +- ...ddenInitializersAnnotationConfigTests.java | 2 +- .../PropertySourcesInitializerTests.java | 2 +- ...ingleInitializerAnnotationConfigTests.java | 2 +- .../MultipleInitializersXmlConfigTests.java | 2 +- ...reAndAfterMethodsSpringExtensionTests.java | 8 +- ...figClassesWithoutAtConfigurationTests.java | 2 +- .../BootstrapTestUtilsMergedConfigTests.java | 16 +-- .../support/TestConstructorUtilsTests.java | 4 +- ...ilingBeforeAndAfterMethodsTestNGTests.java | 6 +- .../testng/TestNGConcurrencyTests.java | 20 +-- .../match/ContentRequestMatchersTests.java | 46 +++---- .../match/JsonPathRequestMatchersTests.java | 74 +++++----- .../match/MultipartRequestMatchersTests.java | 16 +-- .../match/XpathRequestMatchersTests.java | 28 ++-- ...HeaderRequestMatchersIntegrationTests.java | 4 +- ...ontentRequestMatchersIntegrationTests.java | 4 +- .../XpathRequestMatchersIntegrationTests.java | 12 +- .../server/ApplicationContextSpecTests.java | 2 +- .../server/DefaultControllerSpecTests.java | 10 +- .../DefaultRouterFunctionSpecTests.java | 4 +- .../server/HttpHandlerConnectorTests.java | 6 +- .../reactive/server/MockServerSpecTests.java | 4 +- .../web/reactive/server/MockServerTests.java | 8 +- .../server/WiretapConnectorTests.java | 2 +- .../server/samples/bind/ControllerTests.java | 2 +- .../server/samples/bind/HttpServerTests.java | 2 +- .../samples/bind/RouterFunctionTests.java | 2 +- .../web/servlet/DefaultMvcResultTests.java | 4 +- .../MockMvcTesterIntegrationTests.java | 4 +- .../servlet/client/RestTestClientTests.java | 64 +++++---- .../samples/bind/RouterFunctionTests.java | 2 +- .../htmlunit/HostRequestMatcherTests.java | 10 +- .../MockMvcConnectionBuilderSupportTests.java | 16 +-- .../htmlunit/MockMvcWebConnectionTests.java | 14 +- .../htmlunit/MockWebResponseBuilderTests.java | 22 +-- .../htmlunit/UrlRegexRequestMatcherTests.java | 2 +- .../WebConnectionHtmlUnitDriverTests.java | 2 +- .../FlashAttributeResultMatchersTests.java | 8 +- .../result/HeaderResultMatchersTests.java | 2 +- .../result/MockMvcResultMatchersTests.java | 30 ++-- .../result/StatusResultMatchersTests.java | 4 +- .../result/XpathResultMatchersTests.java | 34 ++--- .../AsyncControllerJavaConfigTests.java | 2 +- .../client/context/WebAppResourceTests.java | 4 +- .../client/context/XmlConfigTests.java | 2 +- .../client/standalone/FilterTests.java | 14 +- .../standalone/FrameworkExtensionTests.java | 4 +- .../standalone/MultipartControllerTests.java | 24 ++-- .../standalone/ReactiveReturnTypeTests.java | 2 +- .../client/standalone/RedirectTests.java | 10 +- .../standalone/RequestParameterTests.java | 2 +- .../standalone/RouterFunctionTests.java | 5 +- .../samples/client/standalone/SseTests.java | 2 +- .../PrintingResultHandlerSmokeTests.java | 5 +- .../resultmatches/CookieAssertionTests.java | 20 +-- .../resultmatches/HandlerAssertionTests.java | 12 +- .../resultmatches/JsonPathAssertionTests.java | 10 +- .../resultmatches/UrlAssertionTests.java | 8 +- .../resultmatches/ViewNameAssertionTests.java | 4 +- .../XmlContentAssertionTests.java | 4 +- .../resultmatches/XpathAssertionTests.java | 14 +- .../AsyncControllerJavaConfigTests.java | 2 +- .../samples/context/JavaConfigTests.java | 6 +- .../samples/context/WebAppResourceTests.java | 4 +- .../samples/context/XmlConfigTests.java | 2 +- ...stAttributesRequestContextHolderTests.java | 4 +- .../servlet/samples/spr/FormContentTests.java | 2 +- .../spr/RequestContextHolderTests.java | 10 +- .../samples/standalone/ApiVersionTests.java | 2 +- .../samples/standalone/FilterTests.java | 14 +- .../standalone/FrameworkExtensionTests.java | 4 +- .../standalone/ReactiveReturnTypeTests.java | 2 +- .../samples/standalone/RedirectTests.java | 10 +- .../standalone/RequestParameterTests.java | 2 +- .../standalone/RouterFunctionTests.java | 11 +- .../PrintingResultHandlerSmokeTests.java | 3 +- .../resultmatchers/CookieAssertionTests.java | 34 ++--- .../resultmatchers/HandlerAssertionTests.java | 12 +- .../resultmatchers/HeaderAssertionTests.java | 30 ++-- .../JsonPathAssertionTests.java | 10 +- .../resultmatchers/UrlAssertionTests.java | 8 +- .../ViewNameAssertionTests.java | 4 +- .../XmlContentAssertionTests.java | 4 +- .../resultmatchers/XpathAssertionTests.java | 14 +- .../setup/DefaultMockMvcBuilderTests.java | 16 +-- .../setup/MockMvcFilterDecoratorTests.java | 66 ++++----- .../servlet/setup/SharedHttpSessionTests.java | 4 +- .../LocalConnectionFactoryBeanTests.java | 10 +- ...tationTransactionAttributeSourceTests.java | 2 + .../EnableTransactionManagementTests.java | 2 +- .../springframework/http/HttpEntityTests.java | 2 +- .../springframework/http/HttpRangeTests.java | 2 +- .../springframework/http/MediaTypeTests.java | 6 +- .../http/ResponseCookieTests.java | 2 +- .../JdkClientHttpRequestFactoryTests.java | 2 +- .../client/MultipartBodyBuilderTests.java | 2 +- .../SimpleClientHttpRequestFactoryTests.java | 4 +- .../client/SimpleClientHttpResponseTests.java | 10 +- .../codec/CancelWithoutDemandCodecTests.java | 14 +- .../codec/EncoderHttpMessageWriterTests.java | 4 +- .../http/codec/JacksonTokenizerTests.java | 6 +- .../CustomizedJackson2JsonDecoderTests.java | 4 +- .../codec/json/Jackson2JsonEncoderTests.java | 14 +- .../codec/json/Jackson2TokenizerTests.java | 6 +- .../codec/json/JacksonCsvEncoderTests.java | 4 +- .../codec/json/JacksonJsonDecoderTests.java | 2 +- .../codec/json/JacksonJsonEncoderTests.java | 10 +- .../MultipartHttpMessageWriterTests.java | 8 +- .../codec/protobuf/ProtobufDecoderTests.java | 12 +- .../support/ClientCodecConfigurerTests.java | 2 +- .../codec/xml/JacksonXmlEncoderTests.java | 4 +- .../http/codec/xml/Jaxb2XmlDecoderTests.java | 2 +- .../FormHttpMessageConverterTests.java | 2 +- ...jectToStringHttpMessageConverterTests.java | 2 +- .../ResourceHttpMessageConverterTests.java | 14 +- ...sourceRegionHttpMessageConverterTests.java | 2 +- .../json/GsonHttpMessageConverterTests.java | 8 +- .../Jackson2ObjectMapperFactoryBeanTests.java | 2 +- .../json/JsonbHttpMessageConverterTests.java | 8 +- ...b2CollectionHttpMessageConverterTests.java | 16 +-- ...2RootElementHttpMessageConverterTests.java | 2 +- .../server/DefaultPathContainerTests.java | 18 +-- .../ContextPathCompositeHandlerTests.java | 2 +- .../reactive/ListenerReadPublisherTests.java | 4 +- .../reactive/ListenerWriteProcessorTests.java | 6 +- .../reactive/ServerHttpRequestTests.java | 6 +- ...ngMediaTypeFileExtensionResolverTests.java | 2 +- .../web/bind/EscapedErrorsTests.java | 2 +- .../bind/ServletRequestDataBinderTests.java | 24 ++-- .../web/bind/ServletRequestUtilsTests.java | 22 +-- .../support/WebExchangeDataBinderTests.java | 24 ++-- .../support/WebRequestDataBinderTests.java | 40 +++--- .../client/HttpStatusCodeExceptionTests.java | 2 +- .../RequestAndSessionScopedBeanTests.java | 4 +- .../request/RequestScopedProxyTests.java | 12 +- .../WebApplicationContextScopeTests.java | 6 +- .../async/WebAsyncManagerTimeoutTests.java | 2 +- .../SpringBeanAutowiringSupportTests.java | 2 +- .../web/cors/DefaultCorsProcessorTests.java | 4 +- .../web/cors/reactive/CorsUtilsTests.java | 6 +- .../reactive/DefaultCorsProcessorTests.java | 4 +- .../web/filter/CompositeFilterTests.java | 2 +- .../filter/DelegatingFilterProxyTests.java | 26 ++-- .../web/filter/FormContentFilterTests.java | 2 +- .../web/filter/OncePerRequestFilterTests.java | 2 +- .../filter/ShallowEtagHeaderFilterTests.java | 4 +- .../web/method/ControllerAdviceBeanTests.java | 2 +- .../ModelAttributeMethodProcessorTests.java | 4 +- ...uestHeaderMethodArgumentResolverTests.java | 2 +- ...stParamMapMethodArgumentResolverTests.java | 8 +- ...questParamMethodArgumentResolverTests.java | 24 ++-- .../support/InvocableHandlerMethodTests.java | 2 +- .../support/ModelAndViewContainerTests.java | 2 +- ...faultMultipartHttpServletRequestTests.java | 4 +- ...uestPartServletServerHttpRequestTests.java | 6 +- .../adapter/WebHttpHandlerBuilderTests.java | 2 +- .../invoker/HttpServiceMethodTests.java | 2 +- .../util/DefaultUriBuilderFactoryTests.java | 4 +- .../HtmlCharacterEntityReferencesTests.java | 4 +- .../web/util/TagUtilsTests.java | 2 +- .../web/util/UriComponentsBuilderTests.java | 4 +- .../pattern/PathPatternRouteMatcherTests.java | 4 +- .../web/util/pattern/PathPatternTests.java | 4 +- ...ctResponseStatusExceptionHandlerTests.java | 12 +- .../reactive/DispatcherHandlerErrorTests.java | 6 +- .../ParameterContentTypeResolverTests.java | 2 +- .../config/ViewResolverRegistryTests.java | 2 +- .../reactive/function/BodyInsertersTests.java | 4 +- .../client/DefaultWebClientTests.java | 8 +- .../client/ExchangeStrategiesTests.java | 2 +- .../server/DefaultServerRequestTests.java | 14 +- .../EncodedResourceResolverTests.java | 2 +- .../resource/FixedVersionStrategyTests.java | 2 +- .../resource/PathResourceResolverTests.java | 10 +- .../ConsumesRequestConditionTests.java | 4 +- .../HeadersRequestConditionTests.java | 2 +- .../PatternsRequestConditionTests.java | 2 +- .../ProducesRequestConditionTests.java | 6 +- .../condition/RequestMappingInfoTests.java | 2 +- .../method/HandlerMethodMappingTests.java | 4 +- .../MessageReaderArgumentResolverTests.java | 8 +- .../MessageWriterResultHandlerTests.java | 12 +- ...tAttributeMethodArgumentResolverTests.java | 2 +- ...equestBodyMethodArgumentResolverTests.java | 8 +- ...tHeaderMapMethodArgumentResolverTests.java | 2 +- ...uestHeaderMethodArgumentResolverTests.java | 2 +- ...questParamMethodArgumentResolverTests.java | 6 +- .../result/view/RequestContextTests.java | 6 +- .../freemarker/FreeMarkerConfigurerTests.java | 2 +- .../view/script/ScriptTemplateViewTests.java | 30 ++-- .../support/HttpRequestHandlerTests.java | 2 +- .../support/ServletContextSupportTests.java | 20 +-- .../WebApplicationObjectSupportTests.java | 4 +- ...tationDrivenBeanDefinitionParserTests.java | 12 +- .../web/servlet/config/MvcNamespaceTests.java | 50 +++---- .../DefaultServletHandlerConfigurerTests.java | 2 +- .../DelegatingWebMvcConfigurationTests.java | 4 +- .../annotation/InterceptorRegistryTests.java | 2 +- ...MvcConfigurationSupportExtensionTests.java | 2 +- .../WebMvcConfigurationSupportTests.java | 2 +- .../handler/HandlerMethodMappingTests.java | 4 +- .../ResponseStatusExceptionResolverTests.java | 4 +- .../ConsumesRequestConditionTests.java | 4 +- .../HeadersRequestConditionTests.java | 2 +- .../ProducesRequestConditionTests.java | 6 +- .../RequestMethodsRequestConditionTests.java | 2 +- ...DeferredResultReturnValueHandlerTests.java | 2 +- .../HttpEntityMethodProcessorTests.java | 10 +- ...lAndViewMethodReturnValueHandlerTests.java | 2 +- .../MvcUriComponentsBuilderTests.java | 24 ++-- ...ariableMapMethodArgumentResolverTests.java | 2 +- .../RequestMappingHandlerAdapterTests.java | 4 +- .../ResponseEntityExceptionHandlerTests.java | 4 +- ...nnotationControllerHandlerMethodTests.java | 4 +- ...ookieValueMethodArgumentResolverTests.java | 2 +- .../ServletInvocableHandlerMethodTests.java | 10 +- ...letModelAttributeMethodProcessorTests.java | 8 +- ...letRequestMethodArgumentResolverTests.java | 2 +- ...etResponseMethodArgumentResolverTests.java | 2 +- .../DefaultHandlerExceptionResolverTests.java | 4 +- .../EncodedResourceResolverTests.java | 2 +- .../resource/FixedVersionStrategyTests.java | 2 +- .../resource/PathResourceResolverTests.java | 34 ++--- .../ResourceHttpRequestHandlerTests.java | 2 +- .../ResourceUrlEncodingFilterTests.java | 12 +- .../ResourceUrlProviderJavaConfigTests.java | 2 +- .../servlet/support/FlashMapManagerTests.java | 12 +- .../servlet/support/RequestContextTests.java | 8 +- .../ServletUriComponentsBuilderTests.java | 12 +- .../web/servlet/tags/EvalTagTests.java | 2 +- .../web/servlet/tags/HtmlEscapeTagTests.java | 2 +- .../web/servlet/tags/UrlTagTests.java | 2 +- .../servlet/tags/form/OptionTagEnumTests.java | 2 +- .../tags/form/PasswordInputTagTests.java | 2 +- .../web/servlet/view/RedirectViewTests.java | 4 +- .../servlet/view/document/XlsViewTests.java | 6 +- .../freemarker/FreeMarkerConfigurerTests.java | 2 +- .../view/freemarker/FreeMarkerMacroTests.java | 44 +++--- .../view/script/ScriptTemplateViewTests.java | 32 ++--- .../view/xml/MarshallingViewTests.java | 2 +- .../web/servlet/view/xslt/XsltViewTests.java | 18 +-- ...essageBrokerBeanDefinitionParserTests.java | 2 +- ...currentWebSocketSessionDecoratorTests.java | 2 +- .../SubProtocolWebSocketHandlerTests.java | 2 +- .../sockjs/transport/TransportTypeTests.java | 2 +- 591 files changed, 3284 insertions(+), 3306 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java index 23ffc7751cf..25cabd6788c 100644 --- a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java @@ -61,7 +61,7 @@ class AopNamespaceHandlerScopeIntegrationTests { @Test - void testSingletonScoping() throws Exception { + void singletonScoping() throws Exception { assertThat(AopUtils.isAopProxy(singletonScoped)).as("Should be AOP proxy").isTrue(); boolean condition = singletonScoped instanceof TestBean; assertThat(condition).as("Should be target class proxy").isTrue(); @@ -75,7 +75,7 @@ class AopNamespaceHandlerScopeIntegrationTests { } @Test - void testRequestScoping() { + void requestScoping() { MockHttpServletRequest oldRequest = new MockHttpServletRequest(); MockHttpServletRequest newRequest = new MockHttpServletRequest(); @@ -103,7 +103,7 @@ class AopNamespaceHandlerScopeIntegrationTests { } @Test - void testSessionScoping() { + void sessionScoping() { MockHttpSession oldSession = new MockHttpSession(); MockHttpSession newSession = new MockHttpSession(); diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index a7b7b99f099..8192cb4ddf3 100644 --- a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -65,7 +65,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { } @Test - void testDefaultExclusionPrefix() { + void defaultExclusionPrefix() { DefaultAdvisorAutoProxyCreator aapc = (DefaultAdvisorAutoProxyCreator) getBeanFactory().getBean(ADVISOR_APC_BEAN_NAME); assertThat(aapc.getAdvisorBeanNamePrefix()).isEqualTo((ADVISOR_APC_BEAN_NAME + DefaultAdvisorAutoProxyCreator.SEPARATOR)); assertThat(aapc.isUsePrefix()).isFalse(); @@ -75,21 +75,21 @@ class AdvisorAutoProxyCreatorIntegrationTests { * If no pointcuts match (no attrs) there should be proxying. */ @Test - void testNoProxy() { + void noProxy() { BeanFactory bf = getBeanFactory(); Object o = bf.getBean("noSetters"); assertThat(AopUtils.isAopProxy(o)).isFalse(); } @Test - void testTxIsProxied() { + void txIsProxied() { BeanFactory bf = getBeanFactory(); ITestBean test = (ITestBean) bf.getBean("test"); assertThat(AopUtils.isAopProxy(test)).isTrue(); } @Test - void testRegexpApplied() { + void regexpApplied() { BeanFactory bf = getBeanFactory(); ITestBean test = (ITestBean) bf.getBean("test"); MethodCounter counter = (MethodCounter) bf.getBean("countingAdvice"); @@ -99,7 +99,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { } @Test - void testTransactionAttributeOnMethod() { + void transactionAttributeOnMethod() { BeanFactory bf = getBeanFactory(); ITestBean test = (ITestBean) bf.getBean("test"); @@ -121,7 +121,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { * Should not roll back on servlet exception. */ @Test - void testRollbackRulesOnMethodCauseRollback() throws Exception { + void rollbackRulesOnMethodCauseRollback() throws Exception { BeanFactory bf = getBeanFactory(); Rollback rb = (Rollback) bf.getBean("rollback"); @@ -147,7 +147,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { } @Test - void testRollbackRulesOnMethodPreventRollback() throws Exception { + void rollbackRulesOnMethodPreventRollback() throws Exception { BeanFactory bf = getBeanFactory(); Rollback rb = (Rollback) bf.getBean("rollback"); @@ -164,7 +164,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { } @Test - void testProgrammaticRollback() { + void programmaticRollback() { BeanFactory bf = getBeanFactory(); Object bean = bf.getBean(TXMANAGER_BEAN_NAME); diff --git a/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentBeanDefinitionParserTests.java b/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentBeanDefinitionParserTests.java index e6e603a84d0..8f09735cc1b 100644 --- a/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentBeanDefinitionParserTests.java +++ b/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentBeanDefinitionParserTests.java @@ -50,13 +50,13 @@ class ComponentBeanDefinitionParserTests { } @Test - void testBionicBasic() { + void bionicBasic() { Component cp = getBionicFamily(); assertThat(cp.getName()).isEqualTo("Bionic-1"); } @Test - void testBionicFirstLevelChildren() { + void bionicFirstLevelChildren() { Component cp = getBionicFamily(); List components = cp.getComponents(); assertThat(components).hasSize(2); @@ -65,7 +65,7 @@ class ComponentBeanDefinitionParserTests { } @Test - void testBionicSecondLevelChildren() { + void bionicSecondLevelChildren() { Component cp = getBionicFamily(); List components = cp.getComponents().get(0).getComponents(); assertThat(components).hasSize(2); diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index de02753a36c..c61aeac4f9e 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -83,7 +83,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { @Test - void testPrototype() { + void prototype() { ApplicationContext context = createContext(ScopedProxyMode.NO); ScopedTestBean bean = (ScopedTestBean) context.getBean("prototype"); assertThat(bean).isNotNull(); @@ -92,7 +92,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSingletonScopeWithNoProxy() { + void singletonScopeWithNoProxy() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.NO); ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton"); @@ -115,7 +115,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSingletonScopeIgnoresProxyInterfaces() { + void singletonScopeIgnoresProxyInterfaces() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.INTERFACES); ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton"); @@ -136,7 +136,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSingletonScopeIgnoresProxyTargetClass() { + void singletonScopeIgnoresProxyTargetClass() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS); ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton"); @@ -157,7 +157,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testRequestScopeWithNoProxy() { + void requestScopeWithNoProxy() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.NO); ScopedTestBean bean = (ScopedTestBean) context.getBean("request"); @@ -178,7 +178,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testRequestScopeWithProxiedInterfaces() { + void requestScopeWithProxiedInterfaces() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.INTERFACES); IScopedTestBean bean = (IScopedTestBean) context.getBean("request"); @@ -200,7 +200,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testRequestScopeWithProxiedTargetClass() { + void requestScopeWithProxiedTargetClass() { RequestContextHolder.setRequestAttributes(oldRequestAttributes); ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS); IScopedTestBean bean = (IScopedTestBean) context.getBean("request"); @@ -222,7 +222,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSessionScopeWithNoProxy() { + void sessionScopeWithNoProxy() { RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession); ApplicationContext context = createContext(ScopedProxyMode.NO); ScopedTestBean bean = (ScopedTestBean) context.getBean("session"); @@ -243,7 +243,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSessionScopeWithProxiedInterfaces() { + void sessionScopeWithProxiedInterfaces() { RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession); ApplicationContext context = createContext(ScopedProxyMode.INTERFACES); IScopedTestBean bean = (IScopedTestBean) context.getBean("session"); @@ -271,7 +271,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { } @Test - void testSessionScopeWithProxiedTargetClass() { + void sessionScopeWithProxiedTargetClass() { RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession); ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS); IScopedTestBean bean = (IScopedTestBean) context.getBean("session"); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java index 14288c97761..436e2d78f0a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java @@ -23,7 +23,6 @@ import java.util.Map; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import test.annotation.EmptySpringAnnotation; import test.annotation.transaction.Tx; @@ -37,6 +36,7 @@ import org.springframework.beans.testfixture.beans.IOther; import org.springframework.beans.testfixture.beans.ITestBean; import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.subpkg.DeepBean; +import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -50,30 +50,22 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; */ class AspectJExpressionPointcutTests { - private Method getAge; - - private Method setAge; - - private Method setSomeNumber; - + private final Method getAge = ClassUtils.getMethod(TestBean.class, "getAge"); + private final Method setAge = ClassUtils.getMethod(TestBean.class, "setAge", int.class); + private final Method setSomeNumber = ClassUtils.getMethod(TestBean.class, "setSomeNumber", Number.class); private final Map methodsOnHasGeneric = new HashMap<>(); - @BeforeEach - void setup() throws NoSuchMethodException { - getAge = TestBean.class.getMethod("getAge"); - setAge = TestBean.class.getMethod("setAge", int.class); - setSomeNumber = TestBean.class.getMethod("setSomeNumber", Number.class); - + AspectJExpressionPointcutTests() throws NoSuchMethodException { // Assumes no overloading for (Method method : HasGeneric.class.getMethods()) { - methodsOnHasGeneric.put(method.getName(), method); + this.methodsOnHasGeneric.put(method.getName(), method); } } @Test - void testMatchExplicit() { + void matchExplicit() { String expression = "execution(int org.springframework.beans.testfixture.beans.TestBean.getAge())"; Pointcut pointcut = getPointcut(expression); @@ -91,7 +83,7 @@ class AspectJExpressionPointcutTests { } @Test - void testMatchWithTypePattern() { + void matchWithTypePattern() { String expression = "execution(* *..TestBean.*Age(..))"; Pointcut pointcut = getPointcut(expression); @@ -110,12 +102,12 @@ class AspectJExpressionPointcutTests { @Test - void testThis() throws SecurityException, NoSuchMethodException{ + void thisCase() throws SecurityException, NoSuchMethodException{ testThisOrTarget("this"); } @Test - void testTarget() throws SecurityException, NoSuchMethodException { + void target() throws SecurityException, NoSuchMethodException { testThisOrTarget("target"); } @@ -139,12 +131,12 @@ class AspectJExpressionPointcutTests { } @Test - void testWithinRootPackage() throws SecurityException, NoSuchMethodException { + void withinRootPackage() throws SecurityException, NoSuchMethodException { testWithinPackage(false); } @Test - void testWithinRootAndSubpackages() throws SecurityException, NoSuchMethodException { + void withinRootAndSubpackages() throws SecurityException, NoSuchMethodException { testWithinPackage(true); } @@ -168,7 +160,7 @@ class AspectJExpressionPointcutTests { } @Test - void testFriendlyErrorOnNoLocationClassMatching() { + void friendlyErrorOnNoLocationClassMatching() { AspectJExpressionPointcut pc = new AspectJExpressionPointcut(); assertThatIllegalStateException() .isThrownBy(() -> pc.getClassFilter().matches(ITestBean.class)) @@ -176,7 +168,7 @@ class AspectJExpressionPointcutTests { } @Test - void testFriendlyErrorOnNoLocation2ArgMatching() { + void friendlyErrorOnNoLocation2ArgMatching() { AspectJExpressionPointcut pc = new AspectJExpressionPointcut(); assertThatIllegalStateException() .isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class)) @@ -184,7 +176,7 @@ class AspectJExpressionPointcutTests { } @Test - void testFriendlyErrorOnNoLocation3ArgMatching() { + void friendlyErrorOnNoLocation3ArgMatching() { AspectJExpressionPointcut pc = new AspectJExpressionPointcut(); assertThatIllegalStateException() .isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class, (Object[]) null)) @@ -193,7 +185,7 @@ class AspectJExpressionPointcutTests { @Test - void testMatchWithArgs() { + void matchWithArgs() { String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number)) && args(Double)"; Pointcut pointcut = getPointcut(expression); @@ -214,7 +206,7 @@ class AspectJExpressionPointcutTests { } @Test - void testSimpleAdvice() { + void simpleAdvice() { String expression = "execution(int org.springframework.beans.testfixture.beans.TestBean.getAge())"; CallCountingInterceptor interceptor = new CallCountingInterceptor(); TestBean testBean = getAdvisedProxy(expression, interceptor); @@ -227,7 +219,7 @@ class AspectJExpressionPointcutTests { } @Test - void testDynamicMatchingProxy() { + void dynamicMatchingProxy() { String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number)) && args(Double)"; CallCountingInterceptor interceptor = new CallCountingInterceptor(); TestBean testBean = getAdvisedProxy(expression, interceptor); @@ -241,7 +233,7 @@ class AspectJExpressionPointcutTests { } @Test - void testInvalidExpression() { + void invalidExpression() { String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number) && args(Double)"; assertThat(getPointcut(expression).getClassFilter().matches(Object.class)).isFalse(); } @@ -271,20 +263,20 @@ class AspectJExpressionPointcutTests { } @Test - void testWithUnsupportedPointcutPrimitive() { + void withUnsupportedPointcutPrimitive() { String expression = "call(int org.springframework.beans.testfixture.beans.TestBean.getAge())"; assertThat(getPointcut(expression).getClassFilter().matches(Object.class)).isFalse(); } @Test - void testAndSubstitution() { + void andSubstitution() { AspectJExpressionPointcut pc = getPointcut("execution(* *(..)) and args(String)"); String expr = pc.getPointcutExpression().getPointcutExpression(); assertThat(expr).isEqualTo("execution(* *(..)) && args(String)"); } @Test - void testMultipleAndSubstitutions() { + void multipleAndSubstitutions() { AspectJExpressionPointcut pc = getPointcut("execution(* *(..)) and args(String) and this(Object)"); String expr = pc.getPointcutExpression().getPointcutExpression(); assertThat(expr).isEqualTo("execution(* *(..)) && args(String) && this(Object)"); @@ -297,7 +289,7 @@ class AspectJExpressionPointcutTests { } @Test - void testMatchGenericArgument() { + void matchGenericArgument() { String expression = "execution(* set*(java.util.List) )"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -316,7 +308,7 @@ class AspectJExpressionPointcutTests { } @Test - void testMatchVarargs() throws Exception { + void matchVarargs() throws Exception { @SuppressWarnings("unused") class MyTemplate { @@ -342,19 +334,19 @@ class AspectJExpressionPointcutTests { } @Test - void testMatchAnnotationOnClassWithAtWithin() throws Exception { + void matchAnnotationOnClassWithAtWithin() throws Exception { String expression = "@within(test.annotation.transaction.Tx)"; testMatchAnnotationOnClass(expression); } @Test - void testMatchAnnotationOnClassWithoutBinding() throws Exception { + void matchAnnotationOnClassWithoutBinding() throws Exception { String expression = "within(@test.annotation.transaction.Tx *)"; testMatchAnnotationOnClass(expression); } @Test - void testMatchAnnotationOnClassWithSubpackageWildcard() throws Exception { + void matchAnnotationOnClassWithSubpackageWildcard() throws Exception { String expression = "within(@(test.annotation..*) *)"; AspectJExpressionPointcut springAnnotatedPc = testMatchAnnotationOnClass(expression); assertThat(springAnnotatedPc.matches(TestBean.class.getMethod("setName", String.class), TestBean.class)).isFalse(); @@ -366,7 +358,7 @@ class AspectJExpressionPointcutTests { } @Test - void testMatchAnnotationOnClassWithExactPackageWildcard() throws Exception { + void matchAnnotationOnClassWithExactPackageWildcard() throws Exception { String expression = "within(@(test.annotation.transaction.*) *)"; testMatchAnnotationOnClass(expression); } @@ -384,7 +376,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnMethodWithFQN() throws Exception { + void annotationOnMethodWithFQN() throws Exception { String expression = "@annotation(test.annotation.transaction.Tx)"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -398,7 +390,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnCglibProxyMethod() throws Exception { + void annotationOnCglibProxyMethod() throws Exception { String expression = "@annotation(test.annotation.transaction.Tx)"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -410,7 +402,7 @@ class AspectJExpressionPointcutTests { } @Test - void testNotAnnotationOnCglibProxyMethod() throws Exception { + void notAnnotationOnCglibProxyMethod() throws Exception { String expression = "!@annotation(test.annotation.transaction.Tx)"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -422,7 +414,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnDynamicProxyMethod() throws Exception { + void annotationOnDynamicProxyMethod() throws Exception { String expression = "@annotation(test.annotation.transaction.Tx)"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -434,7 +426,7 @@ class AspectJExpressionPointcutTests { } @Test - void testNotAnnotationOnDynamicProxyMethod() throws Exception { + void notAnnotationOnDynamicProxyMethod() throws Exception { String expression = "!@annotation(test.annotation.transaction.Tx)"; AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(expression); @@ -446,7 +438,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnMethodWithWildcard() throws Exception { + void annotationOnMethodWithWildcard() throws Exception { String expression = "execution(@(test.annotation..*) * *(..))"; AspectJExpressionPointcut anySpringMethodAnnotation = new AspectJExpressionPointcut(); anySpringMethodAnnotation.setExpression(expression); @@ -462,7 +454,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnMethodArgumentsWithFQN() throws Exception { + void annotationOnMethodArgumentsWithFQN() throws Exception { String expression = "@args(*, test.annotation.EmptySpringAnnotation))"; AspectJExpressionPointcut takesSpringAnnotatedArgument2 = new AspectJExpressionPointcut(); takesSpringAnnotatedArgument2.setExpression(expression); @@ -491,7 +483,7 @@ class AspectJExpressionPointcutTests { } @Test - void testAnnotationOnMethodArgumentsWithWildcards() throws Exception { + void annotationOnMethodArgumentsWithWildcards() throws Exception { String expression = "execution(* *(*, @(test..*) *))"; AspectJExpressionPointcut takesSpringAnnotatedArgument2 = new AspectJExpressionPointcut(); takesSpringAnnotatedArgument2.setExpression(expression); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java index eb3efe0a5ab..a74adc9f64f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; class BeanNamePointcutMatchingTests { @Test - void testMatchingPointcuts() { + void matchingPointcuts() { assertMatch("someName", "bean(someName)"); // Spring bean names are less restrictive compared to AspectJ names (methods, types etc.) @@ -66,7 +66,7 @@ class BeanNamePointcutMatchingTests { } @Test - void testNonMatchingPointcuts() { + void nonMatchingPointcuts() { assertMisMatch("someName", "bean(someNamex)"); assertMisMatch("someName", "bean(someX*Name)"); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index f239dff6df8..37158f7c02c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -59,7 +59,7 @@ class MethodInvocationProceedingJoinPointTests { } @Test - void testCanGetMethodSignatureFromJoinPoint() { + void canGetMethodSignatureFromJoinPoint() { final Object raw = new TestBean(); // Will be set by advice during a method call final int newAge = 23; @@ -118,7 +118,7 @@ class MethodInvocationProceedingJoinPointTests { } @Test - void testCanGetSourceLocationFromJoinPoint() { + void canGetSourceLocationFromJoinPoint() { final Object raw = new TestBean(); ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); @@ -135,7 +135,7 @@ class MethodInvocationProceedingJoinPointTests { } @Test - void testCanGetStaticPartFromJoinPoint() { + void canGetStaticPartFromJoinPoint() { final Object raw = new TestBean(); ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index 7fe2ec7e885..e0452e03a83 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -43,14 +43,14 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class TrickyAspectJPointcutExpressionTests { @Test - void testManualProxyJavaWithUnconditionalPointcut() { + void manualProxyJavaWithUnconditionalPointcut() { TestService target = new TestServiceImpl(); LogUserAdvice logAdvice = new LogUserAdvice(); testAdvice(new DefaultPointcutAdvisor(logAdvice), logAdvice, target, "TestServiceImpl"); } @Test - void testManualProxyJavaWithStaticPointcut() { + void manualProxyJavaWithStaticPointcut() { TestService target = new TestServiceImpl(); LogUserAdvice logAdvice = new LogUserAdvice(); AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); @@ -59,7 +59,7 @@ class TrickyAspectJPointcutExpressionTests { } @Test - void testManualProxyJavaWithDynamicPointcut() { + void manualProxyJavaWithDynamicPointcut() { TestService target = new TestServiceImpl(); LogUserAdvice logAdvice = new LogUserAdvice(); AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); @@ -68,7 +68,7 @@ class TrickyAspectJPointcutExpressionTests { } @Test - void testManualProxyJavaWithDynamicPointcutAndProxyTargetClass() { + void manualProxyJavaWithDynamicPointcutAndProxyTargetClass() { TestService target = new TestServiceImpl(); LogUserAdvice logAdvice = new LogUserAdvice(); AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); @@ -77,7 +77,7 @@ class TrickyAspectJPointcutExpressionTests { } @Test - void testManualProxyJavaWithStaticPointcutAndTwoClassLoaders() throws Exception { + void manualProxyJavaWithStaticPointcutAndTwoClassLoaders() throws Exception { LogUserAdvice logAdvice = new LogUserAdvice(); AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java index 43525f18231..79b458d36dd 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java @@ -97,7 +97,7 @@ class TypePatternClassFilterTests { } @Test - void testEquals() { + void equals() { TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); TypePatternClassFilter filter3 = new TypePatternClassFilter("org.springframework.tests.*"); @@ -107,7 +107,7 @@ class TypePatternClassFilterTests { } @Test - void testHashCode() { + void hashCodeBehavior() { TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); TypePatternClassFilter filter3 = new TypePatternClassFilter("org.springframework.tests.*"); @@ -117,7 +117,7 @@ class TypePatternClassFilterTests { } @Test - void testToString() { + void toStringOutput() { TypePatternClassFilter filter1 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); TypePatternClassFilter filter2 = new TypePatternClassFilter("org.springframework.beans.testfixture.beans.*"); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index 0726e37289a..58f8937c613 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -39,7 +39,7 @@ class AspectJPointcutAdvisorTests { @Test - void testSingleton() throws SecurityException, NoSuchMethodException { + void singleton() throws SecurityException, NoSuchMethodException { AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(CommonExpressions.MATCH_ALL_METHODS); @@ -53,7 +53,7 @@ class AspectJPointcutAdvisorTests { } @Test - void testPerTarget() throws SecurityException, NoSuchMethodException { + void perTarget() throws SecurityException, NoSuchMethodException { AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut(); ajexp.setExpression(CommonExpressions.MATCH_ALL_METHODS); @@ -76,13 +76,13 @@ class AspectJPointcutAdvisorTests { } @Test - void testPerCflowTarget() { + void perCflowTarget() { assertThatExceptionOfType(AopConfigException.class).isThrownBy(() -> testIllegalInstantiationModel(AbstractAspectJAdvisorFactoryTests.PerCflowAspect.class)); } @Test - void testPerCflowBelowTarget() { + void perCflowBelowTarget() { assertThatExceptionOfType(AopConfigException.class).isThrownBy(() -> testIllegalInstantiationModel(AbstractAspectJAdvisorFactoryTests.PerCflowBelowAspect.class)); } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java index 4c7df6db89d..4abce082d09 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java @@ -39,13 +39,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class AspectProxyFactoryTests { @Test - void testWithNonAspect() { + void withNonAspect() { AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean()); assertThatIllegalArgumentException().isThrownBy(() -> proxyFactory.addAspect(TestBean.class)); } @Test - void testWithSimpleAspect() { + void withSimpleAspect() { TestBean bean = new TestBean(); bean.setAge(2); AspectJProxyFactory proxyFactory = new AspectJProxyFactory(bean); @@ -55,7 +55,7 @@ class AspectProxyFactoryTests { } @Test - void testWithPerThisAspect() { + void withPerThisAspect() { TestBean bean1 = new TestBean(); TestBean bean2 = new TestBean(); @@ -75,14 +75,14 @@ class AspectProxyFactoryTests { } @Test - void testWithInstanceWithNonAspect() { + void withInstanceWithNonAspect() { AspectJProxyFactory pf = new AspectJProxyFactory(); assertThatIllegalArgumentException().isThrownBy(() -> pf.addAspect(new TestBean())); } @Test @SuppressWarnings("unchecked") - void testSerializable() throws Exception { + void serializable() throws Exception { AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean()); proxyFactory.addAspect(LoggingAspectOnVarargs.class); ITestBean proxy = proxyFactory.getProxy(); @@ -92,7 +92,7 @@ class AspectProxyFactoryTests { } @Test - void testWithInstance() throws Exception { + void withInstance() throws Exception { MultiplyReturnValue aspect = new MultiplyReturnValue(); int multiple = 3; aspect.setMultiple(multiple); @@ -111,14 +111,14 @@ class AspectProxyFactoryTests { } @Test - void testWithNonSingletonAspectInstance() { + void withNonSingletonAspectInstance() { AspectJProxyFactory pf = new AspectJProxyFactory(); assertThatIllegalArgumentException().isThrownBy(() -> pf.addAspect(new PerThisAspect())); } @Test // SPR-13328 @SuppressWarnings("unchecked") - public void testProxiedVarargsWithEnumArray() { + void proxiedVarargsWithEnumArray() { AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean()); proxyFactory.addAspect(LoggingAspectOnVarargs.class); ITestBean proxy = proxyFactory.getProxy(); @@ -127,7 +127,7 @@ class AspectProxyFactoryTests { @Test // SPR-13328 @SuppressWarnings("unchecked") - public void testUnproxiedVarargsWithEnumArray() { + void unproxiedVarargsWithEnumArray() { AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean()); proxyFactory.addAspect(LoggingAspectOnSetter.class); ITestBean proxy = proxyFactory.getProxy(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java index 0fe1cee5e20..500e0ba0d86 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java @@ -56,7 +56,7 @@ class AspectJNamespaceHandlerTests { } @Test - void testRegisterAutoProxyCreator() { + void registerAutoProxyCreator() { AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(this.parserContext, null); assertThat(registry.getBeanDefinitionCount()).as("Incorrect number of definitions registered").isEqualTo(1); @@ -65,7 +65,7 @@ class AspectJNamespaceHandlerTests { } @Test - void testRegisterAspectJAutoProxyCreator() { + void registerAspectJAutoProxyCreator() { AopNamespaceUtils.registerAspectJAutoProxyCreatorIfNecessary(this.parserContext, null); assertThat(registry.getBeanDefinitionCount()).as("Incorrect number of definitions registered").isEqualTo(1); @@ -77,7 +77,7 @@ class AspectJNamespaceHandlerTests { } @Test - void testRegisterAspectJAutoProxyCreatorWithExistingAutoProxyCreator() { + void registerAspectJAutoProxyCreatorWithExistingAutoProxyCreator() { AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(this.parserContext, null); assertThat(registry.getBeanDefinitionCount()).isEqualTo(1); @@ -89,7 +89,7 @@ class AspectJNamespaceHandlerTests { } @Test - void testRegisterAutoProxyCreatorWhenAspectJAutoProxyCreatorAlreadyExists() { + void registerAutoProxyCreatorWhenAspectJAutoProxyCreatorAlreadyExists() { AopNamespaceUtils.registerAspectJAutoProxyCreatorIfNecessary(this.parserContext, null); assertThat(registry.getBeanDefinitionCount()).isEqualTo(1); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java index e2909d020b1..28d04fd12fc 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java @@ -65,7 +65,7 @@ class AspectJPrecedenceComparatorTests { @Test - void testSameAspectNoAfterAdvice() { + void sameAspectNoAfterAdvice() { Advisor advisor1 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 sorted before advisor2").isEqualTo(-1); @@ -76,7 +76,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testSameAspectAfterAdvice() { + void sameAspectAfterAdvice() { Advisor advisor1 = createAspectJAfterAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJAroundAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor2 sorted before advisor1").isEqualTo(1); @@ -87,14 +87,14 @@ class AspectJPrecedenceComparatorTests { } @Test - void testSameAspectOneOfEach() { + void sameAspectOneOfEach() { Advisor advisor1 = createAspectJAfterAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 and advisor2 not comparable").isEqualTo(1); } @Test - void testSameAdvisorPrecedenceDifferentAspectNoAfterAdvice() { + void sameAdvisorPrecedenceDifferentAspectNoAfterAdvice() { Advisor advisor1 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("nothing to say about order here").isEqualTo(0); @@ -105,7 +105,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testSameAdvisorPrecedenceDifferentAspectAfterAdvice() { + void sameAdvisorPrecedenceDifferentAspectAfterAdvice() { Advisor advisor1 = createAspectJAfterAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJAroundAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("nothing to say about order here").isEqualTo(0); @@ -116,7 +116,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testHigherAdvisorPrecedenceNoAfterAdvice() { + void higherAdvisorPrecedenceNoAfterAdvice() { Advisor advisor1 = createSpringAOPBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER); Advisor advisor2 = createAspectJBeforeAdvice(LOW_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 sorted before advisor2").isEqualTo(-1); @@ -127,7 +127,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testHigherAdvisorPrecedenceAfterAdvice() { + void higherAdvisorPrecedenceAfterAdvice() { Advisor advisor1 = createAspectJAfterAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJAroundAdvice(LOW_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 sorted before advisor2").isEqualTo(-1); @@ -138,7 +138,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testLowerAdvisorPrecedenceNoAfterAdvice() { + void lowerAdvisorPrecedenceNoAfterAdvice() { Advisor advisor1 = createAspectJBeforeAdvice(LOW_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJBeforeAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 sorted after advisor2").isEqualTo(1); @@ -149,7 +149,7 @@ class AspectJPrecedenceComparatorTests { } @Test - void testLowerAdvisorPrecedenceAfterAdvice() { + void lowerAdvisorPrecedenceAfterAdvice() { Advisor advisor1 = createAspectJAfterAdvice(LOW_PRECEDENCE_ADVISOR_ORDER, EARLY_ADVICE_DECLARATION_ORDER, "someAspect"); Advisor advisor2 = createAspectJAroundAdvice(HIGH_PRECEDENCE_ADVISOR_ORDER, LATE_ADVICE_DECLARATION_ORDER, "someOtherAspect"); assertThat(this.comparator.compare(advisor1, advisor2)).as("advisor1 sorted after advisor2").isEqualTo(1); diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java index b0343ed94f9..f69e0f1589f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; class MethodInvocationTests { @Test - void testValidInvocation() throws Throwable { + void validInvocation() throws Throwable { Method method = Object.class.getMethod("hashCode"); Object proxy = new Object(); Object returnValue = new Object(); @@ -49,7 +49,7 @@ class MethodInvocationTests { * toString on target can cause failure. */ @Test - void testToStringDoesntHitTarget() throws Throwable { + void toStringDoesntHitTarget() throws Throwable { Object target = new TestBean() { @Override public String toString() { diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java index 9294569558c..0cc525d3095 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java @@ -36,7 +36,7 @@ class NullPrimitiveTests { } @Test - void testNullPrimitiveWithJdkProxy() { + void nullPrimitiveWithJdkProxy() { class SimpleFoo implements Foo { @Override @@ -62,7 +62,7 @@ class NullPrimitiveTests { } @Test - void testNullPrimitiveWithCglibProxy() { + void nullPrimitiveWithCglibProxy() { Bar target = new Bar(); ProxyFactory factory = new ProxyFactory(target); diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java index 6bb56011466..d82a4957b6d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java @@ -38,7 +38,7 @@ class PrototypeTargetTests { @Test - void testPrototypeProxyWithPrototypeTarget() { + void prototypeProxyWithPrototypeTarget() { TestBeanImpl.constructionCount = 0; DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); @@ -52,7 +52,7 @@ class PrototypeTargetTests { } @Test - void testSingletonProxyWithPrototypeTarget() { + void singletonProxyWithPrototypeTarget() { TestBeanImpl.constructionCount = 0; DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); 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 3eb0c951e93..3908caf8ac5 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 @@ -40,14 +40,14 @@ import static org.mockito.Mockito.mock; class ThrowsAdviceInterceptorTests { @Test - void testNoHandlerMethods() { + void noHandlerMethods() { // should require one handler method at least assertThatExceptionOfType(AopConfigException.class).isThrownBy(() -> new ThrowsAdviceInterceptor(new Object())); } @Test - void testNotInvoked() throws Throwable { + void notInvoked() throws Throwable { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); Object ret = new Object(); @@ -58,7 +58,7 @@ class ThrowsAdviceInterceptorTests { } @Test - void testNoHandlerMethodForThrowable() throws Throwable { + void noHandlerMethodForThrowable() throws Throwable { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); assertThat(ti.getHandlerMethodCount()).isEqualTo(2); @@ -70,7 +70,7 @@ class ThrowsAdviceInterceptorTests { } @Test - void testCorrectHandlerUsed() throws Throwable { + void correctHandlerUsed() throws Throwable { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); FileNotFoundException ex = new FileNotFoundException(); @@ -84,7 +84,7 @@ class ThrowsAdviceInterceptorTests { } @Test - void testCorrectHandlerUsedForSubclass() throws Throwable { + void correctHandlerUsedForSubclass() throws Throwable { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); // Extends RemoteException @@ -97,7 +97,7 @@ class ThrowsAdviceInterceptorTests { } @Test - void testHandlerMethodThrowsException() throws Throwable { + void handlerMethodThrowsException() throws Throwable { final Throwable t = new Throwable(); MyThrowsHandler th = new MyThrowsHandler() { 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 15093f5b1bd..32949c7bec8 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 @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; class DebugInterceptorTests { @Test - void testSunnyDayPathLogsCorrectly() throws Throwable { + void sunnyDayPathLogsCorrectly() throws Throwable { MethodInvocation methodInvocation = mock(); Log log = mock(); @@ -52,7 +52,7 @@ class DebugInterceptorTests { } @Test - void testExceptionPathStillLogsCorrectly() throws Throwable { + void exceptionPathStillLogsCorrectly() throws Throwable { MethodInvocation methodInvocation = mock(); IllegalArgumentException exception = new IllegalArgumentException(); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index 419bfa50e28..7e81831b6f3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -46,7 +46,7 @@ class ExposeBeanNameAdvisorsTests { } @Test - void testNoIntroduction() { + void noIntroduction() { String beanName = "foo"; TestBean target = new RequiresBeanNameBoundTestBean(beanName); ProxyFactory pf = new ProxyFactory(target); @@ -61,7 +61,7 @@ class ExposeBeanNameAdvisorsTests { } @Test - void testWithIntroduction() { + void withIntroduction() { String beanName = "foo"; TestBean target = new RequiresBeanNameBoundTestBean(beanName); ProxyFactory pf = new ProxyFactory(target); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java index 3dde3660ff0..c745d5eefeb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java @@ -34,7 +34,7 @@ import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifie class ExposeInvocationInterceptorTests { @Test - void testXmlConfig() { + void xmlConfig() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( qualifiedResource(ExposeInvocationInterceptorTests.class, "context.xml")); 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 0e00f06d8de..adce49ea081 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 @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; class PerformanceMonitorInterceptorTests { @Test - void testSuffixAndPrefixAssignment() { + void suffixAndPrefixAssignment() { PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(); assertThat(interceptor.getPrefix()).isNotNull(); @@ -49,7 +49,7 @@ class PerformanceMonitorInterceptorTests { } @Test - void testSunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable { + void sunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable { MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); @@ -62,7 +62,7 @@ class PerformanceMonitorInterceptorTests { } @Test - void testExceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable { + void exceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable { MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); 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 378bcd85bb9..e95b8b8db2f 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 @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; class SimpleTraceInterceptorTests { @Test - void testSunnyDayPathLogsCorrectly() throws Throwable { + void sunnyDayPathLogsCorrectly() throws Throwable { MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); given(mi.getThis()).willReturn(this); @@ -51,7 +51,7 @@ class SimpleTraceInterceptorTests { } @Test - void testExceptionPathStillLogsCorrectly() throws Throwable { + void exceptionPathStillLogsCorrectly() throws Throwable { MethodInvocation mi = mock(); given(mi.getMethod()).willReturn(String.class.getMethod("toString")); given(mi.getThis()).willReturn(this); 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 dad5fb59187..7b5ee97bcc0 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 @@ -35,25 +35,25 @@ class DefaultScopedObjectTests { @Test - void testCtorWithNullBeanFactory() { + void ctorWithNullBeanFactory() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultScopedObject(null, GOOD_BEAN_NAME)); } @Test - void testCtorWithNullTargetBeanName() { + void ctorWithNullTargetBeanName() { assertThatIllegalArgumentException().isThrownBy(() -> testBadTargetBeanName(null)); } @Test - void testCtorWithEmptyTargetBeanName() { + void ctorWithEmptyTargetBeanName() { assertThatIllegalArgumentException().isThrownBy(() -> testBadTargetBeanName("")); } @Test - void testCtorWithJustWhitespacedTargetBeanName() { + void ctorWithJustWhitespacedTargetBeanName() { assertThatIllegalArgumentException().isThrownBy(() -> testBadTargetBeanName(" ")); } diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java index 1092be3b4f4..66f6670c90f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java @@ -34,7 +34,7 @@ import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifie class ScopedProxyAutowireTests { @Test - void testScopedProxyInheritsAutowireCandidateFalse() { + void scopedProxyInheritsAutowireCandidateFalse() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireFalse.xml")); @@ -48,7 +48,7 @@ class ScopedProxyAutowireTests { } @Test - void testScopedProxyReplacesAutowireCandidateTrue() { + void scopedProxyReplacesAutowireCandidateTrue() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireTrue.xml")); diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java index 261e7a4178d..e6c55102d6c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AopUtilsTests { @Test - void testPointcutCanNeverApply() { + void pointcutCanNeverApply() { class TestPointcut extends StaticMethodMatcherPointcut { @Override public boolean matches(Method method, @Nullable Class clazzy) { @@ -58,13 +58,13 @@ class AopUtilsTests { } @Test - void testPointcutAlwaysApplies() { + void pointcutAlwaysApplies() { assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), Object.class)).isTrue(); assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), TestBean.class)).isTrue(); } @Test - void testPointcutAppliesToOneMethodOnObject() { + void pointcutAppliesToOneMethodOnObject() { class TestPointcut extends StaticMethodMatcherPointcut { @Override public boolean matches(Method method, @Nullable Class clazz) { @@ -84,7 +84,7 @@ class AopUtilsTests { * that's subverted the singleton construction limitation. */ @Test - void testCanonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception { + void canonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception { assertThat(SerializationTestUtils.serializeAndDeserialize(MethodMatcher.TRUE)).isSameAs(MethodMatcher.TRUE); assertThat(SerializationTestUtils.serializeAndDeserialize(ClassFilter.TRUE)).isSameAs(ClassFilter.TRUE); assertThat(SerializationTestUtils.serializeAndDeserialize(Pointcut.TRUE)).isSameAs(Pointcut.TRUE); @@ -95,7 +95,7 @@ class AopUtilsTests { } @Test - void testInvokeJoinpointUsingReflection() throws Throwable { + void invokeJoinpointUsingReflection() throws Throwable { String name = "foo"; TestBean testBean = new TestBean(name); Method method = ReflectionUtils.findMethod(TestBean.class, "getName"); diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java index ab0fa592490..e2a58d82909 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java @@ -58,14 +58,14 @@ class ComposablePointcutTests { @Test - void testMatchAll() throws NoSuchMethodException { + void matchAll() throws NoSuchMethodException { Pointcut pc = new ComposablePointcut(); assertThat(pc.getClassFilter().matches(Object.class)).isTrue(); assertThat(pc.getMethodMatcher().matches(Object.class.getMethod("hashCode"), Exception.class)).isTrue(); } @Test - void testFilterByClass() { + void filterByClass() { ComposablePointcut pc = new ComposablePointcut(); assertThat(pc.getClassFilter().matches(Object.class)).isTrue(); @@ -85,7 +85,7 @@ class ComposablePointcutTests { } @Test - void testUnionMethodMatcher() { + void unionMethodMatcher() { // Matches the getAge() method in any class ComposablePointcut pc = new ComposablePointcut(ClassFilter.TRUE, GET_AGE_METHOD_MATCHER); assertThat(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_ABSQUATULATE, TestBean.class)).isFalse(); @@ -108,7 +108,7 @@ class ComposablePointcutTests { } @Test - void testIntersectionMethodMatcher() { + void intersectionMethodMatcher() { ComposablePointcut pc = new ComposablePointcut(); assertThat(pc.getMethodMatcher().matches(PointcutsTests.TEST_BEAN_ABSQUATULATE, TestBean.class)).isTrue(); assertThat(pc.getMethodMatcher().matches(PointcutsTests.TEST_BEAN_GET_AGE, TestBean.class)).isTrue(); @@ -125,7 +125,7 @@ class ComposablePointcutTests { } @Test - void testEqualsAndHashCode() { + void equalsAndHashCode() { ComposablePointcut pc1 = new ComposablePointcut(); ComposablePointcut pc2 = new ComposablePointcut(); diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java index 864e87eb32b..30a05cd4288 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java @@ -152,7 +152,7 @@ class ControlFlowPointcutTests { } @Test - void testToString() { + void toStringOutput() { String pointcutType = ControlFlowPointcut.class.getName(); String componentType = MyComponent.class.getName(); 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 0bf73e0c400..b05a68ae801 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 @@ -47,14 +47,14 @@ import static org.mockito.Mockito.mock; class DelegatingIntroductionInterceptorTests { @Test - void testNullTarget() { + void nullTarget() { // Shouldn't accept null target assertThatIllegalArgumentException().isThrownBy(() -> new DelegatingIntroductionInterceptor(null)); } @Test - void testIntroductionInterceptorWithDelegation() { + void introductionInterceptorWithDelegation() { TestBean raw = new TestBean(); assertThat(raw).isNotInstanceOf(TimeStamped.class); ProxyFactory factory = new ProxyFactory(raw); @@ -70,7 +70,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testIntroductionInterceptorWithInterfaceHierarchy() { + void introductionInterceptorWithInterfaceHierarchy() { TestBean raw = new TestBean(); assertThat(raw).isNotInstanceOf(SubTimeStamped.class); ProxyFactory factory = new ProxyFactory(raw); @@ -86,7 +86,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testIntroductionInterceptorWithSuperInterface() { + void introductionInterceptorWithSuperInterface() { TestBean raw = new TestBean(); assertThat(raw).isNotInstanceOf(TimeStamped.class); ProxyFactory factory = new ProxyFactory(raw); @@ -103,7 +103,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testAutomaticInterfaceRecognitionInDelegate() throws Exception { + void automaticInterfaceRecognitionInDelegate() throws Exception { final long t = 1001L; class Tester implements TimeStamped, ITester { @Override @@ -133,7 +133,7 @@ class DelegatingIntroductionInterceptorTests { @Test - void testAutomaticInterfaceRecognitionInSubclass() throws Exception { + void automaticInterfaceRecognitionInSubclass() throws Exception { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester { @@ -178,7 +178,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testIntroductionInterceptorDoesNotReplaceToString() { + void introductionInterceptorDoesNotReplaceToString() { TestBean raw = new TestBean(); assertThat(raw).isNotInstanceOf(TimeStamped.class); ProxyFactory factory = new ProxyFactory(raw); @@ -199,7 +199,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testDelegateReturnsThisIsMassagedToReturnProxy() { + void delegateReturnsThisIsMassagedToReturnProxy() { NestedTestBean target = new NestedTestBean(); String company = "Interface21"; target.setCompany(company); @@ -220,7 +220,7 @@ class DelegatingIntroductionInterceptorTests { } @Test - void testSerializableDelegatingIntroductionInterceptorSerializable() throws Exception { + void serializableDelegatingIntroductionInterceptorSerializable() throws Exception { SerializablePerson serializableTarget = new SerializablePerson(); String name = "Tony"; serializableTarget.setName("Tony"); @@ -245,7 +245,7 @@ class DelegatingIntroductionInterceptorTests { // Test when target implements the interface: should get interceptor by preference. @Test - void testIntroductionMasksTargetImplementation() { + void introductionMasksTargetImplementation() { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped { diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java index 45affd93bee..e37e932fb13 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java @@ -56,19 +56,19 @@ class MethodMatchersTests { @Test - void testDefaultMatchesAll() { + void defaultMatchesAll() { MethodMatcher defaultMm = MethodMatcher.TRUE; assertThat(defaultMm.matches(EXCEPTION_GETMESSAGE, Exception.class)).isTrue(); assertThat(defaultMm.matches(ITESTBEAN_SETAGE, TestBean.class)).isTrue(); } @Test - void testMethodMatcherTrueSerializable() throws Exception { + void methodMatcherTrueSerializable() throws Exception { assertThat(MethodMatcher.TRUE).isSameAs(SerializationTestUtils.serializeAndDeserialize(MethodMatcher.TRUE)); } @Test - void testSingle() { + void single() { MethodMatcher defaultMm = MethodMatcher.TRUE; assertThat(defaultMm.matches(EXCEPTION_GETMESSAGE, Exception.class)).isTrue(); assertThat(defaultMm.matches(ITESTBEAN_SETAGE, TestBean.class)).isTrue(); @@ -80,7 +80,7 @@ class MethodMatchersTests { @Test - void testDynamicAndStaticMethodMatcherIntersection() { + void dynamicAndStaticMethodMatcherIntersection() { MethodMatcher mm1 = MethodMatcher.TRUE; MethodMatcher mm2 = new TestDynamicMethodMatcherWhichMatches(); MethodMatcher intersection = MethodMatchers.intersection(mm1, mm2); @@ -95,7 +95,7 @@ class MethodMatchersTests { } @Test - void testStaticMethodMatcherUnion() { + void staticMethodMatcherUnion() { MethodMatcher getterMatcher = new StartsWithMatcher("get"); MethodMatcher setterMatcher = new StartsWithMatcher("set"); MethodMatcher union = MethodMatchers.union(getterMatcher, setterMatcher); @@ -107,7 +107,7 @@ class MethodMatchersTests { } @Test - void testUnionEquals() { + void unionEquals() { MethodMatcher first = MethodMatchers.union(MethodMatcher.TRUE, MethodMatcher.TRUE); MethodMatcher second = new ComposablePointcut(MethodMatcher.TRUE).union(new ComposablePointcut(MethodMatcher.TRUE)).getMethodMatcher(); assertThat(first).isEqualTo(second); diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java index fc58829238c..3049c38310d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java @@ -120,7 +120,7 @@ class PointcutsTests { @Test - void testTrue() { + void trueCase() { assertThat(Pointcuts.matches(Pointcut.TRUE, TEST_BEAN_SET_AGE, TestBean.class, 6)).isTrue(); assertThat(Pointcuts.matches(Pointcut.TRUE, TEST_BEAN_GET_AGE, TestBean.class)).isTrue(); assertThat(Pointcuts.matches(Pointcut.TRUE, TEST_BEAN_ABSQUATULATE, TestBean.class)).isTrue(); @@ -130,7 +130,7 @@ class PointcutsTests { } @Test - void testMatches() { + void matches() { assertThat(Pointcuts.matches(allClassSetterPointcut, TEST_BEAN_SET_AGE, TestBean.class, 6)).isTrue(); assertThat(Pointcuts.matches(allClassSetterPointcut, TEST_BEAN_GET_AGE, TestBean.class)).isFalse(); assertThat(Pointcuts.matches(allClassSetterPointcut, TEST_BEAN_ABSQUATULATE, TestBean.class)).isFalse(); @@ -143,7 +143,7 @@ class PointcutsTests { * Should match all setters and getters on any class */ @Test - void testUnionOfSettersAndGetters() { + void unionOfSettersAndGetters() { Pointcut union = Pointcuts.union(allClassGetterPointcut, allClassSetterPointcut); assertThat(Pointcuts.matches(union, TEST_BEAN_SET_AGE, TestBean.class, 6)).isTrue(); assertThat(Pointcuts.matches(union, TEST_BEAN_GET_AGE, TestBean.class)).isTrue(); @@ -151,7 +151,7 @@ class PointcutsTests { } @Test - void testUnionOfSpecificGetters() { + void unionOfSpecificGetters() { Pointcut union = Pointcuts.union(allClassGetAgePointcut, allClassGetNamePointcut); assertThat(Pointcuts.matches(union, TEST_BEAN_SET_AGE, TestBean.class, 6)).isFalse(); assertThat(Pointcuts.matches(union, TEST_BEAN_GET_AGE, TestBean.class)).isTrue(); @@ -175,7 +175,7 @@ class PointcutsTests { * Second one matches all getters in the MyTestBean class. TestBean getters shouldn't pass. */ @Test - void testUnionOfAllSettersAndSubclassSetters() { + void unionOfAllSettersAndSubclassSetters() { assertThat(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_SET_AGE, TestBean.class, 6)).isFalse(); assertThat(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_SET_AGE, MyTestBean.class, 6)).isTrue(); assertThat(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_GET_AGE, TestBean.class)).isFalse(); @@ -193,7 +193,7 @@ class PointcutsTests { * it's the union of allClassGetAge and subclass getters */ @Test - void testIntersectionOfSpecificGettersAndSubclassGetters() { + void intersectionOfSpecificGettersAndSubclassGetters() { assertThat(Pointcuts.matches(allClassGetAgePointcut, TEST_BEAN_GET_AGE, TestBean.class)).isTrue(); assertThat(Pointcuts.matches(allClassGetAgePointcut, TEST_BEAN_GET_AGE, MyTestBean.class)).isTrue(); assertThat(Pointcuts.matches(myTestBeanGetterPointcut, TEST_BEAN_GET_NAME, TestBean.class)).isFalse(); @@ -239,7 +239,7 @@ class PointcutsTests { * The intersection of these two pointcuts leaves nothing. */ @Test - void testSimpleIntersection() { + void simpleIntersection() { Pointcut intersection = Pointcuts.intersection(allClassGetterPointcut, allClassSetterPointcut); assertThat(Pointcuts.matches(intersection, TEST_BEAN_SET_AGE, TestBean.class, 6)).isFalse(); assertThat(Pointcuts.matches(intersection, TEST_BEAN_GET_AGE, TestBean.class)).isFalse(); diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java index 1c9e0ed968a..9c69cbd1c0e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java @@ -43,7 +43,7 @@ class RegexpMethodPointcutAdvisorIntegrationTests { @Test - void testSinglePattern() throws Throwable { + void singlePattern() throws Throwable { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); ITestBean advised = (ITestBean) bf.getBean("settersAdvised"); @@ -62,7 +62,7 @@ class RegexpMethodPointcutAdvisorIntegrationTests { } @Test - void testMultiplePatterns() throws Throwable { + void multiplePatterns() throws Throwable { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); // This is a CGLIB proxy, so we can proxy it to the target class @@ -86,7 +86,7 @@ class RegexpMethodPointcutAdvisorIntegrationTests { } @Test - void testSerialization() throws Throwable { + void serialization() throws Throwable { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT); // This is a CGLIB proxy, so we can proxy it to the target class diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java index af3efd55007..19ca266e39e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/RootClassFilterTests.java @@ -44,19 +44,19 @@ class RootClassFilterTests { } @Test - void testEquals() { + void equals() { assertThat(filter1).isEqualTo(filter2); assertThat(filter1).isNotEqualTo(filter3); } @Test - void testHashCode() { + void hashCodeBehavior() { assertThat(filter1.hashCode()).isEqualTo(filter2.hashCode()); assertThat(filter1.hashCode()).isNotEqualTo(filter3.hashCode()); } @Test - void testToString() { + void toStringOutput() { assertThat(filter1.toString()).isEqualTo("org.springframework.aop.support.RootClassFilter: java.lang.Exception"); assertThat(filter1.toString()).isEqualTo(filter2.toString()); } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java index 10c6500c019..572003c0662 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java @@ -36,7 +36,7 @@ class CommonsPool2TargetSourceProxyTests { qualifiedResource(CommonsPool2TargetSourceProxyTests.class, "context.xml"); @Test - void testProxy() { + void proxy() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); reader.loadBeanDefinitions(CONTEXT); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java index 41ada6d24c2..7c14e33d043 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java @@ -68,7 +68,7 @@ class HotSwappableTargetSourceTests { * Check it works like a normal invoker */ @Test - void testBasicFunctionality() { + void basicFunctionality() { SideEffectBean proxied = (SideEffectBean) beanFactory.getBean("swappable"); assertThat(proxied.getCount()).isEqualTo(INITIAL_COUNT); proxied.doWork(); @@ -80,7 +80,7 @@ class HotSwappableTargetSourceTests { } @Test - void testValidSwaps() { + void validSwaps() { SideEffectBean target1 = (SideEffectBean) beanFactory.getBean("target1"); SideEffectBean target2 = (SideEffectBean) beanFactory.getBean("target2"); @@ -107,17 +107,17 @@ class HotSwappableTargetSourceTests { } @Test - void testRejectsSwapToNull() { + void rejectsSwapToNull() { HotSwappableTargetSource swapper = (HotSwappableTargetSource) beanFactory.getBean("swapper"); assertThatIllegalArgumentException().as("Shouldn't be able to swap to invalid value").isThrownBy(() -> swapper.swap(null)) .withMessageContaining("null"); // It shouldn't be corrupted, it should still work - testBasicFunctionality(); + basicFunctionality(); } @Test - void testSerialization() throws Exception { + void serialization() throws Exception { SerializablePerson sp1 = new SerializablePerson(); sp1.setName("Tony"); SerializablePerson sp2 = new SerializablePerson(); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java index 1753a1c1c7a..b19ca043ce1 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; class LazyCreationTargetSourceTests { @Test - void testCreateLazy() { + void createLazy() { TargetSource targetSource = new AbstractLazyCreationTargetSource() { @Override protected Object createObject() { diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java index 62d81f4f6be..abba3ea1c09 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; class PrototypeBasedTargetSourceTests { @Test - void testSerializability() throws Exception { + void serializability() throws Exception { MutablePropertyValues tsPvs = new MutablePropertyValues(); tsPvs.add("targetBeanName", "person"); RootBeanDefinition tsBd = new RootBeanDefinition(TestTargetSource.class); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java index 47cb6ff7f7c..71009789431 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java @@ -52,7 +52,7 @@ class PrototypeTargetSourceTests { * With the singleton, there will be change. */ @Test - void testPrototypeAndSingletonBehaveDifferently() { + void prototypeAndSingletonBehaveDifferently() { SideEffectBean singleton = (SideEffectBean) beanFactory.getBean("singleton"); assertThat(singleton.getCount()).isEqualTo(INITIAL_COUNT); singleton.doWork(); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java index 20694fabf91..feb8c761864 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java @@ -60,7 +60,7 @@ class ThreadLocalTargetSourceTests { * with one another. */ @Test - void testUseDifferentManagedInstancesInSameThread() { + void useDifferentManagedInstancesInSameThread() { SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment"); assertThat(apartment.getCount()).isEqualTo(INITIAL_COUNT); apartment.doWork(); @@ -72,7 +72,7 @@ class ThreadLocalTargetSourceTests { } @Test - void testReuseInSameThread() { + void reuseInSameThread() { SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment"); assertThat(apartment.getCount()).isEqualTo(INITIAL_COUNT); apartment.doWork(); @@ -86,7 +86,7 @@ class ThreadLocalTargetSourceTests { * Relies on introduction. */ @Test - void testCanGetStatsViaMixin() { + void canGetStatsViaMixin() { ThreadLocalTargetSourceStats stats = (ThreadLocalTargetSourceStats) beanFactory.getBean("apartment"); // +1 because creating target for stats call counts assertThat(stats.getInvocationCount()).isEqualTo(1); @@ -104,7 +104,7 @@ class ThreadLocalTargetSourceTests { } @Test - void testNewThreadHasOwnInstance() throws InterruptedException { + void newThreadHasOwnInstance() throws InterruptedException { SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment"); assertThat(apartment.getCount()).isEqualTo(INITIAL_COUNT); apartment.doWork(); @@ -144,7 +144,7 @@ class ThreadLocalTargetSourceTests { * Test for SPR-1442. Destroyed target should re-associated with thread and not throw NPE. */ @Test - void testReuseDestroyedTarget() { + void reuseDestroyedTarget() { ThreadLocalTargetSource source = (ThreadLocalTargetSource)this.beanFactory.getBean("threadLocalTs"); // try first time diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index a6d8699d1be..69bc51b4a1a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -33,7 +33,7 @@ class RefreshableTargetSourceTests { * Test what happens when checking for refresh but not refreshing object. */ @Test - void testRefreshCheckWithNonRefresh() throws Exception { + void refreshCheckWithNonRefresh() throws Exception { CountingRefreshableTargetSource ts = new CountingRefreshableTargetSource(); ts.setRefreshCheckDelay(0); @@ -49,7 +49,7 @@ class RefreshableTargetSourceTests { * Test what happens when checking for refresh and refresh occurs. */ @Test - void testRefreshCheckWithRefresh() throws Exception { + void refreshCheckWithRefresh() throws Exception { CountingRefreshableTargetSource ts = new CountingRefreshableTargetSource(true); ts.setRefreshCheckDelay(0); @@ -65,7 +65,7 @@ class RefreshableTargetSourceTests { * Test what happens when no refresh occurs. */ @Test - void testWithNoRefreshCheck() { + void withNoRefreshCheck() { CountingRefreshableTargetSource ts = new CountingRefreshableTargetSource(true); ts.setRefreshCheckDelay(-1); @@ -78,7 +78,7 @@ class RefreshableTargetSourceTests { @Test @EnabledForTestGroups(LONG_RUNNING) - public void testRefreshOverTime() throws Exception { + void refreshOverTime() throws Exception { CountingRefreshableTargetSource ts = new CountingRefreshableTargetSource(true); ts.setRefreshCheckDelay(100); diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java index badc7733590..f5fadec2d15 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; * @author Phillip Webb * @author Stephane Nicoll */ -public abstract class AbstractCacheAnnotationTests { +abstract class AbstractCacheAnnotationTests { protected ConfigurableApplicationContext ctx; @@ -67,7 +67,7 @@ public abstract class AbstractCacheAnnotationTests { @BeforeEach - public void setup() { + void setup() { this.ctx = getApplicationContext(); this.cs = ctx.getBean("service", CacheableService.class); this.ccs = ctx.getBean("classService", CacheableService.class); @@ -78,7 +78,7 @@ public abstract class AbstractCacheAnnotationTests { } @AfterEach - public void close() { + void close() { if (this.ctx != null) { this.ctx.close(); } @@ -555,133 +555,134 @@ public abstract class AbstractCacheAnnotationTests { assertThat(secondary.get(key2)).isNull(); } + @Test - void testCacheable() { + void cacheable() { testCacheable(this.cs); } @Test - void testCacheableNull() { + void cacheableNull() { testCacheableNull(this.cs); } @Test - void testCacheableSync() { + void cacheableSync() { testCacheableSync(this.cs); } @Test - void testCacheableSyncNull() { + void cacheableSyncNull() { testCacheableSyncNull(this.cs); } @Test - void testEvict() { + void evict() { testEvict(this.cs, true); } @Test - void testEvictEarly() { + void evictEarly() { testEvictEarly(this.cs); } @Test - void testEvictWithException() { + void evictWithException() { testEvictException(this.cs); } @Test - void testEvictAll() { + void evictAll() { testEvictAll(this.cs, true); } @Test - void testEvictAllEarly() { + void evictAllEarly() { testEvictAllEarly(this.cs); } @Test - void testEvictWithKey() { + void evictWithKey() { testEvictWithKey(this.cs); } @Test - void testEvictWithKeyEarly() { + void evictWithKeyEarly() { testEvictWithKeyEarly(this.cs); } @Test - void testConditionalExpression() { + void conditionalExpression() { testConditionalExpression(this.cs); } @Test - void testConditionalExpressionSync() { + void conditionalExpressionSync() { testConditionalExpressionSync(this.cs); } @Test - void testUnlessExpression() { + void unlessExpression() { testUnlessExpression(this.cs); } @Test - void testClassCacheUnlessExpression() { + void classCacheUnlessExpression() { testUnlessExpression(this.cs); } @Test - void testKeyExpression() { + void keyExpression() { testKeyExpression(this.cs); } @Test - void testVarArgsKey() { + void varArgsKey() { testVarArgsKey(this.cs); } @Test - void testClassCacheCacheable() { + void classCacheCacheable() { testCacheable(this.ccs); } @Test - void testClassCacheEvict() { + void classCacheEvict() { testEvict(this.ccs, true); } @Test - void testClassEvictEarly() { + void classEvictEarly() { testEvictEarly(this.ccs); } @Test - void testClassEvictAll() { + void classEvictAll() { testEvictAll(this.ccs, true); } @Test - void testClassEvictWithException() { + void classEvictWithException() { testEvictException(this.ccs); } @Test - void testClassCacheEvictWithWKey() { + void classCacheEvictWithWKey() { testEvictWithKey(this.ccs); } @Test - void testClassEvictWithKeyEarly() { + void classEvictWithKeyEarly() { testEvictWithKeyEarly(this.ccs); } @Test - void testNullValue() { + void nullValue() { testNullValue(this.cs); } @Test - void testClassNullValue() { + void classNullValue() { Object key = new Object(); assertThat(this.ccs.nullValue(key)).isNull(); int nr = this.ccs.nullInvocations().intValue(); @@ -694,27 +695,27 @@ public abstract class AbstractCacheAnnotationTests { } @Test - void testMethodName() { + void methodName() { testMethodName(this.cs, "name"); } @Test - void testClassMethodName() { + void classMethodName() { testMethodName(this.ccs, "nametestCache"); } @Test - void testRootVars() { + void rootVars() { testRootVars(this.cs); } @Test - void testClassRootVars() { + void classRootVars() { testRootVars(this.ccs); } @Test - void testCustomKeyGenerator() { + void customKeyGenerator() { Object param = new Object(); Object r1 = this.cs.customKeyGenerator(param); assertThat(this.cs.customKeyGenerator(param)).isSameAs(r1); @@ -725,14 +726,14 @@ public abstract class AbstractCacheAnnotationTests { } @Test - void testUnknownCustomKeyGenerator() { + void unknownCustomKeyGenerator() { Object param = new Object(); assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> this.cs.unknownCustomKeyGenerator(param)); } @Test - void testCustomCacheManager() { + void customCacheManager() { CacheManager customCm = this.ctx.getBean("customCacheManager", CacheManager.class); Object key = new Object(); Object r1 = this.cs.customCacheManager(key); @@ -743,139 +744,139 @@ public abstract class AbstractCacheAnnotationTests { } @Test - void testUnknownCustomCacheManager() { + void unknownCustomCacheManager() { Object param = new Object(); assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> this.cs.unknownCustomCacheManager(param)); } @Test - void testNullArg() { + void nullArg() { testNullArg(this.cs); } @Test - void testClassNullArg() { + void classNullArg() { testNullArg(this.ccs); } @Test - void testCheckedException() { + void checkedException() { testCheckedThrowable(this.cs); } @Test - void testClassCheckedException() { + void classCheckedException() { testCheckedThrowable(this.ccs); } @Test - void testCheckedExceptionSync() { + void checkedExceptionSync() { testCheckedThrowableSync(this.cs); } @Test - void testClassCheckedExceptionSync() { + void classCheckedExceptionSync() { testCheckedThrowableSync(this.ccs); } @Test - void testUncheckedException() { + void uncheckedException() { testUncheckedThrowable(this.cs); } @Test - void testClassUncheckedException() { + void classUncheckedException() { testUncheckedThrowable(this.ccs); } @Test - void testUncheckedExceptionSync() { + void uncheckedExceptionSync() { testUncheckedThrowableSync(this.cs); } @Test - void testClassUncheckedExceptionSync() { + void classUncheckedExceptionSync() { testUncheckedThrowableSync(this.ccs); } @Test - void testUpdate() { + void update() { testCacheUpdate(this.cs); } @Test - void testClassUpdate() { + void classUpdate() { testCacheUpdate(this.ccs); } @Test - void testConditionalUpdate() { + void conditionalUpdate() { testConditionalCacheUpdate(this.cs); } @Test - void testClassConditionalUpdate() { + void classConditionalUpdate() { testConditionalCacheUpdate(this.ccs); } @Test - void testMultiCache() { + void multiCache() { testMultiCache(this.cs); } @Test - void testClassMultiCache() { + void classMultiCache() { testMultiCache(this.ccs); } @Test - void testMultiEvict() { + void multiEvict() { testMultiEvict(this.cs); } @Test - void testClassMultiEvict() { + void classMultiEvict() { testMultiEvict(this.ccs); } @Test - void testMultiPut() { + void multiPut() { testMultiPut(this.cs); } @Test - void testClassMultiPut() { + void classMultiPut() { testMultiPut(this.ccs); } @Test - void testPutRefersToResult() { + void putRefersToResult() { testPutRefersToResult(this.cs); } @Test - void testClassPutRefersToResult() { + void classPutRefersToResult() { testPutRefersToResult(this.ccs); } @Test - void testMultiCacheAndEvict() { + void multiCacheAndEvict() { testMultiCacheAndEvict(this.cs); } @Test - void testClassMultiCacheAndEvict() { + void classMultiCacheAndEvict() { testMultiCacheAndEvict(this.ccs); } @Test - void testMultiConditionalCacheAndEvict() { + void multiConditionalCacheAndEvict() { testMultiConditionalCacheAndEvict(this.cs); } @Test - void testClassMultiConditionalCacheAndEvict() { + void classMultiConditionalCacheAndEvict() { testMultiConditionalCacheAndEvict(this.ccs); } diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJCacheAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJCacheAnnotationTests.java index 6926650d1fa..feee32a95df 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJCacheAnnotationTests.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJCacheAnnotationTests.java @@ -37,7 +37,7 @@ class AspectJCacheAnnotationTests extends AbstractCacheAnnotationTests { } @Test - void testKeyStrategy() { + void keyStrategy() { AnnotationCacheAspect aspect = ctx.getBean( "org.springframework.cache.config.internalCacheAspect", AnnotationCacheAspect.class); assertThat(aspect.getKeyGenerator()).isSameAs(ctx.getBean("keyGenerator")); diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java index 66258504c0a..49a76fe95e7 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java @@ -16,7 +16,7 @@ package org.springframework.cache.aspectj; -import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AutoClose; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -51,6 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ class AspectJEnableCachingIsolatedTests { + @AutoClose private ConfigurableApplicationContext ctx; @@ -58,23 +59,16 @@ class AspectJEnableCachingIsolatedTests { this.ctx = new AnnotationConfigApplicationContext(config); } - @AfterEach - public void closeContext() { - if (this.ctx != null) { - this.ctx.close(); - } - } - @Test - void testKeyStrategy() { + void keyStrategy() { load(EnableCachingConfig.class); AnnotationCacheAspect aspect = this.ctx.getBean(AnnotationCacheAspect.class); assertThat(aspect.getKeyGenerator()).isSameAs(this.ctx.getBean("keyGenerator", KeyGenerator.class)); } @Test - void testCacheErrorHandler() { + void cacheErrorHandler() { load(EnableCachingConfig.class); AnnotationCacheAspect aspect = this.ctx.getBean(AnnotationCacheAspect.class); assertThat(aspect.getErrorHandler()).isSameAs(this.ctx.getBean("errorHandler", CacheErrorHandler.class)); @@ -129,7 +123,7 @@ class AspectJEnableCachingIsolatedTests { @Test @Disabled("AspectJ has some sort of caching that makes this one fail") - public void emptyConfigSupport() { + void emptyConfigSupport() { load(EmptyConfigSupportConfig.class); AnnotationCacheAspect aspect = this.ctx.getBean(AnnotationCacheAspect.class); assertThat(aspect.getCacheResolver()).isNotNull(); @@ -284,4 +278,5 @@ class AspectJEnableCachingIsolatedTests { return new NamedCacheResolver(cacheManager(), "foo"); } } + } diff --git a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationDrivenBeanDefinitionParserTests.java b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationDrivenBeanDefinitionParserTests.java index 91ba17791bf..8bbf37c45af 100644 --- a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationDrivenBeanDefinitionParserTests.java @@ -56,7 +56,7 @@ class AnnotationDrivenBeanDefinitionParserTests { @Test @SuppressWarnings("rawtypes") - public void asyncPostProcessorExecutorReference() { + void asyncPostProcessorExecutorReference() { Object executor = context.getBean("testExecutor"); Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME); assertThat(((Supplier) new DirectFieldAccessor(aspect).getPropertyValue("defaultExecutor")).get()).isSameAs(executor); @@ -64,7 +64,7 @@ class AnnotationDrivenBeanDefinitionParserTests { @Test @SuppressWarnings("rawtypes") - public void asyncPostProcessorExceptionHandlerReference() { + void asyncPostProcessorExceptionHandlerReference() { Object exceptionHandler = context.getBean("testExceptionHandler"); Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME); assertThat(((Supplier) new DirectFieldAccessor(aspect).getPropertyValue("exceptionHandler")).get()).isSameAs(exceptionHandler); diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java index 0740533ace1..75297ae5723 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java @@ -50,13 +50,13 @@ class TransactionAspectTests { @BeforeEach - public void initContext() { + void initContext() { AnnotationTransactionAspect.aspectOf().setTransactionManager(txManager); } @Test - void testCommitOnAnnotatedClass() throws Throwable { + void commitOnAnnotatedClass() throws Throwable { txManager.clear(); assertThat(txManager.begun).isEqualTo(0); annotationOnlyOnClassWithNoInterface.echo(null); diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index a221cdc8f85..3a6d9b35632 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -375,7 +375,7 @@ abstract class AbstractPropertyAccessorTests { } @Test - void testErrorMessageOfNestedProperty() { + void errorMessageOfNestedProperty() { ITestBean target = new TestBean(); ITestBean child = new DifferentTestBean(); child.setName("test"); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java index b738d42a0b6..dcb5f186ed8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; class BeanWrapperEnumTests { @Test - void testCustomEnum() { + void customEnum() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnum", "VALUE_1"); @@ -42,7 +42,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumWithNull() { + void customEnumWithNull() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnum", null); @@ -50,7 +50,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumWithEmptyString() { + void customEnumWithEmptyString() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnum", ""); @@ -58,7 +58,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumArrayWithSingleValue() { + void customEnumArrayWithSingleValue() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumArray", "VALUE_1"); @@ -67,7 +67,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumArrayWithMultipleValues() { + void customEnumArrayWithMultipleValues() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumArray", new String[] {"VALUE_1", "VALUE_2"}); @@ -77,7 +77,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumArrayWithMultipleValuesAsCsv() { + void customEnumArrayWithMultipleValuesAsCsv() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumArray", "VALUE_1,VALUE_2"); @@ -87,7 +87,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumSetWithSingleValue() { + void customEnumSetWithSingleValue() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", "VALUE_1"); @@ -96,7 +96,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumSetWithMultipleValues() { + void customEnumSetWithMultipleValues() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"}); @@ -106,7 +106,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumSetWithMultipleValuesAsCsv() { + void customEnumSetWithMultipleValuesAsCsv() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2"); @@ -116,7 +116,7 @@ class BeanWrapperEnumTests { } @Test - void testCustomEnumSetWithGetterSetterMismatch() { + void customEnumSetWithGetterSetterMismatch() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"}); @@ -126,7 +126,7 @@ class BeanWrapperEnumTests { } @Test - void testStandardEnumSetWithMultipleValues() { + void standardEnumSetWithMultipleValues() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setConversionService(new DefaultConversionService()); @@ -138,7 +138,7 @@ class BeanWrapperEnumTests { } @Test - void testStandardEnumSetWithAutoGrowing() { + void standardEnumSetWithAutoGrowing() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setAutoGrowNestedPaths(true); @@ -148,7 +148,7 @@ class BeanWrapperEnumTests { } @Test - void testStandardEnumMapWithMultipleValues() { + void standardEnumMapWithMultipleValues() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setConversionService(new DefaultConversionService()); @@ -163,7 +163,7 @@ class BeanWrapperEnumTests { } @Test - void testStandardEnumMapWithAutoGrowing() { + void standardEnumMapWithAutoGrowing() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setAutoGrowNestedPaths(true); @@ -174,7 +174,7 @@ class BeanWrapperEnumTests { } @Test - void testNonPublicEnum() { + void nonPublicEnum() { NonPublicEnumHolder holder = new NonPublicEnumHolder(); BeanWrapper bw = new BeanWrapperImpl(holder); bw.setPropertyValue("nonPublicEnum", "VALUE_1"); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 2ff6d56d2ed..fa3a871c5cb 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.LIST; class BeanWrapperGenericsTests { @Test - void testGenericSet() { + void genericSet() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); Set input = new HashSet<>(); @@ -64,7 +64,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericLowerBoundedSet() { + void genericLowerBoundedSet() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, true)); @@ -77,7 +77,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericSetWithConversionFailure() { + void genericSetWithConversionFailure() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); Set input = new HashSet<>(); @@ -88,7 +88,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericList() throws Exception { + void genericList() throws Exception { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); List input = new ArrayList<>(); @@ -100,7 +100,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListElement() throws Exception { + void genericListElement() throws Exception { GenericBean gb = new GenericBean<>(); gb.setResourceList(new ArrayList<>()); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -109,7 +109,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMap() { + void genericMap() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); Map input = new HashMap<>(); @@ -121,7 +121,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapElement() { + void genericMapElement() { GenericBean gb = new GenericBean<>(); gb.setShortMap(new HashMap<>()); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -131,7 +131,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapWithKeyType() { + void genericMapWithKeyType() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); Map input = new HashMap<>(); @@ -143,7 +143,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapElementWithKeyType() { + void genericMapElementWithKeyType() { GenericBean gb = new GenericBean<>(); gb.setLongMap(new HashMap<>()); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -153,7 +153,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapWithCollectionValue() { + void genericMapWithCollectionValue() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); @@ -170,7 +170,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapElementWithCollectionValue() { + void genericMapElementWithCollectionValue() { GenericBean gb = new GenericBean<>(); gb.setCollectionMap(new HashMap<>()); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -182,7 +182,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapFromProperties() { + void genericMapFromProperties() { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); Properties input = new Properties(); @@ -194,7 +194,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfLists() { + void genericListOfLists() { GenericBean gb = new GenericBean<>(); List> list = new ArrayList<>(); list.add(new ArrayList<>()); @@ -206,7 +206,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfListsWithElementConversion() { + void genericListOfListsWithElementConversion() { GenericBean gb = new GenericBean<>(); List> list = new ArrayList<>(); list.add(new ArrayList<>()); @@ -218,7 +218,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfArrays() { + void genericListOfArrays() { GenericBean gb = new GenericBean<>(); ArrayList list = new ArrayList<>(); list.add(new String[] {"str1", "str2"}); @@ -230,7 +230,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfArraysWithElementConversion() { + void genericListOfArraysWithElementConversion() { GenericBean gb = new GenericBean<>(); ArrayList list = new ArrayList<>(); list.add(new String[] {"str1", "str2"}); @@ -243,7 +243,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfMaps() { + void genericListOfMaps() { GenericBean gb = new GenericBean<>(); List> list = new ArrayList<>(); list.add(new HashMap<>()); @@ -255,7 +255,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericListOfMapsWithElementConversion() { + void genericListOfMapsWithElementConversion() { GenericBean gb = new GenericBean<>(); List> list = new ArrayList<>(); list.add(new HashMap<>()); @@ -267,7 +267,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapOfMaps() { + void genericMapOfMaps() { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); map.put("mykey", new HashMap<>()); @@ -279,7 +279,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapOfMapsWithElementConversion() { + void genericMapOfMapsWithElementConversion() { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); map.put("mykey", new HashMap<>()); @@ -291,7 +291,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapOfLists() { + void genericMapOfLists() { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); map.put(1, new ArrayList<>()); @@ -303,7 +303,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericMapOfListsWithElementConversion() { + void genericMapOfListsWithElementConversion() { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); map.put(1, new ArrayList<>()); @@ -315,7 +315,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericTypeNestingMapOfInteger() { + void genericTypeNestingMapOfInteger() { Map map = new HashMap<>(); map.put("testKey", "100"); @@ -328,7 +328,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericTypeNestingMapOfListOfInteger() { + void genericTypeNestingMapOfListOfInteger() { Map> map = new HashMap<>(); List list = Arrays.asList("1", "2", "3"); map.put("testKey", list); @@ -343,7 +343,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericTypeNestingListOfMapOfInteger() { + void genericTypeNestingListOfMapOfInteger() { List> list = new ArrayList<>(); Map map = new HashMap<>(); map.put("testKey", "5"); @@ -359,7 +359,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericTypeNestingMapOfListOfListOfInteger() { + void genericTypeNestingMapOfListOfListOfInteger() { Map>> map = new HashMap<>(); List list = Arrays.asList("1", "2", "3"); map.put("testKey", Collections.singletonList(list)); @@ -374,7 +374,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexGenericMap() { + void complexGenericMap() { Map, List> inputMap = new HashMap<>(); List inputKey = new ArrayList<>(); inputKey.add("1"); @@ -390,7 +390,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexGenericMapWithCollectionConversion() { + void complexGenericMapWithCollectionConversion() { Map, Set> inputMap = new HashMap<>(); Set inputKey = new HashSet<>(); inputKey.add("1"); @@ -406,7 +406,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexGenericIndexedMapEntry() { + void complexGenericIndexedMapEntry() { List inputValue = new ArrayList<>(); inputValue.add("10"); @@ -418,7 +418,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexGenericIndexedMapEntryWithCollectionConversion() { + void complexGenericIndexedMapEntryWithCollectionConversion() { Set inputValue = new HashSet<>(); inputValue.add("10"); @@ -430,7 +430,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexGenericIndexedMapEntryWithPlainValue() { + void complexGenericIndexedMapEntryWithPlainValue() { String inputValue = "10"; ComplexMapHolder holder = new ComplexMapHolder(); @@ -441,7 +441,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexDerivedIndexedMapEntry() { + void complexDerivedIndexedMapEntry() { List inputValue = new ArrayList<>(); inputValue.add("10"); @@ -453,7 +453,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexDerivedIndexedMapEntryWithCollectionConversion() { + void complexDerivedIndexedMapEntryWithCollectionConversion() { Set inputValue = new HashSet<>(); inputValue.add("10"); @@ -465,7 +465,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexDerivedIndexedMapEntryWithPlainValue() { + void complexDerivedIndexedMapEntryWithPlainValue() { String inputValue = "10"; ComplexMapHolder holder = new ComplexMapHolder(); @@ -476,7 +476,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexMultiValueMapEntry() { + void complexMultiValueMapEntry() { List inputValue = new ArrayList<>(); inputValue.add("10"); @@ -488,7 +488,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexMultiValueMapEntryWithCollectionConversion() { + void complexMultiValueMapEntryWithCollectionConversion() { Set inputValue = new HashSet<>(); inputValue.add("10"); @@ -500,7 +500,7 @@ class BeanWrapperGenericsTests { } @Test - void testComplexMultiValueMapEntryWithPlainValue() { + void complexMultiValueMapEntryWithPlainValue() { String inputValue = "10"; ComplexMapHolder holder = new ComplexMapHolder(); @@ -511,7 +511,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericallyTypedIntegerBean() { + void genericallyTypedIntegerBean() { GenericIntegerBean gb = new GenericIntegerBean(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("genericProperty", "10"); @@ -521,7 +521,7 @@ class BeanWrapperGenericsTests { } @Test - void testGenericallyTypedSetOfIntegerBean() { + void genericallyTypedSetOfIntegerBean() { GenericSetOfIntegerBean gb = new GenericSetOfIntegerBean(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("genericProperty", "10"); @@ -532,7 +532,7 @@ class BeanWrapperGenericsTests { } @Test - void testSettingGenericPropertyWithReadOnlyInterface() { + void settingGenericPropertyWithReadOnlyInterface() { Bar bar = new Bar(); BeanWrapper bw = new BeanWrapperImpl(bar); bw.setPropertyValue("version", "10"); @@ -540,7 +540,7 @@ class BeanWrapperGenericsTests { } @Test - void testSettingLongPropertyWithGenericInterface() { + void settingLongPropertyWithGenericInterface() { Promotion bean = new Promotion(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.setPropertyValue("id", "10"); @@ -548,7 +548,7 @@ class BeanWrapperGenericsTests { } @Test - void testUntypedPropertyWithMapAtRuntime() { + void untypedPropertyWithMapAtRuntime() { class Holder { private final D data; public Holder(D data) { diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java index 260996841b3..5af8af675fb 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java @@ -45,12 +45,12 @@ class ConcurrentBeanWrapperTests { private Throwable ex = null; @RepeatedTest(100) - void testSingleThread() { + void singleThread() { performSet(); } @Test - void testConcurrent() { + void concurrent() { for (int i = 0; i < 10; i++) { TestRun run = new TestRun(this); set.add(run); diff --git a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java index e6494459eb3..24fa59b7ce9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java @@ -40,12 +40,12 @@ class MutablePropertyValuesTests { pvs.addPropertyValue(new PropertyValue("forname", "Tony")); pvs.addPropertyValue(new PropertyValue("surname", "Blair")); pvs.addPropertyValue(new PropertyValue("age", "50")); - doTestTony(pvs); + assertPropertyValuesForTony(pvs); MutablePropertyValues deepCopy = new MutablePropertyValues(pvs); - doTestTony(deepCopy); + assertPropertyValuesForTony(deepCopy); deepCopy.setPropertyValueAt(new PropertyValue("name", "Gordon"), 0); - doTestTony(pvs); + assertPropertyValuesForTony(pvs); assertThat(deepCopy.getPropertyValue("name").getValue()).isEqualTo("Gordon"); } @@ -55,7 +55,7 @@ class MutablePropertyValuesTests { pvs.addPropertyValue(new PropertyValue("forname", "Tony")); pvs.addPropertyValue(new PropertyValue("surname", "Blair")); pvs.addPropertyValue(new PropertyValue("age", "50")); - doTestTony(pvs); + assertPropertyValuesForTony(pvs); PropertyValue addedPv = new PropertyValue("rod", "Rod"); pvs.addPropertyValue(addedPv); assertThat(pvs.getPropertyValue("rod")).isEqualTo(addedPv); @@ -149,7 +149,7 @@ class MutablePropertyValuesTests { /** * Must contain: forname=Tony surname=Blair age=50 */ - protected void doTestTony(PropertyValues pvs) { + private static void assertPropertyValuesForTony(PropertyValues pvs) { PropertyValue[] propertyValues = pvs.getPropertyValues(); assertThat(propertyValues).hasSize(3); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index 7593496f052..295002d4ab2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -85,7 +85,7 @@ class BeanFactoryUtilsTests { @Test - void testHierarchicalCountBeansWithNonHierarchicalFactory() { + void hierarchicalCountBeansWithNonHierarchicalFactory() { StaticListableBeanFactory lbf = new StaticListableBeanFactory(); lbf.addBean("t1", new TestBean()); lbf.addBean("t2", new TestBean()); @@ -96,7 +96,7 @@ class BeanFactoryUtilsTests { * Check that override doesn't count as two separate beans. */ @Test - void testHierarchicalCountBeansWithOverride() { + void hierarchicalCountBeansWithOverride() { // Leaf count assertThat(this.listableBeanFactory.getBeanDefinitionCount()).isEqualTo(1); // Count minus duplicate @@ -105,14 +105,14 @@ class BeanFactoryUtilsTests { } @Test - void testHierarchicalNamesWithNoMatch() { + void hierarchicalNamesWithNoMatch() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class)); assertThat(names).isEmpty(); } @Test - void testHierarchicalNamesWithMatchOnlyInRoot() { + void hierarchicalNamesWithMatchOnlyInRoot() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class)); assertThat(names).hasSize(1); @@ -122,7 +122,7 @@ class BeanFactoryUtilsTests { } @Test - void testGetBeanNamesForTypeWithOverride() { + void getBeanNamesForTypeWithOverride() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class)); // includes 2 TestBeans from FactoryBeans (DummyFactory definitions) @@ -134,7 +134,7 @@ class BeanFactoryUtilsTests { } @Test - void testNoBeansOfType() { + void noBeansOfType() { StaticListableBeanFactory lbf = new StaticListableBeanFactory(); lbf.addBean("foo", new Object()); Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false); @@ -142,7 +142,7 @@ class BeanFactoryUtilsTests { } @Test - void testFindsBeansOfTypeWithStaticFactory() { + void findsBeansOfTypeWithStaticFactory() { StaticListableBeanFactory lbf = new StaticListableBeanFactory(); TestBean t1 = new TestBean(); TestBean t2 = new TestBean(); @@ -173,7 +173,7 @@ class BeanFactoryUtilsTests { } @Test - void testFindsBeansOfTypeWithDefaultFactory() { + void findsBeansOfTypeWithDefaultFactory() { Object test3 = this.listableBeanFactory.getBean("test3"); Object test = this.listableBeanFactory.getBean("test"); @@ -236,7 +236,7 @@ class BeanFactoryUtilsTests { } @Test - void testHierarchicalResolutionWithOverride() { + void hierarchicalResolutionWithOverride() { Object test3 = this.listableBeanFactory.getBean("test3"); Object test = this.listableBeanFactory.getBean("test"); @@ -275,14 +275,14 @@ class BeanFactoryUtilsTests { } @Test - void testHierarchicalNamesForAnnotationWithNoMatch() { + void hierarchicalNamesForAnnotationWithNoMatch() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, Override.class)); assertThat(names).isEmpty(); } @Test - void testHierarchicalNamesForAnnotationWithMatchOnlyInRoot() { + void hierarchicalNamesForAnnotationWithMatchOnlyInRoot() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class)); assertThat(names).hasSize(1); @@ -292,7 +292,7 @@ class BeanFactoryUtilsTests { } @Test - void testGetBeanNamesForAnnotationWithOverride() { + void getBeanNamesForAnnotationWithOverride() { AnnotatedBean annotatedBean = new AnnotatedBean(); this.listableBeanFactory.registerSingleton("anotherAnnotatedBean", annotatedBean); List names = Arrays.asList( @@ -303,25 +303,25 @@ class BeanFactoryUtilsTests { } @Test - void testADependencies() { + void aDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("a"); assertThat(ObjectUtils.isEmpty(deps)).isTrue(); } @Test - void testBDependencies() { + void bDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("b"); assertThat(Arrays.equals(new String[] { "c" }, deps)).isTrue(); } @Test - void testCDependencies() { + void cDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("c"); assertThat(Arrays.equals(new String[] { "int", "long" }, deps)).isTrue(); } @Test - void testIntDependencies() { + void intDependencies() { String[] deps = this.dependentBeansFactory.getDependentBeans("int"); assertThat(Arrays.equals(new String[] { "buffer" }, deps)).isTrue(); } @@ -334,7 +334,7 @@ class BeanFactoryUtilsTests { } @Test // gh-25520 - public void findAnnotationOnBeanWithStaticFactory() { + void findAnnotationOnBeanWithStaticFactory() { StaticListableBeanFactory lbf = new StaticListableBeanFactory(); lbf.addBean("controllerAdvice", new ControllerAdviceClass()); lbf.addBean("restControllerAdvice", new RestControllerAdviceClass()); @@ -401,7 +401,7 @@ class BeanFactoryUtilsTests { testIsSingletonAndIsPrototype(lbf); } - void testIsSingletonAndIsPrototype(ListableBeanFactory lbf) { + private static void testIsSingletonAndIsPrototype(ListableBeanFactory lbf) { Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class); assertThat(beans).hasSize(7); assertThat(beans.get("bean")).isSameAs(lbf.getBean("bean")); @@ -520,7 +520,7 @@ class BeanFactoryUtilsTests { testSupportsMultipleTypes(lbf); } - void testSupportsMultipleTypes(ListableBeanFactory lbf) { + private static void testSupportsMultipleTypes(ListableBeanFactory lbf) { List testBeanList = lbf.getBeanProvider(ITestBean.class).stream().toList(); assertThat(testBeanList).hasSize(5); assertThat(testBeanList.get(0)).isSameAs(lbf.getBean("bean", TestBean.class)); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java index 258c058fc3f..2f2333f868d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java @@ -48,7 +48,7 @@ class FactoryBeanTests { @Test - void testFactoryBeanReturnsNull() { + void factoryBeanReturnsNull() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(RETURNS_NULL_CONTEXT); @@ -56,7 +56,7 @@ class FactoryBeanTests { } @Test - void testFactoryBeansWithAutowiring() { + void factoryBeansWithAutowiring() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(WITH_AUTOWIRING_CONTEXT); @@ -77,7 +77,7 @@ class FactoryBeanTests { } @Test - void testFactoryBeansWithIntermediateFactoryBeanAutowiringFailure() { + void factoryBeansWithIntermediateFactoryBeanAutowiringFailure() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(WITH_AUTOWIRING_CONTEXT); @@ -92,21 +92,21 @@ class FactoryBeanTests { } @Test - void testAbstractFactoryBeanViaAnnotation() { + void abstractFactoryBeanViaAnnotation() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(ABSTRACT_CONTEXT); factory.getBeansWithAnnotation(Component.class); } @Test - void testAbstractFactoryBeanViaType() { + void abstractFactoryBeanViaType() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(ABSTRACT_CONTEXT); factory.getBeansOfType(AbstractFactoryBean.class); } @Test - void testCircularReferenceWithPostProcessor() { + void circularReferenceWithPostProcessor() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(CIRCULAR_CONTEXT); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java index 93b1b4f760a..149bfc5f0d9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java @@ -30,27 +30,27 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class AnnotationBeanWiringInfoResolverTests { @Test - void testResolveWiringInfo() { + void resolveWiringInfo() { assertThatIllegalArgumentException().isThrownBy(() -> new AnnotationBeanWiringInfoResolver().resolveWiringInfo(null)); } @Test - void testResolveWiringInfoWithAnInstanceOfANonAnnotatedClass() { + void resolveWiringInfoWithAnInstanceOfANonAnnotatedClass() { AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver(); BeanWiringInfo info = resolver.resolveWiringInfo("java.lang.String is not @Configurable"); assertThat(info).as("Must be returning null for a non-@Configurable class instance").isNull(); } @Test - void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClass() { + void resolveWiringInfoWithAnInstanceOfAnAnnotatedClass() { AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver(); BeanWiringInfo info = resolver.resolveWiringInfo(new Soap()); assertThat(info).as("Must *not* be returning null for a non-@Configurable class instance").isNotNull(); } @Test - void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitly() { + void resolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitly() { AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver(); BeanWiringInfo info = resolver.resolveWiringInfo(new WirelessSoap()); assertThat(info).as("Must *not* be returning null for an @Configurable class instance even when autowiring is NO").isNotNull(); @@ -59,7 +59,7 @@ class AnnotationBeanWiringInfoResolverTests { } @Test - void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitlyAndCustomBeanName() { + void resolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitlyAndCustomBeanName() { AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver(); BeanWiringInfo info = resolver.resolveWiringInfo(new NamedWirelessSoap()); assertThat(info).as("Must *not* be returning null for an @Configurable class instance even when autowiring is NO").isNotNull(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java index 7ffc195a171..9be397d77e4 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java @@ -37,7 +37,7 @@ import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifie class CustomAutowireConfigurerTests { @Test - void testCustomResolver() { + void customResolver() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( qualifiedResource(CustomAutowireConfigurerTests.class, "context.xml")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index 372dba20762..28a8c88bb6d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -80,7 +80,7 @@ class InjectAnnotationBeanPostProcessorTests { @Test - void testIncompleteBeanDefinition() { + void incompleteBeanDefinition() { bf.registerBeanDefinition("testBean", new GenericBeanDefinition()); try { bf.getBean("testBean"); @@ -91,7 +91,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testResourceInjection() { + void resourceInjection() { RootBeanDefinition bd = new RootBeanDefinition(ResourceInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -108,7 +108,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testExtendedResourceInjection() { + void extendedResourceInjection() { RootBeanDefinition bd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -135,7 +135,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testExtendedResourceInjectionWithOverriding() { + void extendedResourceInjectionWithOverriding() { RootBeanDefinition annotatedBd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class); TestBean tb2 = new TestBean(); annotatedBd.getPropertyValues().add("testBean2", tb2); @@ -155,7 +155,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testConstructorResourceInjection() { + void constructorResourceInjection() { RootBeanDefinition bd = new RootBeanDefinition(ConstructorResourceInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -182,7 +182,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testConstructorResourceInjectionWithMultipleCandidatesAsCollection() { + void constructorResourceInjectionWithMultipleCandidatesAsCollection() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ConstructorsCollectionResourceInjectionBean.class)); TestBean tb = new TestBean(); @@ -199,7 +199,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testConstructorResourceInjectionWithMultipleCandidatesAndFallback() { + void constructorResourceInjectionWithMultipleCandidatesAndFallback() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ConstructorsResourceInjectionBean.class)); TestBean tb = new TestBean(); bf.registerSingleton("testBean", tb); @@ -210,7 +210,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testConstructorInjectionWithMap() { + void constructorInjectionWithMap() { RootBeanDefinition bd = new RootBeanDefinition(MapConstructorInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -235,7 +235,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testFieldInjectionWithMap() { + void fieldInjectionWithMap() { RootBeanDefinition bd = new RootBeanDefinition(MapFieldInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -260,7 +260,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testMethodInjectionWithMap() { + void methodInjectionWithMap() { RootBeanDefinition bd = new RootBeanDefinition(MapMethodInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", bd); @@ -281,7 +281,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testMethodInjectionWithMapAndMultipleMatches() { + void methodInjectionWithMapAndMultipleMatches() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(MapMethodInjectionBean.class)); bf.registerBeanDefinition("testBean1", new RootBeanDefinition(TestBean.class)); bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class)); @@ -290,7 +290,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testMethodInjectionWithMapAndMultipleMatchesButOnlyOneAutowireCandidate() { + void methodInjectionWithMapAndMultipleMatchesButOnlyOneAutowireCandidate() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(MapMethodInjectionBean.class)); bf.registerBeanDefinition("testBean1", new RootBeanDefinition(TestBean.class)); RootBeanDefinition rbd2 = new RootBeanDefinition(TestBean.class); @@ -306,7 +306,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryInjection() { + void objectFactoryInjection() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierFieldInjectionBean.class)); RootBeanDefinition bd = new RootBeanDefinition(TestBean.class); bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean")); @@ -318,7 +318,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryQualifierInjection() { + void objectFactoryQualifierInjection() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierFieldInjectionBean.class)); RootBeanDefinition bd = new RootBeanDefinition(TestBean.class); bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean")); @@ -329,7 +329,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryFieldInjectionIntoPrototypeBean() { + void objectFactoryFieldInjectionIntoPrototypeBean() { RootBeanDefinition annotatedBeanDefinition = new RootBeanDefinition(ObjectFactoryQualifierFieldInjectionBean.class); annotatedBeanDefinition.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", annotatedBeanDefinition); @@ -346,7 +346,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryMethodInjectionIntoPrototypeBean() { + void objectFactoryMethodInjectionIntoPrototypeBean() { RootBeanDefinition annotatedBeanDefinition = new RootBeanDefinition(ObjectFactoryQualifierMethodInjectionBean.class); annotatedBeanDefinition.setScope(BeanDefinition.SCOPE_PROTOTYPE); bf.registerBeanDefinition("annotatedBean", annotatedBeanDefinition); @@ -363,7 +363,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithBeanField() throws Exception { + void objectFactoryWithBeanField() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -377,7 +377,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithBeanFieldAgainstFrozen() throws Exception { + void objectFactoryWithBeanFieldAgainstFrozen() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -392,7 +392,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithBeanMethod() throws Exception { + void objectFactoryWithBeanMethod() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -406,7 +406,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithBeanMethodAgainstFrozen() throws Exception { + void objectFactoryWithBeanMethodAgainstFrozen() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -421,7 +421,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithTypedListField() throws Exception { + void objectFactoryWithTypedListField() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryListFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -433,7 +433,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithTypedListMethod() throws Exception { + void objectFactoryWithTypedListMethod() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryListMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -445,7 +445,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithTypedMapField() throws Exception { + void objectFactoryWithTypedMapField() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryMapFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -457,7 +457,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testObjectFactoryWithTypedMapMethod() throws Exception { + void objectFactoryWithTypedMapMethod() throws Exception { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryMapMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); bf.setSerializationId("test"); @@ -474,7 +474,7 @@ class InjectAnnotationBeanPostProcessorTests { * specifically addressing SPR-4040. */ @Test - void testBeanAutowiredWithFactoryBean() { + void beanAutowiredWithFactoryBean() { bf.registerBeanDefinition("factoryBeanDependentBean", new RootBeanDefinition(FactoryBeanDependentBean.class)); bf.registerSingleton("stringFactoryBean", new StringFactoryBean()); @@ -487,7 +487,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testNullableFieldInjectionWithBeanAvailable() { + void nullableFieldInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -497,7 +497,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testNullableFieldInjectionWithBeanNotAvailable() { + void nullableFieldInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableFieldInjectionBean.class)); NullableFieldInjectionBean bean = (NullableFieldInjectionBean) bf.getBean("annotatedBean"); @@ -505,7 +505,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testNullableMethodInjectionWithBeanAvailable() { + void nullableMethodInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -515,7 +515,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testNullableMethodInjectionWithBeanNotAvailable() { + void nullableMethodInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableMethodInjectionBean.class)); NullableMethodInjectionBean bean = (NullableMethodInjectionBean) bf.getBean("annotatedBean"); @@ -523,7 +523,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalFieldInjectionWithBeanAvailable() { + void optionalFieldInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -534,7 +534,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalFieldInjectionWithBeanNotAvailable() { + void optionalFieldInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalFieldInjectionBean.class)); OptionalFieldInjectionBean bean = (OptionalFieldInjectionBean) bf.getBean("annotatedBean"); @@ -542,7 +542,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalMethodInjectionWithBeanAvailable() { + void optionalMethodInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -553,7 +553,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalMethodInjectionWithBeanNotAvailable() { + void optionalMethodInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalMethodInjectionBean.class)); OptionalMethodInjectionBean bean = (OptionalMethodInjectionBean) bf.getBean("annotatedBean"); @@ -561,7 +561,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalListFieldInjectionWithBeanAvailable() { + void optionalListFieldInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -572,7 +572,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalListFieldInjectionWithBeanNotAvailable() { + void optionalListFieldInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListFieldInjectionBean.class)); OptionalListFieldInjectionBean bean = (OptionalListFieldInjectionBean) bf.getBean("annotatedBean"); @@ -580,7 +580,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalListMethodInjectionWithBeanAvailable() { + void optionalListMethodInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -591,7 +591,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testOptionalListMethodInjectionWithBeanNotAvailable() { + void optionalListMethodInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListMethodInjectionBean.class)); OptionalListMethodInjectionBean bean = (OptionalListMethodInjectionBean) bf.getBean("annotatedBean"); @@ -599,7 +599,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testProviderOfOptionalFieldInjectionWithBeanAvailable() { + void providerOfOptionalFieldInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalFieldInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -610,7 +610,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testProviderOfOptionalFieldInjectionWithBeanNotAvailable() { + void providerOfOptionalFieldInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalFieldInjectionBean.class)); ProviderOfOptionalFieldInjectionBean bean = (ProviderOfOptionalFieldInjectionBean) bf.getBean("annotatedBean"); @@ -618,7 +618,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testProviderOfOptionalMethodInjectionWithBeanAvailable() { + void providerOfOptionalMethodInjectionWithBeanAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalMethodInjectionBean.class)); bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class)); @@ -629,7 +629,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testProviderOfOptionalMethodInjectionWithBeanNotAvailable() { + void providerOfOptionalMethodInjectionWithBeanNotAvailable() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalMethodInjectionBean.class)); ProviderOfOptionalMethodInjectionBean bean = (ProviderOfOptionalMethodInjectionBean) bf.getBean("annotatedBean"); @@ -637,7 +637,7 @@ class InjectAnnotationBeanPostProcessorTests { } @Test - void testAnnotatedDefaultConstructor() { + void annotatedDefaultConstructor() { bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(AnnotatedDefaultConstructorBean.class)); assertThat(bf.getBean("annotatedBean")).isNotNull(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java index d0b50270fe2..9e1e05e51b8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class LookupAnnotationTests { @Test - void testWithoutConstructorArg() { + void withoutConstructorArg() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); Object expected = bean.get(); @@ -42,7 +42,7 @@ class LookupAnnotationTests { } @Test - void testWithOverloadedArg() { + void withOverloadedArg() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); TestBean expected = bean.get("haha"); @@ -52,7 +52,7 @@ class LookupAnnotationTests { } @Test - void testWithOneConstructorArg() { + void withOneConstructorArg() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); TestBean expected = bean.getOneArgument("haha"); @@ -62,7 +62,7 @@ class LookupAnnotationTests { } @Test - void testWithTwoConstructorArg() { + void withTwoConstructorArg() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); TestBean expected = bean.getTwoArguments("haha", 72); @@ -73,7 +73,7 @@ class LookupAnnotationTests { } @Test - void testWithThreeArgsShouldFail() { + void withThreeArgsShouldFail() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThatExceptionOfType(AbstractMethodError.class).as("TestBean has no three arg constructor").isThrownBy(() -> @@ -82,7 +82,7 @@ class LookupAnnotationTests { } @Test - void testWithEarlyInjection() { + void withEarlyInjection() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); AbstractBean bean = beanFactory.getBean("beanConsumer", BeanConsumer.class).abstractBean; Object expected = bean.get(); @@ -91,7 +91,7 @@ class LookupAnnotationTests { } @Test // gh-25806 - public void testWithNullBean() { + void withNullBean() { RootBeanDefinition tbd = new RootBeanDefinition(TestBean.class, () -> null); tbd.setScope(BeanDefinition.SCOPE_PROTOTYPE); DefaultListableBeanFactory beanFactory = configureBeanFactory(tbd); @@ -103,7 +103,7 @@ class LookupAnnotationTests { } @Test - void testWithGenericBean() { + void withGenericBean() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); beanFactory.registerBeanDefinition("numberBean", new RootBeanDefinition(NumberBean.class)); beanFactory.registerBeanDefinition("doubleStore", new RootBeanDefinition(DoubleStore.class)); @@ -115,7 +115,7 @@ class LookupAnnotationTests { } @Test - void testSingletonWithoutMetadataCaching() { + void singletonWithoutMetadataCaching() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); beanFactory.setCacheBeanMetadata(false); @@ -129,7 +129,7 @@ class LookupAnnotationTests { } @Test - void testPrototypeWithoutMetadataCaching() { + void prototypeWithoutMetadataCaching() { DefaultListableBeanFactory beanFactory = configureBeanFactory(); beanFactory.setCacheBeanMetadata(false); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java index a3c16fa9d15..67b1ee043af 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java @@ -67,7 +67,7 @@ class DefaultBeanRegistrationCodeFragmentsTests { private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); @Test - public void getTargetWithInstanceSupplier() { + void getTargetWithInstanceSupplier() { RootBeanDefinition beanDefinition = new RootBeanDefinition(SimpleBean.class); beanDefinition.setInstanceSupplier(SimpleBean::new); RegisteredBean registeredBean = registerTestBean(beanDefinition); @@ -78,7 +78,7 @@ class DefaultBeanRegistrationCodeFragmentsTests { } @Test - public void getTargetWithInstanceSupplierAndResourceDescription() { + void getTargetWithInstanceSupplierAndResourceDescription() { RootBeanDefinition beanDefinition = new RootBeanDefinition(SimpleBean.class); beanDefinition.setInstanceSupplier(SimpleBean::new); beanDefinition.setResourceDescription("my test resource"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java index 6a0fb01dd9b..dcb701650ee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CustomEditorConfigurerTests { @Test - void testCustomEditorConfigurerWithPropertyEditorRegistrar() throws ParseException { + void customEditorConfigurerWithPropertyEditorRegistrar() throws ParseException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); CustomEditorConfigurer cec = new CustomEditorConfigurer(); final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN); @@ -70,7 +70,7 @@ class CustomEditorConfigurerTests { } @Test - void testCustomEditorConfigurerWithEditorAsClass() throws ParseException { + void customEditorConfigurerWithEditorAsClass() throws ParseException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); CustomEditorConfigurer cec = new CustomEditorConfigurer(); Map, Class> editors = new HashMap<>(); @@ -90,7 +90,7 @@ class CustomEditorConfigurerTests { } @Test - void testCustomEditorConfigurerWithRequiredTypeArray() { + void customEditorConfigurerWithRequiredTypeArray() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); CustomEditorConfigurer cec = new CustomEditorConfigurer(); Map, Class> editors = new HashMap<>(); 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 30aaa9a53a9..ace9e5f887b 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 @@ -43,13 +43,13 @@ class CustomScopeConfigurerTests { @Test - void testWithNoScopes() { + void withNoScopes() { CustomScopeConfigurer figurer = new CustomScopeConfigurer(); figurer.postProcessBeanFactory(factory); } @Test - void testSunnyDayWithBonaFideScopeInstance() { + void sunnyDayWithBonaFideScopeInstance() { Scope scope = mock(); factory.registerScope(FOO_SCOPE, scope); Map scopes = new HashMap<>(); @@ -60,7 +60,7 @@ class CustomScopeConfigurerTests { } @Test - void testSunnyDayWithBonaFideScopeClass() { + void sunnyDayWithBonaFideScopeClass() { Map scopes = new HashMap<>(); scopes.put(FOO_SCOPE, NoOpScope.class); CustomScopeConfigurer figurer = new CustomScopeConfigurer(); @@ -70,7 +70,7 @@ class CustomScopeConfigurerTests { } @Test - void testSunnyDayWithBonaFideScopeClassName() { + void sunnyDayWithBonaFideScopeClassName() { Map scopes = new HashMap<>(); scopes.put(FOO_SCOPE, NoOpScope.class.getName()); CustomScopeConfigurer figurer = new CustomScopeConfigurer(); @@ -80,7 +80,7 @@ class CustomScopeConfigurerTests { } @Test - void testWhereScopeMapHasNullScopeValueInEntrySet() { + void whereScopeMapHasNullScopeValueInEntrySet() { Map scopes = new HashMap<>(); scopes.put(FOO_SCOPE, null); CustomScopeConfigurer figurer = new CustomScopeConfigurer(); @@ -90,7 +90,7 @@ class CustomScopeConfigurerTests { } @Test - void testWhereScopeMapHasNonScopeInstanceInEntrySet() { + void whereScopeMapHasNonScopeInstanceInEntrySet() { Map scopes = new HashMap<>(); scopes.put(FOO_SCOPE, this); // <-- not a valid value... CustomScopeConfigurer figurer = new CustomScopeConfigurer(); @@ -101,7 +101,7 @@ class CustomScopeConfigurerTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - void testWhereScopeMapHasNonStringTypedScopeNameInKeySet() { + void whereScopeMapHasNonStringTypedScopeNameInKeySet() { Map scopes = new HashMap(); scopes.put(this, new NoOpScope()); // <-- not a valid value (the key)... CustomScopeConfigurer figurer = new CustomScopeConfigurer(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java index d72df743d44..59227e1e4f3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java @@ -35,7 +35,7 @@ class DeprecatedBeanWarnerTests { @Test @SuppressWarnings("deprecation") - public void postProcess() { + void postProcess() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); BeanDefinition def = new RootBeanDefinition(MyDeprecatedBean.class); String beanName = "deprecated"; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java index e4e31674d1c..5c2ee6b61d3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java @@ -37,7 +37,7 @@ import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifie class FieldRetrievingFactoryBeanTests { @Test - void testStaticField() throws Exception { + void staticField() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setStaticField("java.sql.Connection.TRANSACTION_SERIALIZABLE"); fr.afterPropertiesSet(); @@ -45,7 +45,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testStaticFieldWithWhitespace() throws Exception { + void staticFieldWithWhitespace() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setStaticField(" java.sql.Connection.TRANSACTION_SERIALIZABLE "); fr.afterPropertiesSet(); @@ -53,7 +53,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testStaticFieldViaClassAndFieldName() throws Exception { + void staticFieldViaClassAndFieldName() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setTargetClass(Connection.class); fr.setTargetField("TRANSACTION_SERIALIZABLE"); @@ -62,7 +62,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testNonStaticField() throws Exception { + void nonStaticField() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); PublicFieldHolder target = new PublicFieldHolder(); fr.setTargetObject(target); @@ -72,7 +72,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testNothingButBeanName() throws Exception { + void nothingButBeanName() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setBeanName("java.sql.Connection.TRANSACTION_SERIALIZABLE"); fr.afterPropertiesSet(); @@ -80,7 +80,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testJustTargetField() throws Exception { + void justTargetField() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setTargetField("TRANSACTION_SERIALIZABLE"); try { @@ -91,7 +91,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testJustTargetClass() throws Exception { + void justTargetClass() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setTargetClass(Connection.class); try { @@ -102,7 +102,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testJustTargetObject() throws Exception { + void justTargetObject() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setTargetObject(new PublicFieldHolder()); try { @@ -113,7 +113,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testWithConstantOnClassWithPackageLevelVisibility() throws Exception { + void withConstantOnClassWithPackageLevelVisibility() throws Exception { FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean(); fr.setBeanName("org.springframework.beans.testfixture.beans.PackageLevelVisibleBean.CONSTANT"); fr.afterPropertiesSet(); @@ -121,7 +121,7 @@ class FieldRetrievingFactoryBeanTests { } @Test - void testBeanNameSyntaxWithBeanFactory() { + void beanNameSyntaxWithBeanFactory() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( qualifiedResource(FieldRetrievingFactoryBeanTests.class, "context.xml")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java index 31b328fd4c1..f7b6ce35e93 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class MethodInvokingFactoryBeanTests { @Test - void testParameterValidation() throws Exception { + void parameterValidation() throws Exception { // assert that only static OR non-static are set, but not both or none MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean(); @@ -91,7 +91,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testGetObjectType() throws Exception { + void getObjectType() throws Exception { TestClass1 tc1 = new TestClass1(); MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean(); mcfb = new MethodInvokingFactoryBean(); @@ -127,7 +127,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testGetObject() throws Exception { + void getObject() throws Exception { // singleton, non-static TestClass1 tc1 = new TestClass1(); MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean(); @@ -190,7 +190,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testArgumentConversion() throws Exception { + void argumentConversion() throws Exception { MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean(); mcfb.setTargetClass(TestClass1.class); mcfb.setTargetMethod("supertypes"); @@ -224,7 +224,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testInvokeWithNullArgument() throws Exception { + void invokeWithNullArgument() throws Exception { MethodInvoker methodInvoker = new MethodInvoker(); methodInvoker.setTargetClass(TestClass1.class); methodInvoker.setTargetMethod("nullArgument"); @@ -234,7 +234,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testInvokeWithIntArgument() throws Exception { + void invokeWithIntArgument() throws Exception { ArgumentConvertingMethodInvoker methodInvoker = new ArgumentConvertingMethodInvoker(); methodInvoker.setTargetClass(TestClass1.class); methodInvoker.setTargetMethod("intArgument"); @@ -251,7 +251,7 @@ class MethodInvokingFactoryBeanTests { } @Test - void testInvokeWithIntArguments() throws Exception { + void invokeWithIntArguments() throws Exception { MethodInvokingBean methodInvoker = new MethodInvokingBean(); methodInvoker.setTargetClass(TestClass1.class); methodInvoker.setTargetMethod("intArguments"); 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 68a8936fdd9..55540bea08a 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 @@ -61,7 +61,7 @@ class ObjectFactoryCreatingFactoryBeanTests { @Test - void testFactoryOperation() { + void factoryOperation() { FactoryTestBean testBean = beanFactory.getBean("factoryTestBean", FactoryTestBean.class); ObjectFactory objectFactory = testBean.getObjectFactory(); @@ -71,7 +71,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testFactorySerialization() throws Exception { + void factorySerialization() throws Exception { FactoryTestBean testBean = beanFactory.getBean("factoryTestBean", FactoryTestBean.class); ObjectFactory objectFactory = testBean.getObjectFactory(); @@ -83,7 +83,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testProviderOperation() { + void providerOperation() { ProviderTestBean testBean = beanFactory.getBean("providerTestBean", ProviderTestBean.class); Provider provider = testBean.getProvider(); @@ -93,7 +93,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testProviderSerialization() throws Exception { + void providerSerialization() throws Exception { ProviderTestBean testBean = beanFactory.getBean("providerTestBean", ProviderTestBean.class); Provider provider = testBean.getProvider(); @@ -105,7 +105,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testDoesNotComplainWhenTargetBeanNameRefersToSingleton() throws Exception { + void doesNotComplainWhenTargetBeanNameRefersToSingleton() throws Exception { final String targetBeanName = "singleton"; final String expectedSingleton = "Alicia Keys"; @@ -122,14 +122,14 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testWhenTargetBeanNameIsNull() { + void whenTargetBeanNameIsNull() { assertThatIllegalArgumentException().as( "'targetBeanName' property not set").isThrownBy( new ObjectFactoryCreatingFactoryBean()::afterPropertiesSet); } @Test - void testWhenTargetBeanNameIsEmptyString() { + void whenTargetBeanNameIsEmptyString() { ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean(); factory.setTargetBeanName(""); assertThatIllegalArgumentException().as( @@ -138,7 +138,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testWhenTargetBeanNameIsWhitespacedString() { + void whenTargetBeanNameIsWhitespacedString() { ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean(); factory.setTargetBeanName(" \t"); assertThatIllegalArgumentException().as( @@ -147,7 +147,7 @@ class ObjectFactoryCreatingFactoryBeanTests { } @Test - void testEnsureOFBFBReportsThatItActuallyCreatesObjectFactoryInstances() { + void ensureOFBFBReportsThatItActuallyCreatesObjectFactoryInstances() { assertThat(new ObjectFactoryCreatingFactoryBean().getObjectType()).as("Must be reporting that it creates ObjectFactory instances (as per class contract).").isEqualTo(ObjectFactory.class); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java index 6b00af8ea71..e35ea8baf54 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java @@ -39,7 +39,7 @@ class PropertiesFactoryBeanTests { private static final Resource TEST_PROPS_XML = qualifiedResource(CLASS, "test.properties.xml"); @Test - void testWithPropertiesFile() throws Exception { + void withPropertiesFile() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); pfb.afterPropertiesSet(); @@ -48,7 +48,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithPropertiesXmlFile() throws Exception { + void withPropertiesXmlFile() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS_XML); pfb.afterPropertiesSet(); @@ -57,7 +57,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithLocalProperties() throws Exception { + void withLocalProperties() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); Properties localProps = new Properties(); localProps.setProperty("key2", "value2"); @@ -68,7 +68,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithPropertiesFileAndLocalProperties() throws Exception { + void withPropertiesFileAndLocalProperties() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); Properties localProps = new Properties(); @@ -82,7 +82,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithPropertiesFileAndMultipleLocalProperties() throws Exception { + void withPropertiesFileAndMultipleLocalProperties() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); @@ -111,7 +111,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithPropertiesFileAndLocalPropertiesAndLocalOverride() throws Exception { + void withPropertiesFileAndLocalPropertiesAndLocalOverride() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); Properties localProps = new Properties(); @@ -126,7 +126,7 @@ class PropertiesFactoryBeanTests { } @Test - void testWithPrototype() throws Exception { + void withPrototype() throws Exception { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setSingleton(false); pfb.setLocation(TEST_PROPS); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java index 2421612326d..33eb65a943b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java @@ -40,7 +40,7 @@ class PropertyPathFactoryBeanTests { @Test - void testPropertyPathFactoryBeanWithSingletonResult() { + void propertyPathFactoryBeanWithSingletonResult() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); assertThat(xbf.getBean("propertyPath1")).isEqualTo(12); @@ -55,7 +55,7 @@ class PropertyPathFactoryBeanTests { } @Test - void testPropertyPathFactoryBeanWithPrototypeResult() { + void propertyPathFactoryBeanWithPrototypeResult() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); assertThat(xbf.getType("tb.spouse")).isNull(); @@ -75,7 +75,7 @@ class PropertyPathFactoryBeanTests { } @Test - void testPropertyPathFactoryBeanWithNullResult() { + void propertyPathFactoryBeanWithNullResult() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); assertThat(xbf.getType("tb.spouse.spouse")).isNull(); @@ -83,7 +83,7 @@ class PropertyPathFactoryBeanTests { } @Test - void testPropertyPathFactoryBeanAsInnerBean() { + void propertyPathFactoryBeanAsInnerBean() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); TestBean spouse = (TestBean) xbf.getBean("otb.spouse"); @@ -94,14 +94,14 @@ class PropertyPathFactoryBeanTests { } @Test - void testPropertyPathFactoryBeanAsNullReference() { + void propertyPathFactoryBeanAsNullReference() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); assertThat(xbf.getBean("tbWithNullReference", TestBean.class).getSpouse()).isNull(); } @Test - void testPropertyPathFactoryBeanAsInnerNull() { + void propertyPathFactoryBeanAsInnerNull() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT); assertThat(xbf.getBean("tbWithInnerNull", TestBean.class).getSpouse()).isNull(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index 5bc7a461849..4c6ed8c6ad9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -75,7 +75,7 @@ class PropertyResourceConfigurerTests { @Test - void testPropertyOverrideConfigurer() { + void propertyOverrideConfigurer() { BeanDefinition def1 = BeanDefinitionBuilder.genericBeanDefinition(TestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb1", def1); @@ -115,7 +115,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithNestedProperty() { + void propertyOverrideConfigurerWithNestedProperty() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -133,7 +133,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithNestedPropertyAndDotInBeanName() { + void propertyOverrideConfigurerWithNestedPropertyAndDotInBeanName() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("my.tb", def); @@ -152,7 +152,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithNestedMapPropertyAndDotInMapKey() { + void propertyOverrideConfigurerWithNestedMapPropertyAndDotInMapKey() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -170,7 +170,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithHeldProperties() { + void propertyOverrideConfigurerWithHeldProperties() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(PropertiesHolder.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -186,7 +186,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithPropertiesFile() { + void propertyOverrideConfigurerWithPropertiesFile() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -200,7 +200,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithInvalidPropertiesFile() { + void propertyOverrideConfigurerWithInvalidPropertiesFile() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -215,7 +215,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithPropertiesXmlFile() { + void propertyOverrideConfigurerWithPropertiesXmlFile() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -229,7 +229,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithConvertProperties() { + void propertyOverrideConfigurerWithConvertProperties() { BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition(); factory.registerBeanDefinition("tb", def); @@ -246,7 +246,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithInvalidKey() { + void propertyOverrideConfigurerWithInvalidKey() { factory.registerBeanDefinition("tb1", genericBeanDefinition(TestBean.class).getBeanDefinition()); factory.registerBeanDefinition("tb2", genericBeanDefinition(TestBean.class).getBeanDefinition()); @@ -281,7 +281,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyOverrideConfigurerWithIgnoreInvalidKeys() { + void propertyOverrideConfigurerWithIgnoreInvalidKeys() { factory.registerBeanDefinition("tb1", genericBeanDefinition(TestBean.class).getBeanDefinition()); factory.registerBeanDefinition("tb2", genericBeanDefinition(TestBean.class).getBeanDefinition()); @@ -314,12 +314,12 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurer() { + void propertyPlaceholderConfigurer() { doTestPropertyPlaceholderConfigurer(false); } @Test - void testPropertyPlaceholderConfigurerWithParentChildSeparation() { + void propertyPlaceholderConfigurerWithParentChildSeparation() { doTestPropertyPlaceholderConfigurer(true); } @@ -425,7 +425,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithSystemPropertyFallback() { + void propertyPlaceholderConfigurerWithSystemPropertyFallback() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("country", "${os.name}").getBeanDefinition()); @@ -437,7 +437,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithSystemPropertyNotUsed() { + void propertyPlaceholderConfigurerWithSystemPropertyNotUsed() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("country", "${os.name}").getBeanDefinition()); @@ -452,7 +452,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithOverridingSystemProperty() { + void propertyPlaceholderConfigurerWithOverridingSystemProperty() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("country", "${os.name}").getBeanDefinition()); @@ -468,7 +468,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithUnresolvableSystemProperty() { + void propertyPlaceholderConfigurerWithUnresolvableSystemProperty() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("touchy", "${user.dir}").getBeanDefinition()); PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer(); @@ -479,7 +479,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithUnresolvablePlaceholder() { + void propertyPlaceholderConfigurerWithUnresolvablePlaceholder() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${ref}").getBeanDefinition()); PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer(); @@ -489,7 +489,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithIgnoreUnresolvablePlaceholder() { + void propertyPlaceholderConfigurerWithIgnoreUnresolvablePlaceholder() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${ref}").getBeanDefinition()); @@ -502,7 +502,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithEmptyStringAsNull() { + void propertyPlaceholderConfigurerWithEmptyStringAsNull() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "").getBeanDefinition()); @@ -515,7 +515,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithEmptyStringInPlaceholderAsNull() { + void propertyPlaceholderConfigurerWithEmptyStringInPlaceholderAsNull() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${ref}").getBeanDefinition()); @@ -531,7 +531,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithNestedPlaceholderInKey() { + void propertyPlaceholderConfigurerWithNestedPlaceholderInKey() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${my${key}key}").getBeanDefinition()); @@ -547,7 +547,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithPlaceholderInAlias() { + void propertyPlaceholderConfigurerWithPlaceholderInAlias() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class).getBeanDefinition()); factory.registerAlias("tb", "${alias}"); @@ -563,7 +563,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAlias() { + void propertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAlias() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class).getBeanDefinition()); factory.registerAlias("tb", "${alias}"); @@ -579,7 +579,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithCircularReference() { + void propertyPlaceholderConfigurerWithCircularReference() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("age", "${age}") .addPropertyValue("name", "name${var}") @@ -596,7 +596,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithDefaultProperties() { + void propertyPlaceholderConfigurerWithDefaultProperties() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("touchy", "${test}").getBeanDefinition()); @@ -611,7 +611,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithInlineDefault() { + void propertyPlaceholderConfigurerWithInlineDefault() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("touchy", "${test:mytest}").getBeanDefinition()); @@ -623,7 +623,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPropertyPlaceholderConfigurerWithAliases() { + void propertyPlaceholderConfigurerWithAliases() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("touchy", "${test}").getBeanDefinition()); @@ -647,7 +647,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPreferencesPlaceholderConfigurer() { + void preferencesPlaceholderConfigurer() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${myName}") .addPropertyValue("age", "${myAge}") @@ -674,7 +674,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPreferencesPlaceholderConfigurerWithCustomTreePaths() { + void preferencesPlaceholderConfigurerWithCustomTreePaths() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${myName}") .addPropertyValue("age", "${myAge}") @@ -703,7 +703,7 @@ class PropertyResourceConfigurerTests { } @Test - void testPreferencesPlaceholderConfigurerWithPathInPlaceholder() { + void preferencesPlaceholderConfigurerWithPathInPlaceholder() { factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class) .addPropertyValue("name", "${mypath/myName}") .addPropertyValue("age", "${myAge}") 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 9423db14150..788bd790501 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 @@ -50,7 +50,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testNoArgGetter() { + void noArgGetter() { bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("factory", genericBeanDefinition(ServiceLocatorFactoryBean.class) @@ -63,7 +63,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testErrorOnTooManyOrTooFew() { + void errorOnTooManyOrTooFew() { bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("testServiceInstance2", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("factory", @@ -87,7 +87,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testErrorOnTooManyOrTooFewWithCustomServiceLocatorException() { + void errorOnTooManyOrTooFewWithCustomServiceLocatorException() { bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("testServiceInstance2", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("factory", @@ -116,7 +116,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testStringArgGetter() throws Exception { + void stringArgGetter() throws Exception { bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("factory", genericBeanDefinition(ServiceLocatorFactoryBean.class) @@ -136,7 +136,7 @@ class ServiceLocatorFactoryBeanTests { } @Disabled @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory - public void testCombinedLocatorInterface() { + void combinedLocatorInterface() { bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerAlias("testService", "1"); @@ -169,7 +169,7 @@ class ServiceLocatorFactoryBeanTests { } @Disabled @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory - public void testServiceMappings() { + void serviceMappings() { bf.registerBeanDefinition("testService1", genericBeanDefinition(TestService.class).getBeanDefinition()); bf.registerBeanDefinition("testService2", genericBeanDefinition(ExtendedTestService.class).getBeanDefinition()); bf.registerBeanDefinition("factory", @@ -205,13 +205,13 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testNoServiceLocatorInterfaceSupplied() { + void noServiceLocatorInterfaceSupplied() { assertThatIllegalArgumentException().isThrownBy( new ServiceLocatorFactoryBean()::afterPropertiesSet); } @Test - void testWhenServiceLocatorInterfaceIsNotAnInterfaceType() { + void whenServiceLocatorInterfaceIsNotAnInterfaceType() { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); factory.setServiceLocatorInterface(getClass()); assertThatIllegalArgumentException().isThrownBy( @@ -220,7 +220,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testWhenServiceLocatorExceptionClassToExceptionTypeWithOnlyNoArgCtor() { + void whenServiceLocatorExceptionClassToExceptionTypeWithOnlyNoArgCtor() { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); assertThatIllegalArgumentException().isThrownBy(() -> factory.setServiceLocatorExceptionClass(ExceptionClassWithOnlyZeroArgCtor.class)); @@ -229,7 +229,7 @@ class ServiceLocatorFactoryBeanTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void testWhenServiceLocatorExceptionClassIsNotAnExceptionSubclass() { + void whenServiceLocatorExceptionClassIsNotAnExceptionSubclass() { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); assertThatIllegalArgumentException().isThrownBy(() -> factory.setServiceLocatorExceptionClass((Class) getClass())); @@ -237,7 +237,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testWhenServiceLocatorMethodCalledWithTooManyParameters() { + void whenServiceLocatorMethodCalledWithTooManyParameters() { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); factory.setServiceLocatorInterface(ServiceLocatorInterfaceWithExtraNonCompliantMethod.class); factory.afterPropertiesSet(); @@ -247,7 +247,7 @@ class ServiceLocatorFactoryBeanTests { } @Test - void testRequiresListableBeanFactoryAndChokesOnAnythingElse() { + void requiresListableBeanFactoryAndChokesOnAnythingElse() { BeanFactory beanFactory = mock(); try { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 9b32a7e0009..e8f2fbe2571 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -73,7 +73,7 @@ class SimpleScopeTests { @Test - void testCanGetScopedObject() { + void canGetScopedObject() { TestBean tb1 = (TestBean) beanFactory.getBean("usesScope"); TestBean tb2 = (TestBean) beanFactory.getBean("usesScope"); assertThat(tb2).isNotSameAs(tb1); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java index 220d930d75b..8b630f9e39d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java @@ -44,14 +44,14 @@ class YamlMapFactoryBeanTests { @Test - void testSetIgnoreResourceNotFound() { + void setIgnoreResourceNotFound() { this.factory.setResolutionMethod(YamlMapFactoryBean.ResolutionMethod.OVERRIDE_AND_IGNORE); this.factory.setResources(new FileSystemResource("non-existent-file.yml")); assertThat(this.factory.getObject()).isEmpty(); } @Test - void testSetBarfOnResourceNotFound() { + void setBarfOnResourceNotFound() { assertThatIllegalStateException().isThrownBy(() -> { this.factory.setResources(new FileSystemResource("non-existent-file.yml")); this.factory.getObject().size(); @@ -59,14 +59,14 @@ class YamlMapFactoryBeanTests { } @Test - void testGetObject() { + void getObject() { this.factory.setResources(new ByteArrayResource("foo: bar".getBytes())); assertThat(this.factory.getObject()).hasSize(1); } @SuppressWarnings("unchecked") @Test - void testOverrideAndRemoveDefaults() { + void overrideAndRemoveDefaults() { this.factory.setResources(new ByteArrayResource("foo:\n bar: spam".getBytes()), new ByteArrayResource("foo:\n spam: bar".getBytes())); @@ -75,7 +75,7 @@ class YamlMapFactoryBeanTests { } @Test - void testFirstFound() { + void firstFound() { this.factory.setResolutionMethod(YamlProcessor.ResolutionMethod.FIRST_FOUND); this.factory.setResources(new AbstractResource() { @Override @@ -92,7 +92,7 @@ class YamlMapFactoryBeanTests { } @Test - void testMapWithPeriodsInKey() { + void mapWithPeriodsInKey() { this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : value".getBytes())); Map map = this.factory.getObject(); @@ -107,7 +107,7 @@ class YamlMapFactoryBeanTests { } @Test - void testMapWithIntegerValue() { + void mapWithIntegerValue() { this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : 3".getBytes())); Map map = this.factory.getObject(); @@ -122,7 +122,7 @@ class YamlMapFactoryBeanTests { } @Test - void testDuplicateKey() { + void duplicateKey() { this.factory.setResources(new ByteArrayResource("mymap:\n foo: bar\nmymap:\n bar: foo".getBytes())); assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(() -> this.factory.getObject().get("mymap")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java index 3e44bf97543..5d853a2db7e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class ConstructorArgumentEntryTests { @Test - void testCtorBailsOnNegativeCtorIndexArgument() { + void ctorBailsOnNegativeCtorIndexArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new ConstructorArgumentEntry(-1)); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java index 9c6b12bab8b..cfa8bfc179b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java @@ -53,7 +53,7 @@ class CustomProblemReporterTests { @Test - void testErrorsAreCollated() { + void errorsAreCollated() { this.reader.loadBeanDefinitions(qualifiedResource(CustomProblemReporterTests.class, "context.xml")); assertThat(this.problemReporter.getErrors()).as("Incorrect number of errors collated").hasSize(4); 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 a94701d85fd..31ba19d859c 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 @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; class FailFastProblemReporterTests { @Test - void testError() { + void error() { FailFastProblemReporter reporter = new FailFastProblemReporter(); assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(() -> reporter.error(new Problem("VGER", new Location(new DescriptiveResource("here")), @@ -43,7 +43,7 @@ class FailFastProblemReporterTests { } @Test - void testWarn() { + void warn() { Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")), null, new IllegalArgumentException()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java index 259aead6536..9e105389409 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java @@ -27,14 +27,14 @@ import static org.assertj.core.api.Assertions.assertThat; class NullSourceExtractorTests { @Test - void testPassThroughContract() { + void passThroughContract() { Object source = new Object(); Object extractedSource = new NullSourceExtractor().extractSource(source, null); assertThat(extractedSource).as("The contract of NullSourceExtractor states that the extraction *always* return null").isNull(); } @Test - void testPassThroughContractEvenWithNull() { + void passThroughContractEvenWithNull() { Object extractedSource = new NullSourceExtractor().extractSource(null, null); assertThat(extractedSource).as("The contract of NullSourceExtractor states that the extraction *always* return null").isNull(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java index e3096aa6665..b54fbb2ceea 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ParseStateTests { @Test - void testSimple() { + void simple() { MockEntry entry = new MockEntry(); ParseState parseState = new ParseState(); @@ -39,7 +39,7 @@ class ParseStateTests { } @Test - void testNesting() { + void nesting() { MockEntry one = new MockEntry(); MockEntry two = new MockEntry(); MockEntry three = new MockEntry(); @@ -59,7 +59,7 @@ class ParseStateTests { } @Test - void testSnapshot() { + void snapshot() { MockEntry entry = new MockEntry(); ParseState original = new ParseState(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java index 804f27f2ad7..9e5e63cc2ee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; class PassThroughSourceExtractorTests { @Test - void testPassThroughContract() { + void passThroughContract() { Object source = new Object(); Object extractedSource = new PassThroughSourceExtractor().extractSource(source, null); assertThat(extractedSource).as("The contract of PassThroughSourceExtractor states that the supplied " + @@ -37,7 +37,7 @@ class PassThroughSourceExtractorTests { } @Test - void testPassThroughContractEvenWithNull() { + void passThroughContractEvenWithNull() { Object extractedSource = new PassThroughSourceExtractor().extractSource(null, null); assertThat(extractedSource).as("The contract of PassThroughSourceExtractor states that the supplied " + "source object *must* be returned as-is (even if null)").isNull(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java index aa6660fbe23..d9947b547ac 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java @@ -29,19 +29,19 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class PropertyEntryTests { @Test - void testCtorBailsOnNullPropertyNameArgument() { + void ctorBailsOnNullPropertyNameArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new PropertyEntry(null)); } @Test - void testCtorBailsOnEmptyPropertyNameArgument() { + void ctorBailsOnEmptyPropertyNameArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new PropertyEntry("")); } @Test - void testCtorBailsOnWhitespacedPropertyNameArgument() { + void ctorBailsOnWhitespacedPropertyNameArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new PropertyEntry("\t ")); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java index 91f890a9396..9b058d1745c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java @@ -42,7 +42,7 @@ class ServiceLoaderTests { } @Test - void testServiceLoaderFactoryBean() { + void serviceLoaderFactoryBean() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); RootBeanDefinition bd = new RootBeanDefinition(ServiceLoaderFactoryBean.class); bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName()); @@ -52,7 +52,7 @@ class ServiceLoaderTests { } @Test - void testServiceFactoryBean() { + void serviceFactoryBean() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); RootBeanDefinition bd = new RootBeanDefinition(ServiceFactoryBean.class); bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName()); @@ -61,7 +61,7 @@ class ServiceLoaderTests { } @Test - void testServiceListFactoryBean() { + void serviceListFactoryBean() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); RootBeanDefinition bd = new RootBeanDefinition(ServiceListFactoryBean.class); bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java index 164765a0d17..5f70fb47d15 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java @@ -44,7 +44,7 @@ class LookupMethodTests { @Test - void testWithoutConstructorArg() { + void withoutConstructorArg() { AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThat(bean).isNotNull(); Object expected = bean.get(); @@ -52,7 +52,7 @@ class LookupMethodTests { } @Test - void testWithOverloadedArg() { + void withOverloadedArg() { AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThat(bean).isNotNull(); TestBean expected = bean.get("haha"); @@ -61,7 +61,7 @@ class LookupMethodTests { } @Test - void testWithOneConstructorArg() { + void withOneConstructorArg() { AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThat(bean).isNotNull(); TestBean expected = bean.getOneArgument("haha"); @@ -70,7 +70,7 @@ class LookupMethodTests { } @Test - void testWithTwoConstructorArg() { + void withTwoConstructorArg() { AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThat(bean).isNotNull(); TestBean expected = bean.getTwoArguments("haha", 72); @@ -80,7 +80,7 @@ class LookupMethodTests { } @Test - void testWithThreeArgsShouldFail() { + void withThreeArgsShouldFail() { AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean"); assertThat(bean).isNotNull(); assertThatExceptionOfType(AbstractMethodError.class).as("does not have a three arg constructor") @@ -88,7 +88,7 @@ class LookupMethodTests { } @Test - void testWithOverriddenLookupMethod() { + void withOverriddenLookupMethod() { AbstractBean bean = (AbstractBean) beanFactory.getBean("extendedBean"); assertThat(bean).isNotNull(); TestBean expected = bean.getOneArgument("haha"); @@ -98,7 +98,7 @@ class LookupMethodTests { } @Test - void testWithGenericBean() { + void withGenericBean() { RootBeanDefinition bd = new RootBeanDefinition(NumberBean.class); bd.getMethodOverrides().addOverride(new LookupOverride("getDoubleStore", null)); bd.getMethodOverrides().addOverride(new LookupOverride("getFloatStore", null)); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java index 44d69c1e3c4..365f051074b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java @@ -34,7 +34,7 @@ class ManagedPropertiesTests { @Test @SuppressWarnings("unchecked") - public void mergeSunnyDay() { + void mergeSunnyDay() { ManagedProperties parent = new ManagedProperties(); parent.setProperty("one", "one"); parent.setProperty("two", "two"); @@ -69,7 +69,7 @@ class ManagedPropertiesTests { @Test @SuppressWarnings("unchecked") - public void mergeEmptyChild() { + void mergeEmptyChild() { ManagedProperties parent = new ManagedProperties(); parent.setProperty("one", "one"); parent.setProperty("two", "two"); @@ -81,7 +81,7 @@ class ManagedPropertiesTests { @Test @SuppressWarnings("unchecked") - public void mergeChildValuesOverrideTheParents() { + void mergeChildValuesOverrideTheParents() { ManagedProperties parent = new ManagedProperties(); parent.setProperty("one", "one"); parent.setProperty("two", "two"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java index 61c6b7d9520..284b54183db 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java @@ -49,7 +49,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { @Test - void testAutowireCandidateDefaultWithIrrelevantDescriptor() throws Exception { + void autowireCandidateDefaultWithIrrelevantDescriptor() throws Exception { ConstructorArgumentValues cavs = new ConstructorArgumentValues(); cavs.addGenericArgumentValue(JUERGEN); RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null); @@ -63,7 +63,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateExplicitlyFalseWithIrrelevantDescriptor() throws Exception { + void autowireCandidateExplicitlyFalseWithIrrelevantDescriptor() throws Exception { ConstructorArgumentValues cavs = new ConstructorArgumentValues(); cavs.addGenericArgumentValue(JUERGEN); RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null); @@ -78,7 +78,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateWithFieldDescriptor() throws Exception { + void autowireCandidateWithFieldDescriptor() throws Exception { lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver()); ConstructorArgumentValues cavs1 = new ConstructorArgumentValues(); @@ -104,7 +104,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateExplicitlyFalseWithFieldDescriptor() throws Exception { + void autowireCandidateExplicitlyFalseWithFieldDescriptor() throws Exception { ConstructorArgumentValues cavs = new ConstructorArgumentValues(); cavs.addGenericArgumentValue(JUERGEN); RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null); @@ -123,7 +123,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateWithShortClassName() throws Exception { + void autowireCandidateWithShortClassName() throws Exception { ConstructorArgumentValues cavs = new ConstructorArgumentValues(); cavs.addGenericArgumentValue(JUERGEN); RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null); @@ -141,7 +141,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateWithConstructorDescriptor() throws Exception { + void autowireCandidateWithConstructorDescriptor() throws Exception { lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver()); ConstructorArgumentValues cavs1 = new ConstructorArgumentValues(); @@ -165,7 +165,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateWithMethodDescriptor() throws Exception { + void autowireCandidateWithMethodDescriptor() throws Exception { lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver()); ConstructorArgumentValues cavs1 = new ConstructorArgumentValues(); @@ -197,7 +197,7 @@ class QualifierAnnotationAutowireBeanFactoryTests { } @Test - void testAutowireCandidateWithMultipleCandidatesDescriptor() throws Exception { + void autowireCandidateWithMultipleCandidatesDescriptor() throws Exception { ConstructorArgumentValues cavs1 = new ConstructorArgumentValues(); cavs1.addGenericArgumentValue(JUERGEN); RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java index 8f88762434a..86846a05552 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java @@ -42,7 +42,7 @@ class CollectionsWithDefaultTypesTests { } @Test - void testListHasDefaultType() { + void listHasDefaultType() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); for (Object o : bean.getSomeList()) { assertThat(o.getClass()).as("Value type is incorrect").isEqualTo(Integer.class); @@ -50,7 +50,7 @@ class CollectionsWithDefaultTypesTests { } @Test - void testSetHasDefaultType() { + void setHasDefaultType() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); for (Object o : bean.getSomeSet()) { assertThat(o.getClass()).as("Value type is incorrect").isEqualTo(Integer.class); @@ -58,13 +58,13 @@ class CollectionsWithDefaultTypesTests { } @Test - void testMapHasDefaultKeyAndValueType() { + void mapHasDefaultKeyAndValueType() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); assertMap(bean.getSomeMap()); } @Test - void testMapWithNestedElementsHasDefaultKeyAndValueType() { + void mapWithNestedElementsHasDefaultKeyAndValueType() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean2"); assertMap(bean.getSomeMap()); } @@ -79,7 +79,7 @@ class CollectionsWithDefaultTypesTests { @Test @SuppressWarnings("rawtypes") - public void testBuildCollectionFromMixtureOfReferencesAndValues() { + void buildCollectionFromMixtureOfReferencesAndValues() { MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble"); assertThat(jumble.getJumble()).as("Expected 3 elements, not " + jumble.getJumble().size()).hasSize(3); List l = (List) jumble.getJumble(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java index 56b22561f72..5563cdb957c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java @@ -31,19 +31,19 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class DelegatingEntityResolverTests { @Test - void testCtorWhereDtdEntityResolverIsNull() { + void ctorWhereDtdEntityResolverIsNull() { assertThatIllegalArgumentException().isThrownBy(() -> new DelegatingEntityResolver(null, new NoOpEntityResolver())); } @Test - void testCtorWhereSchemaEntityResolverIsNull() { + void ctorWhereSchemaEntityResolverIsNull() { assertThatIllegalArgumentException().isThrownBy(() -> new DelegatingEntityResolver(new NoOpEntityResolver(), null)); } @Test - void testCtorWhereEntityResolversAreBothNull() { + void ctorWhereEntityResolversAreBothNull() { assertThatIllegalArgumentException().isThrownBy(() -> new DelegatingEntityResolver(null, null)); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java index d5214a184c3..9687e729ace 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class FactoryMethodTests { @Test - void testFactoryMethodsSingletonOnTargetClass() { + void factoryMethodsSingletonOnTargetClass() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -73,7 +73,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodsWithInvalidDestroyMethod() { + void factoryMethodsWithInvalidDestroyMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -82,7 +82,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodsWithNullInstance() { + void factoryMethodsWithNullInstance() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -93,7 +93,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodsWithNullValue() { + void factoryMethodsWithNullValue() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -115,7 +115,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodsWithAutowire() { + void factoryMethodsWithAutowire() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -127,7 +127,7 @@ class FactoryMethodTests { } @Test - void testProtectedFactoryMethod() { + void protectedFactoryMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -137,7 +137,7 @@ class FactoryMethodTests { } @Test - void testPrivateFactoryMethod() { + void privateFactoryMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -147,7 +147,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodsPrototypeOnTargetClass() { + void factoryMethodsPrototypeOnTargetClass() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -191,7 +191,7 @@ class FactoryMethodTests { * Tests where the static factory method is on a different class. */ @Test - void testFactoryMethodsOnExternalClass() { + void factoryMethodsOnExternalClass() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -217,7 +217,7 @@ class FactoryMethodTests { } @Test - void testInstanceFactoryMethodWithoutArgs() { + void instanceFactoryMethodWithoutArgs() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -235,7 +235,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodNoMatchingStaticMethod() { + void factoryMethodNoMatchingStaticMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -244,7 +244,7 @@ class FactoryMethodTests { } @Test - void testNonExistingFactoryMethod() { + void nonExistingFactoryMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -254,7 +254,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodArgumentsForNonExistingMethod() { + void factoryMethodArgumentsForNonExistingMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -264,7 +264,7 @@ class FactoryMethodTests { } @Test - void testCanSpecifyFactoryMethodArgumentsOnFactoryMethodPrototype() { + void canSpecifyFactoryMethodArgumentsOnFactoryMethodPrototype() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -300,7 +300,7 @@ class FactoryMethodTests { } @Test - void testCanSpecifyFactoryMethodArgumentsOnSingleton() { + void canSpecifyFactoryMethodArgumentsOnSingleton() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -315,7 +315,7 @@ class FactoryMethodTests { } @Test - void testCannotSpecifyFactoryMethodArgumentsOnSingletonAfterCreation() { + void cannotSpecifyFactoryMethodArgumentsOnSingletonAfterCreation() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -329,7 +329,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodWithDifferentReturnType() { + void factoryMethodWithDifferentReturnType() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -352,7 +352,7 @@ class FactoryMethodTests { } @Test - void testFactoryMethodForJavaMailSession() { + void factoryMethodForJavaMailSession() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass())); @@ -371,7 +371,7 @@ class MailSession { private MailSession() { } - public void setProperties(Properties props) { + void setProperties(Properties props) { this.props = props; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java index ca4c71cd065..bcf08ab485e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java @@ -61,13 +61,13 @@ class ProfileXmlBeanDefinitionTests { private static final String TARGET_BEAN = "foo"; @Test - void testProfileValidation() { + void profileValidation() { assertThatIllegalArgumentException().isThrownBy(() -> beanFactoryFor(PROD_ELIGIBLE_XML, NULL_ACTIVE)); } @Test - void testProfilePermutations() { + void profilePermutations() { assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, NONE_ACTIVE)).isNot(containingTarget()); assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, DEV_ACTIVE)).isNot(containingTarget()); assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, PROD_ACTIVE)).is(containingTarget()); @@ -116,7 +116,7 @@ class ProfileXmlBeanDefinitionTests { } @Test - void testDefaultProfile() { + void defaultProfile() { { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); @@ -140,7 +140,7 @@ class ProfileXmlBeanDefinitionTests { } @Test - void testDefaultAndNonDefaultProfile() { + void defaultAndNonDefaultProfile() { assertThat(beanFactoryFor(DEFAULT_ELIGIBLE_XML, NONE_ACTIVE)).is(containingTarget()); assertThat(beanFactoryFor(DEFAULT_ELIGIBLE_XML, "other")).isNot(containingTarget()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 537f6cd42b2..bab66a1e219 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -64,19 +64,19 @@ class UtilNamespaceHandlerTests { @Test - void testConstant() { + void constant() { Integer min = (Integer) this.beanFactory.getBean("min"); assertThat(min).isEqualTo(Integer.MIN_VALUE); } @Test - void testConstantWithDefaultName() { + void constantWithDefaultName() { Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE"); assertThat(max).isEqualTo(Integer.MAX_VALUE); } @Test - void testEvents() { + void events() { ComponentDefinition propertiesComponent = this.listener.getComponentDefinition("myProperties"); assertThat(propertiesComponent).as("Event for 'myProperties' not sent").isNotNull(); AbstractBeanDefinition propertiesBean = (AbstractBeanDefinition) propertiesComponent.getBeanDefinitions()[0]; @@ -89,26 +89,26 @@ class UtilNamespaceHandlerTests { } @Test - void testNestedProperties() { + void nestedProperties() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); Properties props = bean.getSomeProperties(); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); } @Test - void testPropertyPath() { + void propertyPath() { String name = (String) this.beanFactory.getBean("name"); assertThat(name).isEqualTo("Rob Harrop"); } @Test - void testNestedPropertyPath() { + void nestedPropertyPath() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); assertThat(bean.getName()).isEqualTo("Rob Harrop"); } @Test - void testSimpleMap() { + void simpleMap() { Map map = (Map) this.beanFactory.getBean("simpleMap"); assertThat(map.get("foo")).isEqualTo("bar"); Map map2 = (Map) this.beanFactory.getBean("simpleMap"); @@ -116,7 +116,7 @@ class UtilNamespaceHandlerTests { } @Test - void testScopedMap() { + void scopedMap() { Map map = (Map) this.beanFactory.getBean("scopedMap"); assertThat(map.get("foo")).isEqualTo("bar"); Map map2 = (Map) this.beanFactory.getBean("scopedMap"); @@ -125,7 +125,7 @@ class UtilNamespaceHandlerTests { } @Test - void testSimpleList() { + void simpleList() { assertThat(this.beanFactory.getBean("simpleList")) .asInstanceOf(InstanceOfAssertFactories.LIST).element(0).isEqualTo("Rob Harrop"); assertThat(this.beanFactory.getBean("simpleList")) @@ -133,7 +133,7 @@ class UtilNamespaceHandlerTests { } @Test - void testScopedList() { + void scopedList() { assertThat(this.beanFactory.getBean("scopedList")) .asInstanceOf(InstanceOfAssertFactories.LIST).element(0).isEqualTo("Rob Harrop"); assertThat(this.beanFactory.getBean("scopedList")) @@ -143,7 +143,7 @@ class UtilNamespaceHandlerTests { } @Test - void testSimpleSet() { + void simpleSet() { assertThat(this.beanFactory.getBean("simpleSet")).isInstanceOf(Set.class) .asInstanceOf(InstanceOfAssertFactories.collection(String.class)) .containsOnly("Rob Harrop"); @@ -152,7 +152,7 @@ class UtilNamespaceHandlerTests { } @Test - void testScopedSet() { + void scopedSet() { assertThat(this.beanFactory.getBean("scopedSet")).isInstanceOf(Set.class) .asInstanceOf(InstanceOfAssertFactories.collection(String.class)) .containsOnly("Rob Harrop"); @@ -164,7 +164,7 @@ class UtilNamespaceHandlerTests { } @Test - void testMapWithRef() throws Exception { + void mapWithRef() throws Exception { Map map = (Map) this.beanFactory.getBean("mapWithRef"); assertThat(map).isInstanceOf(TreeMap.class); assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean")); @@ -174,7 +174,7 @@ class UtilNamespaceHandlerTests { } @Test - void testMapWithTypes() throws Exception { + void mapWithTypes() throws Exception { Map map = (Map) this.beanFactory.getBean("mapWithTypes"); assertThat(map).isInstanceOf(LinkedCaseInsensitiveMap.class); assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean")); @@ -184,7 +184,7 @@ class UtilNamespaceHandlerTests { } @Test - void testNestedCollections() { + void nestedCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedCollectionsBean"); assertThat(bean.getSomeList()).singleElement().isEqualTo("foo"); @@ -205,7 +205,7 @@ class UtilNamespaceHandlerTests { } @Test - void testNestedShortcutCollections() { + void nestedShortcutCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections"); assertThat(bean.getStringArray()).containsExactly("fooStr"); @@ -222,7 +222,7 @@ class UtilNamespaceHandlerTests { } @Test - void testNestedInCollections() { + void nestedInCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedCustomTagBean"); assertThat(bean.getSomeList()).singleElement().isEqualTo(Integer.MIN_VALUE); @@ -243,7 +243,7 @@ class UtilNamespaceHandlerTests { } @Test - void testCircularCollections() { + void circularCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionsBean"); assertThat(bean.getSomeList()).singleElement().isSameAs(bean); @@ -255,7 +255,7 @@ class UtilNamespaceHandlerTests { } @Test - void testCircularCollectionBeansStartingWithList() { + void circularCollectionBeansStartingWithList() { this.beanFactory.getBean("circularList"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); @@ -276,7 +276,7 @@ class UtilNamespaceHandlerTests { } @Test - void testCircularCollectionBeansStartingWithSet() { + void circularCollectionBeansStartingWithSet() { this.beanFactory.getBean("circularSet"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); @@ -297,7 +297,7 @@ class UtilNamespaceHandlerTests { } @Test - void testCircularCollectionBeansStartingWithMap() { + void circularCollectionBeansStartingWithMap() { this.beanFactory.getBean("circularMap"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); @@ -318,13 +318,13 @@ class UtilNamespaceHandlerTests { } @Test - void testNestedInConstructor() { + void nestedInConstructor() { TestBean bean = (TestBean) this.beanFactory.getBean("constructedTestBean"); assertThat(bean.getName()).isEqualTo("Rob Harrop"); } @Test - void testLoadProperties() { + void loadProperties() { Properties props = (Properties) this.beanFactory.getBean("myProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); assertThat(props).as("Incorrect property value").doesNotContainKey("foo2"); @@ -333,7 +333,7 @@ class UtilNamespaceHandlerTests { } @Test - void testScopedProperties() { + void scopedProperties() { Properties props = (Properties) this.beanFactory.getBean("myScopedProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); assertThat(props).as("Incorrect property value").doesNotContainKey("foo2"); @@ -344,35 +344,35 @@ class UtilNamespaceHandlerTests { } @Test - void testLocalProperties() { + void localProperties() { Properties props = (Properties) this.beanFactory.getBean("myLocalProperties"); assertThat(props).as("Incorrect property value").doesNotContainKey("foo"); assertThat(props).as("Incorrect property value").containsEntry("foo2", "bar2"); } @Test - void testMergedProperties() { + void mergedProperties() { Properties props = (Properties) this.beanFactory.getBean("myMergedProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); assertThat(props).as("Incorrect property value").containsEntry("foo2", "bar2"); } @Test - void testLocalOverrideDefault() { + void localOverrideDefault() { Properties props = (Properties) this.beanFactory.getBean("defaultLocalOverrideProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2"); } @Test - void testLocalOverrideFalse() { + void localOverrideFalse() { Properties props = (Properties) this.beanFactory.getBean("falseLocalOverrideProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "bar"); assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2"); } @Test - void testLocalOverrideTrue() { + void localOverrideTrue() { Properties props = (Properties) this.beanFactory.getBean("trueLocalOverrideProperties"); assertThat(props).as("Incorrect property value").containsEntry("foo", "local"); assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 7e56ddb390c..761592c7245 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -67,7 +67,7 @@ class XmlBeanCollectionTests { @Test - void testCollectionFactoryDefaults() throws Exception { + void collectionFactoryDefaults() throws Exception { ListFactoryBean listFactory = new ListFactoryBean(); listFactory.setSourceList(new LinkedList()); listFactory.afterPropertiesSet(); @@ -85,7 +85,7 @@ class XmlBeanCollectionTests { } @Test - void testRefSubelement() { + void refSubelement() { //assertTrue("5 beans in reftypes, not " + this.beanFactory.getBeanDefinitionCount(), this.beanFactory.getBeanDefinitionCount() == 5); TestBean jen = (TestBean) this.beanFactory.getBean("jenny"); TestBean dave = (TestBean) this.beanFactory.getBean("david"); @@ -93,25 +93,25 @@ class XmlBeanCollectionTests { } @Test - void testPropertyWithLiteralValueSubelement() { + void propertyWithLiteralValueSubelement() { TestBean verbose = (TestBean) this.beanFactory.getBean("verbose"); assertThat(verbose.getName()).isEqualTo("verbose"); } @Test - void testPropertyWithIdRefLocalAttrSubelement() { + void propertyWithIdRefLocalAttrSubelement() { TestBean verbose = (TestBean) this.beanFactory.getBean("verbose2"); assertThat(verbose.getName()).isEqualTo("verbose"); } @Test - void testPropertyWithIdRefBeanAttrSubelement() { + void propertyWithIdRefBeanAttrSubelement() { TestBean verbose = (TestBean) this.beanFactory.getBean("verbose3"); assertThat(verbose.getName()).isEqualTo("verbose"); } @Test - void testRefSubelementsBuildCollection() { + void refSubelementsBuildCollection() { TestBean jen = (TestBean) this.beanFactory.getBean("jenny"); TestBean dave = (TestBean) this.beanFactory.getBean("david"); TestBean rod = (TestBean) this.beanFactory.getBean("rod"); @@ -128,7 +128,7 @@ class XmlBeanCollectionTests { } @Test - void testRefSubelementsBuildCollectionWithPrototypes() { + void refSubelementsBuildCollectionWithPrototypes() { TestBean jen = (TestBean) this.beanFactory.getBean("pJenny"); TestBean dave = (TestBean) this.beanFactory.getBean("pDavid"); TestBean rod = (TestBean) this.beanFactory.getBean("pRod"); @@ -151,14 +151,14 @@ class XmlBeanCollectionTests { } @Test - void testRefSubelementsBuildCollectionFromSingleElement() { + void refSubelementsBuildCollectionFromSingleElement() { TestBean loner = (TestBean) this.beanFactory.getBean("loner"); TestBean dave = (TestBean) this.beanFactory.getBean("david"); assertThat(loner.getFriends()).containsOnly(dave); } @Test - void testBuildCollectionFromMixtureOfReferencesAndValues() { + void buildCollectionFromMixtureOfReferencesAndValues() { MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble"); assertThat(jumble.getJumble()).as("Expected 5 elements, not " + jumble.getJumble()).hasSize(5); List l = (List) jumble.getJumble(); @@ -172,7 +172,7 @@ class XmlBeanCollectionTests { } @Test - void testInvalidBeanNameReference() { + void invalidBeanNameReference() { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> this.beanFactory.getBean("jumble2")) .withCauseInstanceOf(BeanDefinitionStoreException.class) @@ -180,13 +180,13 @@ class XmlBeanCollectionTests { } @Test - void testEmptyMap() { + void emptyMap() { HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyMap"); assertThat(hasMap.getMap()).hasSize(0); } @Test - void testMapWithLiteralsOnly() { + void mapWithLiteralsOnly() { HasMap hasMap = (HasMap) this.beanFactory.getBean("literalMap"); assertThat(hasMap.getMap()).hasSize(3); assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue(); @@ -195,7 +195,7 @@ class XmlBeanCollectionTests { } @Test - void testMapWithLiteralsAndReferences() { + void mapWithLiteralsAndReferences() { HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMap"); assertThat(hasMap.getMap()).hasSize(5); assertThat(hasMap.getMap().get("foo")).isEqualTo(10); @@ -209,7 +209,7 @@ class XmlBeanCollectionTests { } @Test - void testMapWithLiteralsAndPrototypeReferences() { + void mapWithLiteralsAndPrototypeReferences() { TestBean jenny = (TestBean) this.beanFactory.getBean("pJenny"); HasMap hasMap = (HasMap) this.beanFactory.getBean("pMixedMap"); assertThat(hasMap.getMap()).hasSize(2); @@ -225,7 +225,7 @@ class XmlBeanCollectionTests { } @Test - void testMapWithLiteralsReferencesAndList() { + void mapWithLiteralsReferencesAndList() { HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMapWithList"); assertThat(hasMap.getMap()).hasSize(4); assertThat(hasMap.getMap().get(null).equals("bar")).isTrue(); @@ -262,13 +262,13 @@ class XmlBeanCollectionTests { } @Test - void testEmptySet() { + void emptySet() { HasMap hasMap = (HasMap) this.beanFactory.getBean("emptySet"); assertThat(hasMap.getSet()).hasSize(0); } @Test - void testPopulatedSet() { + void populatedSet() { HasMap hasMap = (HasMap) this.beanFactory.getBean("set"); assertThat(hasMap.getSet()).hasSize(3); assertThat(hasMap.getSet().contains("bar")).isTrue(); @@ -282,7 +282,7 @@ class XmlBeanCollectionTests { } @Test - void testPopulatedConcurrentSet() { + void populatedConcurrentSet() { HasMap hasMap = (HasMap) this.beanFactory.getBean("concurrentSet"); assertThat(hasMap.getConcurrentSet()).hasSize(3); assertThat(hasMap.getConcurrentSet().contains("bar")).isTrue(); @@ -292,7 +292,7 @@ class XmlBeanCollectionTests { } @Test - void testPopulatedIdentityMap() { + void populatedIdentityMap() { HasMap hasMap = (HasMap) this.beanFactory.getBean("identityMap"); assertThat(hasMap.getIdentityMap()).hasSize(2); HashSet set = new HashSet(hasMap.getIdentityMap().keySet()); @@ -301,14 +301,14 @@ class XmlBeanCollectionTests { } @Test - void testEmptyProps() { + void emptyProps() { HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyProps"); assertThat(hasMap.getProps()).hasSize(0); assertThat(Properties.class).isEqualTo(hasMap.getProps().getClass()); } @Test - void testPopulatedProps() { + void populatedProps() { HasMap hasMap = (HasMap) this.beanFactory.getBean("props"); assertThat(hasMap.getProps()).hasSize(2); assertThat(hasMap.getProps().get("foo").equals("bar")).isTrue(); @@ -316,7 +316,7 @@ class XmlBeanCollectionTests { } @Test - void testObjectArray() { + void objectArray() { HasMap hasMap = (HasMap) this.beanFactory.getBean("objectArray"); assertThat(hasMap.getObjectArray().length).isEqualTo(2); assertThat(hasMap.getObjectArray()[0].equals("one")).isTrue(); @@ -324,7 +324,7 @@ class XmlBeanCollectionTests { } @Test - void testIntegerArray() { + void integerArray() { HasMap hasMap = (HasMap) this.beanFactory.getBean("integerArray"); assertThat(hasMap.getIntegerArray().length).isEqualTo(3); assertThat(hasMap.getIntegerArray()[0]).isEqualTo(0); @@ -333,7 +333,7 @@ class XmlBeanCollectionTests { } @Test - void testClassArray() { + void classArray() { HasMap hasMap = (HasMap) this.beanFactory.getBean("classArray"); assertThat(hasMap.getClassArray().length).isEqualTo(2); assertThat(hasMap.getClassArray()[0].equals(String.class)).isTrue(); @@ -341,7 +341,7 @@ class XmlBeanCollectionTests { } @Test - void testClassList() { + void classList() { HasMap hasMap = (HasMap) this.beanFactory.getBean("classList"); assertThat(hasMap.getClassList()).hasSize(2); assertThat(hasMap.getClassList().get(0).equals(String.class)).isTrue(); @@ -349,7 +349,7 @@ class XmlBeanCollectionTests { } @Test - void testProps() { + void props() { HasMap hasMap = (HasMap) this.beanFactory.getBean("props"); assertThat(hasMap.getProps()).hasSize(2); assertThat(hasMap.getProps().getProperty("foo")).isEqualTo("bar"); @@ -362,45 +362,45 @@ class XmlBeanCollectionTests { } @Test - void testListFactory() { + void listFactory() { List list = (List) this.beanFactory.getBean("listFactory"); assertThat(list).isInstanceOf(LinkedList.class).containsExactly("bar", "jenny"); } @Test - void testPrototypeListFactory() { + void prototypeListFactory() { List list = (List) this.beanFactory.getBean("pListFactory"); assertThat(list).isInstanceOf(LinkedList.class).containsExactly("bar", "jenny"); } @Test - void testSetFactory() { + void setFactory() { Set set = (Set) this.beanFactory.getBean("setFactory"); assertThat(set).isInstanceOf(TreeSet.class).containsOnly("bar", "jenny"); } @Test - void testPrototypeSetFactory() { + void prototypeSetFactory() { Set set = (Set) this.beanFactory.getBean("pSetFactory"); assertThat(set).isInstanceOf(TreeSet.class).containsOnly("bar", "jenny"); } @Test - void testMapFactory() { + void mapFactory() { Map map = (Map) this.beanFactory.getBean("mapFactory"); assertThat(map).isInstanceOf(TreeMap.class).containsOnly( entry("foo", "bar"), entry("jen", "jenny")); } @Test - void testPrototypeMapFactory() { + void prototypeMapFactory() { Map map = (Map) this.beanFactory.getBean("pMapFactory"); assertThat(map).isInstanceOf(TreeMap.class).containsOnly( entry("foo", "bar"), entry("jen", "jenny")); } @Test - void testChoiceBetweenSetAndMap() { + void choiceBetweenSetAndMap() { MapAndSet sam = (MapAndSet) this.beanFactory.getBean("setAndMap"); assertThat(sam.getObject() instanceof Map).as("Didn't choose constructor with Map argument").isTrue(); Map map = (Map) sam.getObject(); @@ -408,7 +408,7 @@ class XmlBeanCollectionTests { } @Test - void testEnumSetFactory() { + void enumSetFactory() { Set set = (Set) this.beanFactory.getBean("enumSetFactory"); assertThat(set).containsOnly("ONE", "TWO"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 2661ee52581..e114713cf2e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -100,7 +100,7 @@ class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTests { @Test @Override - public void count() { + protected void count() { assertCount(24); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java index 9fcfd8f70d2..a0614c443f6 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class DefaultNamespaceHandlerResolverTests { @Test - void testResolvedMappedHandler() { + void resolvedMappedHandler() { DefaultNamespaceHandlerResolver resolver = new DefaultNamespaceHandlerResolver(getClass().getClassLoader()); NamespaceHandler handler = resolver.resolve("http://www.springframework.org/schema/util"); assertThat(handler).as("Handler should not be null.").isNotNull(); @@ -42,7 +42,7 @@ class DefaultNamespaceHandlerResolverTests { } @Test - void testResolvedMappedHandlerWithNoArgCtor() { + void resolvedMappedHandlerWithNoArgCtor() { DefaultNamespaceHandlerResolver resolver = new DefaultNamespaceHandlerResolver(); NamespaceHandler handler = resolver.resolve("http://www.springframework.org/schema/util"); assertThat(handler).as("Handler should not be null.").isNotNull(); @@ -50,25 +50,25 @@ class DefaultNamespaceHandlerResolverTests { } @Test - void testNonExistentHandlerClass() { + void nonExistentHandlerClass() { String mappingPath = "org/springframework/beans/factory/xml/support/nonExistent.properties"; new DefaultNamespaceHandlerResolver(getClass().getClassLoader(), mappingPath); } @Test - void testCtorWithNullClassLoaderArgument() { + void ctorWithNullClassLoaderArgument() { // simply must not bail... new DefaultNamespaceHandlerResolver(null); } @Test - void testCtorWithNullClassLoaderArgumentAndNullMappingLocationArgument() { + void ctorWithNullClassLoaderArgumentAndNullMappingLocationArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultNamespaceHandlerResolver(null, null)); } @Test - void testCtorWithNonExistentMappingLocationArgument() { + void ctorWithNonExistentMappingLocationArgument() { // simply must not bail; we don't want non-existent resources to result in an Exception new DefaultNamespaceHandlerResolver(null, "738trbc bobabloobop871"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java index 9c86751c5cb..46c689e19b1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; class BeanInfoTests { @Test - void testComplexObject() { + void complexObject() { ValueBean bean = new ValueBean(); BeanWrapper bw = new BeanWrapperImpl(bean); Integer value = 1; diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java index 8b4f0a213ac..90294754a98 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java @@ -35,27 +35,27 @@ import static org.assertj.core.api.InstanceOfAssertFactories.LIST; class CustomCollectionEditorTests { @Test - void testCtorWithNullCollectionType() { + void ctorWithNullCollectionType() { assertThatIllegalArgumentException().isThrownBy(() -> new CustomCollectionEditor(null)); } @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void testCtorWithNonCollectionType() { + void ctorWithNonCollectionType() { assertThatIllegalArgumentException().isThrownBy(() -> new CustomCollectionEditor((Class) String.class)); } @Test - void testWithCollectionTypeThatDoesNotExposeAPublicNoArgCtor() { + void withCollectionTypeThatDoesNotExposeAPublicNoArgCtor() { CustomCollectionEditor editor = new CustomCollectionEditor(CollectionTypeWithNoNoArgCtor.class); assertThatIllegalArgumentException().isThrownBy(() -> editor.setValue("1")); } @Test - void testSunnyDaySetValue() { + void sunnyDaySetValue() { CustomCollectionEditor editor = new CustomCollectionEditor(ArrayList.class); editor.setValue(new int[] {0, 1, 2}); Object value = editor.getValue(); @@ -65,7 +65,7 @@ class CustomCollectionEditorTests { } @Test - void testWhenTargetTypeIsExactlyTheCollectionInterfaceUsesFallbackCollectionType() { + void whenTargetTypeIsExactlyTheCollectionInterfaceUsesFallbackCollectionType() { CustomCollectionEditor editor = new CustomCollectionEditor(Collection.class); editor.setValue("0, 1, 2"); Collection value = (Collection) editor.getValue(); @@ -75,7 +75,7 @@ class CustomCollectionEditorTests { } @Test - void testSunnyDaySetAsTextYieldsSingleValue() { + void sunnyDaySetAsTextYieldsSingleValue() { CustomCollectionEditor editor = new CustomCollectionEditor(ArrayList.class); editor.setValue("0, 1, 2"); Object value = editor.getValue(); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java index 99268eeae6a..2b3359ad4b9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class FileEditorTests { @Test - void testClasspathFileName() { + void classpathFileName() { PropertyEditor fileEditor = new FileEditor(); fileEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"); @@ -45,14 +45,14 @@ class FileEditorTests { } @Test - void testWithNonExistentResource() { + void withNonExistentResource() { PropertyEditor fileEditor = new FileEditor(); assertThatIllegalArgumentException().isThrownBy(() -> fileEditor.setAsText("classpath:no_way_this_file_is_found.doc")); } @Test - void testWithNonExistentFile() { + void withNonExistentFile() { PropertyEditor fileEditor = new FileEditor(); fileEditor.setAsText("file:no_way_this_file_is_found.doc"); Object value = fileEditor.getValue(); @@ -62,7 +62,7 @@ class FileEditorTests { } @Test - void testAbsoluteFileName() { + void absoluteFileName() { PropertyEditor fileEditor = new FileEditor(); fileEditor.setAsText("/no_way_this_file_is_found.doc"); Object value = fileEditor.getValue(); @@ -72,7 +72,7 @@ class FileEditorTests { } @Test - void testCurrentDirectory() { + void currentDirectory() { PropertyEditor fileEditor = new FileEditor(); fileEditor.setAsText("file:."); Object value = fileEditor.getValue(); @@ -82,7 +82,7 @@ class FileEditorTests { } @Test - void testUnqualifiedFileNameFound() { + void unqualifiedFileNameFound() { PropertyEditor fileEditor = new FileEditor(); String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"; @@ -96,7 +96,7 @@ class FileEditorTests { } @Test - void testUnqualifiedFileNameNotFound() { + void unqualifiedFileNameNotFound() { PropertyEditor fileEditor = new FileEditor(); String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".clazz"; diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java index e94f1fb0965..57dcc3a887f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java @@ -35,13 +35,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class InputStreamEditorTests { @Test - void testCtorWithNullResourceEditor() { + void ctorWithNullResourceEditor() { assertThatIllegalArgumentException().isThrownBy(() -> new InputStreamEditor(null)); } @Test - void testSunnyDay() throws IOException { + void sunnyDay() throws IOException { InputStream stream = null; try { String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + @@ -62,14 +62,14 @@ class InputStreamEditorTests { } @Test - void testWhenResourceDoesNotExist() { + void whenResourceDoesNotExist() { InputStreamEditor editor = new InputStreamEditor(); assertThatIllegalArgumentException().isThrownBy(() -> editor.setAsText("classpath:bingo!")); } @Test - void testGetAsTextReturnsNullByDefault() { + void getAsTextReturnsNullByDefault() { assertThat(new InputStreamEditor().getAsText()).isNull(); String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"; diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PathEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PathEditorTests.java index 4ee774e89d6..4fa3e7c39bf 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PathEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PathEditorTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class PathEditorTests { @Test - void testClasspathPathName() { + void classpathPathName() { PropertyEditor pathEditor = new PathEditor(); pathEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"); @@ -46,14 +46,14 @@ class PathEditorTests { } @Test - void testWithNonExistentResource() { + void withNonExistentResource() { PropertyEditor pathEditor = new PathEditor(); assertThatIllegalArgumentException().isThrownBy(() -> pathEditor.setAsText("classpath:/no_way_this_file_is_found.doc")); } @Test - void testWithNonExistentPath() { + void withNonExistentPath() { PropertyEditor pathEditor = new PathEditor(); pathEditor.setAsText("file:/no_way_this_file_is_found.doc"); Object value = pathEditor.getValue(); @@ -63,7 +63,7 @@ class PathEditorTests { } @Test - void testAbsolutePath() { + void absolutePath() { PropertyEditor pathEditor = new PathEditor(); pathEditor.setAsText("/no_way_this_file_is_found.doc"); Object value = pathEditor.getValue(); @@ -73,7 +73,7 @@ class PathEditorTests { } @Test - void testWindowsAbsolutePath() { + void windowsAbsolutePath() { PropertyEditor pathEditor = new PathEditor(); pathEditor.setAsText("C:\\no_way_this_file_is_found.doc"); Object value = pathEditor.getValue(); @@ -83,7 +83,7 @@ class PathEditorTests { } @Test - void testWindowsAbsoluteFilePath() { + void windowsAbsoluteFilePath() { PropertyEditor pathEditor = new PathEditor(); try { pathEditor.setAsText("file://C:\\no_way_this_file_is_found.doc"); @@ -100,7 +100,7 @@ class PathEditorTests { } @Test - void testCurrentDirectory() { + void currentDirectory() { PropertyEditor pathEditor = new PathEditor(); pathEditor.setAsText("file:."); Object value = pathEditor.getValue(); @@ -110,7 +110,7 @@ class PathEditorTests { } @Test - void testUnqualifiedPathNameFound() { + void unqualifiedPathNameFound() { PropertyEditor pathEditor = new PathEditor(); String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"; @@ -128,7 +128,7 @@ class PathEditorTests { } @Test - void testUnqualifiedPathNameNotFound() { + void unqualifiedPathNameNotFound() { PropertyEditor pathEditor = new PathEditor(); String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".clazz"; diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ReaderEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ReaderEditorTests.java index e06b020cfe4..601246ee7b3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ReaderEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ReaderEditorTests.java @@ -35,13 +35,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class ReaderEditorTests { @Test - void testCtorWithNullResourceEditor() { + void ctorWithNullResourceEditor() { assertThatIllegalArgumentException().isThrownBy(() -> new ReaderEditor(null)); } @Test - void testSunnyDay() throws IOException { + void sunnyDay() throws IOException { Reader reader = null; try { String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + @@ -62,7 +62,7 @@ class ReaderEditorTests { } @Test - void testWhenResourceDoesNotExist() { + void whenResourceDoesNotExist() { String resource = "classpath:bingo!"; ReaderEditor editor = new ReaderEditor(); assertThatIllegalArgumentException().isThrownBy(() -> @@ -70,7 +70,7 @@ class ReaderEditorTests { } @Test - void testGetAsTextReturnsNullByDefault() { + void getAsTextReturnsNullByDefault() { assertThat(new ReaderEditor().getAsText()).isNull(); String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"; diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java index 724939ac85c..1cd7268abd3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java @@ -37,7 +37,7 @@ class ResourceBundleEditorTests { @Test - void testSetAsTextWithJustBaseName() { + void setAsTextWithJustBaseName() { ResourceBundleEditor editor = new ResourceBundleEditor(); editor.setAsText(BASE_NAME); Object value = editor.getValue(); @@ -49,7 +49,7 @@ class ResourceBundleEditorTests { } @Test - void testSetAsTextWithBaseNameThatEndsInDefaultSeparator() { + void setAsTextWithBaseNameThatEndsInDefaultSeparator() { ResourceBundleEditor editor = new ResourceBundleEditor(); editor.setAsText(BASE_NAME + "_"); Object value = editor.getValue(); @@ -61,7 +61,7 @@ class ResourceBundleEditorTests { } @Test - void testSetAsTextWithBaseNameAndLanguageCode() { + void setAsTextWithBaseNameAndLanguageCode() { ResourceBundleEditor editor = new ResourceBundleEditor(); editor.setAsText(BASE_NAME + "Lang" + "_en"); Object value = editor.getValue(); @@ -73,7 +73,7 @@ class ResourceBundleEditorTests { } @Test - void testSetAsTextWithBaseNameLanguageAndCountryCode() { + void setAsTextWithBaseNameLanguageAndCountryCode() { ResourceBundleEditor editor = new ResourceBundleEditor(); editor.setAsText(BASE_NAME + "LangCountry" + "_en_GB"); Object value = editor.getValue(); @@ -85,7 +85,7 @@ class ResourceBundleEditorTests { } @Test - void testSetAsTextWithTheKitchenSink() { + void setAsTextWithTheKitchenSink() { ResourceBundleEditor editor = new ResourceBundleEditor(); editor.setAsText(BASE_NAME + "LangCountryDialect" + "_en_GB_GLASGOW"); Object value = editor.getValue(); @@ -97,28 +97,28 @@ class ResourceBundleEditorTests { } @Test - void testSetAsTextWithNull() { + void setAsTextWithNull() { ResourceBundleEditor editor = new ResourceBundleEditor(); assertThatIllegalArgumentException().isThrownBy(() -> editor.setAsText(null)); } @Test - void testSetAsTextWithEmptyString() { + void setAsTextWithEmptyString() { ResourceBundleEditor editor = new ResourceBundleEditor(); assertThatIllegalArgumentException().isThrownBy(() -> editor.setAsText("")); } @Test - void testSetAsTextWithWhiteSpaceString() { + void setAsTextWithWhiteSpaceString() { ResourceBundleEditor editor = new ResourceBundleEditor(); assertThatIllegalArgumentException().isThrownBy(() -> editor.setAsText(" ")); } @Test - void testSetAsTextWithJustSeparatorString() { + void setAsTextWithJustSeparatorString() { ResourceBundleEditor editor = new ResourceBundleEditor(); assertThatIllegalArgumentException().isThrownBy(() -> editor.setAsText("_")); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java index 99184604c0c..c76246bce26 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java @@ -33,13 +33,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class URLEditorTests { @Test - void testCtorWithNullResourceEditor() { + void ctorWithNullResourceEditor() { assertThatIllegalArgumentException().isThrownBy(() -> new URLEditor(null)); } @Test - void testStandardURI() { + void standardURI() { PropertyEditor urlEditor = new URLEditor(); urlEditor.setAsText("mailto:juergen.hoeller@interface21.com"); Object value = urlEditor.getValue(); @@ -49,7 +49,7 @@ class URLEditorTests { } @Test - void testStandardURL() { + void standardURL() { PropertyEditor urlEditor = new URLEditor(); urlEditor.setAsText("https://www.springframework.org"); Object value = urlEditor.getValue(); @@ -59,7 +59,7 @@ class URLEditorTests { } @Test - void testClasspathURL() { + void classpathURL() { PropertyEditor urlEditor = new URLEditor(); urlEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" + ClassUtils.getShortName(getClass()) + ".class"); @@ -71,14 +71,14 @@ class URLEditorTests { } @Test - void testWithNonExistentResource() { + void withNonExistentResource() { PropertyEditor urlEditor = new URLEditor(); assertThatIllegalArgumentException().isThrownBy(() -> urlEditor.setAsText("gonna:/freak/in/the/morning/freak/in/the.evening")); } @Test - void testSetAsTextWithNull() { + void setAsTextWithNull() { PropertyEditor urlEditor = new URLEditor(); urlEditor.setAsText(null); assertThat(urlEditor.getValue()).isNull(); @@ -86,7 +86,7 @@ class URLEditorTests { } @Test - void testGetAsTextReturnsEmptyStringIfValueNotSet() { + void getAsTextReturnsEmptyStringIfValueNotSet() { PropertyEditor urlEditor = new URLEditor(); assertThat(urlEditor.getAsText()).isEmpty(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java index 958479fb8c5..9b9ac3a776f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java @@ -38,7 +38,7 @@ class PagedListHolderTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void testPagedListHolder() { + void pagedListHolder() { TestBean tb1 = new TestBean(); tb1.setName("eva"); tb1.setAge(25); diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java index f9250104556..5ec9b19699e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; class PropertyComparatorTests { @Test - void testPropertyComparator() { + void propertyComparator() { Dog dog = new Dog(); dog.setNickName("mace"); @@ -47,7 +47,7 @@ class PropertyComparatorTests { } @Test - void testPropertyComparatorNulls() { + void propertyComparatorNulls() { Dog dog = new Dog(); Dog dog2 = new Dog(); PropertyComparator c = new PropertyComparator<>("nickName", false, true); @@ -55,7 +55,7 @@ class PropertyComparatorTests { } @Test - void testChainedComparators() { + void chainedComparators() { Comparator c = new PropertyComparator<>("lastName", false, true); Dog dog1 = new Dog(); @@ -76,7 +76,7 @@ class PropertyComparatorTests { } @Test - void testChainedComparatorsReversed() { + void chainedComparatorsReversed() { Comparator c = (new PropertyComparator("lastName", false, true)). thenComparing(new PropertyComparator<>("firstName", false, true)); diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java index 6fc3a98e60c..882b050f4ce 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java @@ -66,7 +66,7 @@ class CaffeineCacheTests extends AbstractValueAdaptingCacheTests } @Test - void testLoadingCacheGet() { + void loadingCacheGet() { Object value = new Object(); CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder() .build(key -> value)); @@ -76,7 +76,7 @@ class CaffeineCacheTests extends AbstractValueAdaptingCacheTests } @Test - void testLoadingCacheGetWithType() { + void loadingCacheGetWithType() { String value = "value"; CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder() .build(key -> value)); @@ -86,7 +86,7 @@ class CaffeineCacheTests extends AbstractValueAdaptingCacheTests } @Test - void testLoadingCacheGetWithWrongType() { + void loadingCacheGetWithWrongType() { String value = "value"; CaffeineCache loadingCache = new CaffeineCache(CACHE_NAME, Caffeine.newBuilder() .build(key -> value)); @@ -94,7 +94,7 @@ class CaffeineCacheTests extends AbstractValueAdaptingCacheTests } @Test - void testPutIfAbsentNullValue() { + void putIfAbsentNullValue() { CaffeineCache cache = getCache(); Object key = new Object(); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java index 1bf8868122b..d49c373697b 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java @@ -78,26 +78,26 @@ class JCacheEhCacheAnnotationTests extends AbstractCacheAnnotationTests { @Override @Test @Disabled("Multi cache manager support to be added") - public void testCustomCacheManager() { + protected void customCacheManager() { } @Test - void testEvictWithTransaction() { + void evictWithTransaction() { txTemplate.executeWithoutResult(s -> testEvict(this.cs, false)); } @Test - void testEvictEarlyWithTransaction() { + void evictEarlyWithTransaction() { txTemplate.executeWithoutResult(s -> testEvictEarly(this.cs)); } @Test - void testEvictAllWithTransaction() { + void evictAllWithTransaction() { txTemplate.executeWithoutResult(s -> testEvictAll(this.cs, false)); } @Test - void testEvictAllEarlyWithTransaction() { + void evictAllEarlyWithTransaction() { txTemplate.executeWithoutResult(s -> testEvictAllEarly(this.cs)); } diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java index 5ac030e383d..20126310244 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java @@ -82,7 +82,7 @@ class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests } @Test - void testPutIfAbsentNullValue() { + void putIfAbsentNullValue() { JCacheCache cache = getCache(true); String key = createRandomKey(); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheNamespaceDrivenTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheNamespaceDrivenTests.java index 73ffcb9a7ce..904b7e3d74f 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheNamespaceDrivenTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheNamespaceDrivenTests.java @@ -50,7 +50,7 @@ class JCacheNamespaceDrivenTests extends AbstractJCacheAnnotationTests { } @Test - void testCacheErrorHandler() { + void cacheErrorHandler() { JCacheInterceptor ci = ctx.getBean(JCacheInterceptor.class); assertThat(ci.getErrorHandler()).isSameAs(ctx.getBean("errorHandler", CacheErrorHandler.class)); } diff --git a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java index cb7c55bfbf5..320d001faa4 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class SimpleMailMessageTests { @Test - void testSimpleMessageCopyCtor() { + void simpleMessageCopyCtor() { SimpleMailMessage message = new SimpleMailMessage(); message.setFrom("me@mail.org"); message.setTo("you@mail.org"); @@ -81,8 +81,7 @@ class SimpleMailMessageTests { } @Test - void testDeepCopyOfStringArrayTypedFieldsOnCopyCtor() { - + void deepCopyOfStringArrayTypedFieldsOnCopyCtor() { SimpleMailMessage original = new SimpleMailMessage(); original.setTo("fiona@mail.org", "apple@mail.org"); original.setCc("he@mail.org", "she@mail.org"); @@ -103,7 +102,7 @@ class SimpleMailMessageTests { * Tests that two equal SimpleMailMessages have equal hash codes. */ @Test - public final void testHashCode() { + void equalMessagesHaveEqualHashCodes() { SimpleMailMessage message1 = new SimpleMailMessage(); message1.setFrom("from@somewhere"); message1.setReplyTo("replyTo@somewhere"); @@ -118,11 +117,11 @@ class SimpleMailMessageTests { SimpleMailMessage message2 = new SimpleMailMessage(message1); assertThat(message2).isEqualTo(message1); - assertThat(message2.hashCode()).isEqualTo(message1.hashCode()); + assertThat(message2).hasSameHashCodeAs(message1); } @Test - public final void testEqualsObject() { + void equalsBehavior() { SimpleMailMessage message1; SimpleMailMessage message2; @@ -160,15 +159,13 @@ class SimpleMailMessageTests { } @Test - void testCopyCtorChokesOnNullOriginalMessage() { - assertThatIllegalArgumentException().isThrownBy(() -> - new SimpleMailMessage(null)); + void copyCtorChokesOnNullOriginalMessage() { + assertThatIllegalArgumentException().isThrownBy(() -> new SimpleMailMessage(null)); } @Test - void testCopyToChokesOnNullTargetMessage() { - assertThatIllegalArgumentException().isThrownBy(() -> - new SimpleMailMessage().copyTo(null)); + void copyToChokesOnNullTargetMessage() { + assertThatIllegalArgumentException().isThrownBy(() -> new SimpleMailMessage().copyTo(null)); } } diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index b87f87f7332..2289cd81fb1 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -441,13 +441,13 @@ class JavaMailSenderTests { } @Test - void testConnection() { + void connection() { sender.setHost("host"); assertThatNoException().isThrownBy(sender::testConnection); } @Test - void testConnectionWithFailure() { + void connectionWithFailure() { sender.setHost(null); assertThatExceptionOfType(MessagingException.class).isThrownBy(sender::testConnection); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java index 890c126f979..3bc1804c0e0 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSchedulerLifecycleTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; class QuartzSchedulerLifecycleTests { @Test // SPR-6354 - public void destroyLazyInitSchedulerWithDefaultShutdownOrderDoesNotHang() { + void destroyLazyInitSchedulerWithDefaultShutdownOrderDoesNotHang() { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("quartzSchedulerLifecycleTests.xml", getClass()); assertThat(context.getBean("lazyInitSchedulerWithDefaultShutdownOrder")).isNotNull(); @@ -44,7 +44,7 @@ class QuartzSchedulerLifecycleTests { } @Test // SPR-6354 - public void destroyLazyInitSchedulerWithCustomShutdownOrderDoesNotHang() { + void destroyLazyInitSchedulerWithCustomShutdownOrderDoesNotHang() { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("quartzSchedulerLifecycleTests.xml", getClass()); assertThat(context.getBean("lazyInitSchedulerWithCustomShutdownOrder")).isNotNull(); diff --git a/spring-context-support/src/test/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBeanTests.java b/spring-context-support/src/test/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBeanTests.java index 3f57d1f502f..6bb0596e679 100644 --- a/spring-context-support/src/test/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBeanTests.java +++ b/spring-context-support/src/test/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBeanTests.java @@ -62,7 +62,7 @@ class FreeMarkerConfigurationFactoryBeanTests { @Test @SuppressWarnings("rawtypes") - public void freeMarkerConfigurationFactoryBeanWithNonFileResourceLoaderPath() throws Exception { + void freeMarkerConfigurationFactoryBeanWithNonFileResourceLoaderPath() throws Exception { fcfb.setTemplateLoaderPath("file:/mydir"); Properties settings = new Properties(); settings.setProperty("localized_lookup", "false"); @@ -88,7 +88,7 @@ class FreeMarkerConfigurationFactoryBeanTests { } @Test // SPR-12448 - public void freeMarkerConfigurationAsBean() { + void freeMarkerConfigurationAsBean() { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); RootBeanDefinition loaderDef = new RootBeanDefinition(SpringTemplateLoader.class); loaderDef.getConstructorArgumentValues().addGenericArgumentValue(new DefaultResourceLoader()); 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 728afb1526c..5c3069e1880 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 @@ -67,25 +67,25 @@ class AroundAdviceBindingTests { } @Test - void testOneIntArg() { + void oneIntArg() { testBeanProxy.setAge(5); verify(mockCollaborator).oneIntArg(5); } @Test - void testOneObjectArgBoundToTarget() { + void oneObjectArgBoundToTarget() { testBeanProxy.getAge(); verify(mockCollaborator).oneObjectArg(this.testBeanTarget); } @Test - void testOneIntAndOneObjectArgs() { + void oneIntAndOneObjectArgs() { testBeanProxy.setAge(5); verify(mockCollaborator).oneIntAndOneObject(5, this.testBeanProxy); } @Test - void testJustJoinPoint() { + void justJoinPoint() { testBeanProxy.getAge(); verify(mockCollaborator).justJoinPoint("getAge"); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java index d4cc936a229..ea9ceb33b24 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AroundAdviceCircularTests extends AroundAdviceBindingTests { @Test - void testBothBeansAreProxies() { + void bothBeansAreProxies() { Object tb = ctx.getBean("testBean"); assertThat(AopUtils.isAopProxy(tb)).isTrue(); Object tb2 = ctx.getBean("testBean2"); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index ac48765d9d9..b81c02aa440 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -66,7 +66,7 @@ class AspectAndAdvicePrecedenceTests { @Test - void testAdviceOrder() { + void adviceOrder() { PrecedenceTestAspect.Collaborator collaborator = new PrecedenceVerifyingCollaborator(); this.highPrecedenceAspect.setCollaborator(collaborator); this.lowPrecedenceAspect.setCollaborator(collaborator); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 493daac5d6f..d5fe95d30e9 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -74,7 +74,7 @@ class BeanNamePointcutTests { // We don't need to test all combination of pointcuts due to BeanNamePointcutMatchingTests @Test - void testMatchingBeanName() { + void matchingBeanName() { boolean condition = this.testBean1 instanceof Advised; assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); // Call two methods to test for SPR-3953-like condition @@ -84,7 +84,7 @@ class BeanNamePointcutTests { } @Test - void testNonMatchingBeanName() { + void nonMatchingBeanName() { boolean condition = this.testBean2 instanceof Advised; assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); this.testBean2.setAge(20); @@ -92,13 +92,13 @@ class BeanNamePointcutTests { } @Test - void testNonMatchingNestedBeanName() { + void nonMatchingNestedBeanName() { boolean condition = this.testBeanContainingNestedBean.getDoctor() instanceof Advised; assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); } @Test - void testMatchingFactoryBeanObject() { + void matchingFactoryBeanObject() { boolean condition1 = this.testFactoryBean1 instanceof Advised; assertThat(condition1).as("Matching bean must be advised (proxied)").isTrue(); assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue"); @@ -110,7 +110,7 @@ class BeanNamePointcutTests { } @Test - void testMatchingFactoryBeanItself() { + void matchingFactoryBeanItself() { boolean condition1 = !(this.testFactoryBean2 instanceof Advised); assertThat(condition1).as("Matching bean must *not* be advised (proxied)").isTrue(); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean2"); @@ -122,7 +122,7 @@ class BeanNamePointcutTests { } @Test - void testPointcutAdvisorCombination() { + void pointcutAdvisorCombination() { boolean condition = this.interceptThis instanceof Advised; assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); boolean condition1 = this.dontInterceptThis instanceof Advised; diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java index 374dd2af917..15ee5f73c38 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java @@ -34,7 +34,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; class ImplicitJPArgumentMatchingAtAspectJTests { @Test - void testAspect() { + void aspect() { // nothing to really test; it is enough if we don't get error while creating the app context new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java index 0bc5e7c493c..f751d3f95db 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java @@ -32,7 +32,7 @@ class ImplicitJPArgumentMatchingTests { @Test @SuppressWarnings("resource") - void testAspect() { + void aspect() { // nothing to really test; it is enough if we don't get error while creating app context new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java index c1d3a3f509f..1554396a17c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java @@ -34,13 +34,13 @@ class OverloadedAdviceTests { @Test @SuppressWarnings("resource") - void testConfigParsingWithMismatchedAdviceMethod() { + void configParsingWithMismatchedAdviceMethod() { new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } @Test @SuppressWarnings("resource") - void testExceptionOnConfigParsingWithAmbiguousAdviceMethod() { + void exceptionOnConfigParsingWithAmbiguousAdviceMethod() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ambiguous.xml", getClass())) .havingRootCause() diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index 5b4638678cc..9e33ca27dc0 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java @@ -60,19 +60,19 @@ class ProceedTests { @Test - void testSimpleProceedWithChangedArgs() { + void simpleProceedWithChangedArgs() { this.testBean.setName("abc"); assertThat(this.testBean.getName()).as("Name changed in around advice").isEqualTo("ABC"); } @Test - void testGetArgsIsDefensive() { + void getArgsIsDefensive() { this.testBean.setAge(5); assertThat(this.testBean.getAge()).as("getArgs is defensive").isEqualTo(5); } @Test - void testProceedWithArgsInSameAspect() { + void proceedWithArgsInSameAspect() { this.testBean.setMyFloat(1.0F); assertThat(this.testBean.getMyFloat()).as("value changed in around advice").isGreaterThan(1.9F); assertThat(this.firstTestAspect.getLastBeforeFloatValue()).as("changed value visible to next advice in chain") @@ -80,7 +80,7 @@ class ProceedTests { } @Test - void testProceedWithArgsAcrossAspects() { + void proceedWithArgsAcrossAspects() { this.testBean.setSex("male"); assertThat(this.testBean.getSex()).as("value changed in around advice").isEqualTo("MALE"); assertThat(this.secondTestAspect.getLastBeforeStringValue()).as("changed value visible to next before advice in chain").isEqualTo("MALE"); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java index 472e566d21a..040583a965b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AspectJAutoProxyCreatorAndLazyInitTargetSourceTests { @Test - void testAdrian() { + void adrian() { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass()); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index 60b4a1a61cf..ce718f557eb 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java @@ -48,19 +48,19 @@ class AtAspectJAnnotationBindingTests { @Test - void testAnnotationBindingInAroundAdvice() { + void annotationBindingInAroundAdvice() { assertThat(testBean.doThis()).isEqualTo("this value doThis"); assertThat(testBean.doThat()).isEqualTo("that value doThat"); assertThat(testBean.doArray()).hasSize(2); } @Test - void testNoMatchingWithoutAnnotationPresent() { + void noMatchingWithoutAnnotationPresent() { assertThat(testBean.doTheOther()).isEqualTo("doTheOther"); } @Test - void testPointcutEvaluatedAgainstArray() { + void pointcutEvaluatedAgainstArray() { ctx.getBean("arrayFactoryBean"); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java index 3c5e928a9d7..eae87f550b2 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests.java @@ -33,13 +33,13 @@ import static org.assertj.core.api.Assertions.assertThat; class GenericBridgeMethodMatchingClassProxyTests extends GenericBridgeMethodMatchingTests { @Test - void testGenericDerivedInterfaceMethodThroughClass() { + void genericDerivedInterfaceMethodThroughClass() { ((DerivedStringParameterizedClass) testBean).genericDerivedInterfaceMethod(""); assertThat(counterAspect.count).isEqualTo(1); } @Test - void testGenericBaseInterfaceMethodThroughClass() { + void genericBaseInterfaceMethodThroughClass() { ((DerivedStringParameterizedClass) testBean).genericBaseInterfaceMethod(""); assertThat(counterAspect.count).isEqualTo(1); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java index 85c1a690b56..51365938806 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java @@ -68,13 +68,13 @@ class GenericBridgeMethodMatchingTests { @Test - void testGenericDerivedInterfaceMethodThroughInterface() { + void genericDerivedInterfaceMethodThroughInterface() { testBean.genericDerivedInterfaceMethod(""); assertThat(counterAspect.count).isEqualTo(1); } @Test - void testGenericBaseInterfaceMethodThroughInterface() { + void genericBaseInterfaceMethodThroughInterface() { testBean.genericBaseInterfaceMethod(""); assertThat(counterAspect.count).isEqualTo(1); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index 36e00f5c0f1..36065b40b59 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -61,19 +61,19 @@ class GenericParameterMatchingTests { @Test - void testGenericInterfaceGenericArgExecution() { + void genericInterfaceGenericArgExecution() { testBean.save(""); assertThat(counterAspect.genericInterfaceGenericArgExecutionCount).isEqualTo(1); } @Test - void testGenericInterfaceGenericCollectionArgExecution() { + void genericInterfaceGenericCollectionArgExecution() { testBean.saveAll(null); assertThat(counterAspect.genericInterfaceGenericCollectionArgExecutionCount).isEqualTo(1); } @Test - void testGenericInterfaceSubtypeGenericCollectionArgExecution() { + void genericInterfaceSubtypeGenericCollectionArgExecution() { testBean.saveAll(null); assertThat(counterAspect.genericInterfaceSubtypeGenericCollectionArgExecutionCount).isEqualTo(1); } diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java index 7ab1d8b51d7..fdff6f8814c 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java @@ -31,12 +31,12 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AopNamespaceHandlerAdviceTypeTests { @Test - void testParsingOfAdviceTypes() { + void parsingOfAdviceTypes() { new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass()); } @Test - void testParsingOfAdviceTypesWithError() { + void parsingOfAdviceTypesWithError() { assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-error.xml", getClass())) .matches(ex -> ex.contains(SAXParseException.class)); diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java index 43899643d19..89dbec507f5 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java @@ -30,12 +30,12 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AopNamespaceHandlerArgNamesTests { @Test - void testArgNamesOK() { + void argNamesOK() { new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass()); } @Test - void testArgNamesError() { + void argNamesError() { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-error.xml", getClass())) .matches(ex -> ex.contains(IllegalArgumentException.class)); diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java index 7b4283f0c27..cfd20662d6a 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AopNamespaceHandlerProxyTargetClassTests extends AopNamespaceHandlerTests { @Test - void testIsClassProxy() { + void isClassProxy() { ITestBean bean = getTestBean(); assertThat(AopUtils.isCglibProxy(bean)).as("Should be a CGLIB proxy").isTrue(); assertThat(((Advised) bean).isExposeProxy()).as("Should expose proxy").isTrue(); diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java index 5e9540a47ca..2e34cd153a4 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java @@ -31,12 +31,12 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AopNamespaceHandlerReturningTests { @Test - void testReturningOnReturningAdvice() { + void returningOnReturningAdvice() { new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass()); } @Test - void testParseReturningOnOtherAdviceType() { + void parseReturningOnOtherAdviceType() { assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-error.xml", getClass())) .matches(ex -> ex.contains(SAXParseException.class)); diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java index d5f08a8d47a..b7a03611957 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java @@ -53,7 +53,7 @@ class AopNamespaceHandlerTests { @Test - void testIsProxy() { + void isProxy() { ITestBean bean = getTestBean(); assertThat(AopUtils.isAopProxy(bean)).as("Bean is not a proxy").isTrue(); @@ -66,7 +66,7 @@ class AopNamespaceHandlerTests { } @Test - void testAdviceInvokedCorrectly() { + void adviceInvokedCorrectly() { CountingBeforeAdvice getAgeCounter = (CountingBeforeAdvice) this.context.getBean("getAgeCounter"); CountingBeforeAdvice getNameCounter = (CountingBeforeAdvice) this.context.getBean("getNameCounter"); @@ -87,7 +87,7 @@ class AopNamespaceHandlerTests { } @Test - void testAspectApplied() { + void aspectApplied() { ITestBean bean = getTestBean(); CountingAspectJAdvice advice = (CountingAspectJAdvice) this.context.getBean("countingAdvice"); @@ -107,7 +107,7 @@ class AopNamespaceHandlerTests { } @Test - void testAspectAppliedForInitializeBeanWithEmptyName() { + void aspectAppliedForInitializeBeanWithEmptyName() { ITestBean bean = (ITestBean) this.context.getAutowireCapableBeanFactory().initializeBean(new TestBean(), ""); CountingAspectJAdvice advice = (CountingAspectJAdvice) this.context.getBean("countingAdvice"); @@ -127,7 +127,7 @@ class AopNamespaceHandlerTests { } @Test - void testAspectAppliedForInitializeBeanWithNullName() { + void aspectAppliedForInitializeBeanWithNullName() { ITestBean bean = (ITestBean) this.context.getAutowireCapableBeanFactory().initializeBean(new TestBean(), null); CountingAspectJAdvice advice = (CountingAspectJAdvice) this.context.getBean("countingAdvice"); diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java index 405e0d28e6d..132b6046816 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java @@ -31,12 +31,12 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AopNamespaceHandlerThrowingTests { @Test - void testThrowingOnThrowingAdvice() { + void throwingOnThrowingAdvice() { new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass()); } @Test - void testParseThrowingOnOtherAdviceType() { + void parseThrowingOnOtherAdviceType() { assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-error.xml", getClass())) .matches(ex -> ex.contains(SAXParseException.class)); 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 58014a91f7a..1d00aa02680 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 @@ -40,24 +40,24 @@ class MethodLocatingFactoryBeanTests { @Test - void testIsSingleton() { + void isSingleton() { assertThat(factory.isSingleton()).isTrue(); } @Test - void testGetObjectType() { + void getObjectType() { assertThat(factory.getObjectType()).isEqualTo(Method.class); } @Test - void testWithNullTargetBeanName() { + void withNullTargetBeanName() { factory.setMethodName("toString()"); assertThatIllegalArgumentException().isThrownBy(() -> factory.setBeanFactory(beanFactory)); } @Test - void testWithEmptyTargetBeanName() { + void withEmptyTargetBeanName() { factory.setTargetBeanName(""); factory.setMethodName("toString()"); assertThatIllegalArgumentException().isThrownBy(() -> @@ -65,14 +65,14 @@ class MethodLocatingFactoryBeanTests { } @Test - void testWithNullTargetMethodName() { + void withNullTargetMethodName() { factory.setTargetBeanName(BEAN_NAME); assertThatIllegalArgumentException().isThrownBy(() -> factory.setBeanFactory(beanFactory)); } @Test - void testWithEmptyTargetMethodName() { + void withEmptyTargetMethodName() { factory.setTargetBeanName(BEAN_NAME); factory.setMethodName(""); assertThatIllegalArgumentException().isThrownBy(() -> @@ -80,7 +80,7 @@ class MethodLocatingFactoryBeanTests { } @Test - void testWhenTargetBeanClassCannotBeResolved() { + void whenTargetBeanClassCannotBeResolved() { factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("toString()"); assertThatIllegalArgumentException().isThrownBy(() -> @@ -90,7 +90,7 @@ class MethodLocatingFactoryBeanTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - void testSunnyDayPath() throws Exception { + void sunnyDayPath() throws Exception { given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class); factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("toString()"); @@ -105,7 +105,7 @@ class MethodLocatingFactoryBeanTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - void testWhereMethodCannotBeResolved() { + void whereMethodCannotBeResolved() { given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class); factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("loadOfOld()"); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index f931e0850d2..b4c6c3a7c0c 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -337,7 +337,7 @@ abstract class AbstractAopProxyTests { @Test // Should fail to get proxy as exposeProxy wasn't set to true - public void targetCantGetProxyByDefault() { + void targetCantGetProxyByDefault() { NeedsToSeeProxy et = new NeedsToSeeProxy(); ProxyFactory pf1 = new ProxyFactory(et); assertThat(pf1.isExposeProxy()).isFalse(); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index ce4606ce2f5..d62cc41eb3c 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -102,25 +102,25 @@ class ProxyFactoryBeanTests { @Test - void testIsDynamicProxyWhenInterfaceSpecified() { + void isDynamicProxyWhenInterfaceSpecified() { ITestBean test1 = (ITestBean) factory.getBean("test1"); assertThat(Proxy.isProxyClass(test1.getClass())).as("test1 is a dynamic proxy").isTrue(); } @Test - void testIsDynamicProxyWhenInterfaceSpecifiedForPrototype() { + void isDynamicProxyWhenInterfaceSpecifiedForPrototype() { ITestBean test1 = (ITestBean) factory.getBean("test2"); assertThat(Proxy.isProxyClass(test1.getClass())).as("test2 is a dynamic proxy").isTrue(); } @Test - void testIsDynamicProxyWhenAutodetectingInterfaces() { + void isDynamicProxyWhenAutodetectingInterfaces() { ITestBean test1 = (ITestBean) factory.getBean("test3"); assertThat(Proxy.isProxyClass(test1.getClass())).as("test3 is a dynamic proxy").isTrue(); } @Test - void testIsDynamicProxyWhenAutodetectingInterfacesForPrototype() { + void isDynamicProxyWhenAutodetectingInterfacesForPrototype() { ITestBean test1 = (ITestBean) factory.getBean("test4"); assertThat(Proxy.isProxyClass(test1.getClass())).as("test4 is a dynamic proxy").isTrue(); } @@ -130,17 +130,18 @@ class ProxyFactoryBeanTests { * interceptor chain and targetSource property. */ @Test - void testDoubleTargetSourcesAreRejected() { - testDoubleTargetSourceIsRejected("doubleTarget"); + void doubleTargetSourcesAreRejected() { + assertDoubleTargetSourceIsRejected("doubleTarget"); // Now with conversion from arbitrary bean to a TargetSource - testDoubleTargetSourceIsRejected("arbitraryTarget"); + assertDoubleTargetSourceIsRejected("arbitraryTarget"); } - private void testDoubleTargetSourceIsRejected(String name) { + private static void assertDoubleTargetSourceIsRejected(String name) { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(DBL_TARGETSOURCE_CONTEXT, CLASS)); - assertThatExceptionOfType(BeanCreationException.class).as("Should not allow TargetSource to be specified in interceptorNames as well as targetSource property") + assertThatExceptionOfType(BeanCreationException.class) + .as("Should not allow TargetSource to be specified in interceptorNames as well as targetSource property") .isThrownBy(() -> bf.getBean(name)) .havingCause() .isInstanceOf(AopConfigException.class) @@ -148,7 +149,7 @@ class ProxyFactoryBeanTests { } @Test - void testTargetSourceNotAtEndOfInterceptorNamesIsRejected() { + void targetSourceNotAtEndOfInterceptorNamesIsRejected() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(NOTLAST_TARGETSOURCE_CONTEXT, CLASS)); @@ -160,7 +161,7 @@ class ProxyFactoryBeanTests { } @Test - void testGetObjectTypeWithDirectTarget() { + void getObjectTypeWithDirectTarget() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS)); @@ -177,7 +178,7 @@ class ProxyFactoryBeanTests { } @Test - void testGetObjectTypeWithTargetViaTargetSource() { + void getObjectTypeWithTargetViaTargetSource() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS)); ITestBean tb = (ITestBean) bf.getBean("viaTargetSource"); @@ -187,7 +188,7 @@ class ProxyFactoryBeanTests { } @Test - void testGetObjectTypeWithNoTargetOrTargetSource() { + void getObjectTypeWithNoTargetOrTargetSource() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS)); @@ -198,7 +199,7 @@ class ProxyFactoryBeanTests { } @Test - void testGetObjectTypeOnUninitializedFactoryBean() { + void getObjectTypeOnUninitializedFactoryBean() { ProxyFactoryBean pfb = new ProxyFactoryBean(); assertThat(pfb.getObjectType()).isNull(); } @@ -208,7 +209,7 @@ class ProxyFactoryBeanTests { * Interceptors and interfaces and the target are the same. */ @Test - void testSingletonInstancesAreEqual() { + void singletonInstancesAreEqual() { ITestBean test1 = (ITestBean) factory.getBean("test1"); ITestBean test1_1 = (ITestBean) factory.getBean("test1"); //assertTrue("Singleton instances ==", test1 == test1_1); @@ -232,7 +233,7 @@ class ProxyFactoryBeanTests { } @Test - void testPrototypeInstancesAreNotEqual() { + void prototypeInstancesAreNotEqual() { assertThat(factory.getType("prototype")).isAssignableTo(ITestBean.class); ITestBean test2 = (ITestBean) factory.getBean("prototype"); ITestBean test2_1 = (ITestBean) factory.getBean("prototype"); @@ -246,7 +247,7 @@ class ProxyFactoryBeanTests { * @param beanName name of the ProxyFactoryBean definition that should * be a prototype */ - private Object testPrototypeInstancesAreIndependent(String beanName) { + private static Object assertPrototypeInstancesAreIndependent(String beanName) { // Initial count value set in bean factory XML int INITIAL_COUNT = 10; @@ -276,8 +277,8 @@ class ProxyFactoryBeanTests { } @Test - void testCglibPrototypeInstance() { - Object prototype = testPrototypeInstancesAreIndependent("cglibPrototype"); + void cglibPrototypeInstance() { + Object prototype = assertPrototypeInstancesAreIndependent("cglibPrototype"); assertThat(AopUtils.isCglibProxy(prototype)).as("It's a cglib proxy").isTrue(); assertThat(AopUtils.isJdkDynamicProxy(prototype)).as("It's not a dynamic proxy").isFalse(); } @@ -286,7 +287,7 @@ class ProxyFactoryBeanTests { * Test invoker is automatically added to manipulate target. */ @Test - void testAutoInvoker() { + void autoInvoker() { String name = "Hieronymous"; TestBean target = (TestBean) factory.getBean("test"); target.setName(name); @@ -295,7 +296,7 @@ class ProxyFactoryBeanTests { } @Test - void testCanGetFactoryReferenceAndManipulate() { + void canGetFactoryReferenceAndManipulate() { ProxyFactoryBean config = (ProxyFactoryBean) factory.getBean("&test1"); assertThat(config.getObjectType()).isAssignableTo(ITestBean.class); assertThat(factory.getType("test1")).isAssignableTo(ITestBean.class); @@ -327,7 +328,7 @@ class ProxyFactoryBeanTests { * autowire without ambiguity from target and proxy */ @Test - void testTargetAsInnerBean() { + void targetAsInnerBean() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INNER_BEAN_TARGET_CONTEXT, CLASS)); ITestBean itb = (ITestBean) bf.getBean("testBean"); @@ -343,7 +344,7 @@ class ProxyFactoryBeanTests { * Each instance will be independent. */ @Test - void testCanAddAndRemoveAspectInterfacesOnPrototype() { + void canAddAndRemoveAspectInterfacesOnPrototype() { assertThat(factory.getBean("test2")).as("Shouldn't implement TimeStamped before manipulation") .isNotInstanceOf(TimeStamped.class); @@ -402,7 +403,7 @@ class ProxyFactoryBeanTests { * singleton. */ @Test - void testCanAddAndRemoveAdvicesOnSingleton() { + void canAddAndRemoveAdvicesOnSingleton() { ITestBean it = (ITestBean) factory.getBean("test1"); Advised pc = (Advised) it; it.getAge(); @@ -415,7 +416,7 @@ class ProxyFactoryBeanTests { } @Test - void testMethodPointcuts() { + void methodPointcuts() { ITestBean tb = (ITestBean) factory.getBean("pointcuts"); PointcutForVoid.reset(); assertThat(PointcutForVoid.methodNames).as("No methods intercepted").isEmpty(); @@ -430,7 +431,7 @@ class ProxyFactoryBeanTests { } @Test - void testCanAddThrowsAdviceWithoutAdvisor() { + void canAddThrowsAdviceWithoutAdvisor() { DefaultListableBeanFactory f = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(f).loadBeanDefinitions(new ClassPathResource(THROWS_ADVICE_CONTEXT, CLASS)); MyThrowsHandler th = (MyThrowsHandler) f.getBean("throwsAdvice"); @@ -463,19 +464,19 @@ class ProxyFactoryBeanTests { // TODO put in sep file to check quality of error message /* @Test - void testNoInterceptorNamesWithoutTarget() { + void noInterceptorNamesWithoutTarget() { assertThatExceptionOfType(AopConfigurationException.class).as("Should require interceptor names").isThrownBy(() -> ITestBean tb = (ITestBean) factory.getBean("noInterceptorNamesWithoutTarget")); } @Test - void testNoInterceptorNamesWithTarget() { + void noInterceptorNamesWithTarget() { ITestBean tb = (ITestBean) factory.getBean("noInterceptorNamesWithoutTarget"); } */ @Test - void testEmptyInterceptorNames() { + void emptyInterceptorNames() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INVALID_CONTEXT, CLASS)); assertThat(bf.getBean("emptyInterceptorNames")).isInstanceOf(ITestBean.class); @@ -486,7 +487,7 @@ class ProxyFactoryBeanTests { * Globals must be followed by a target. */ @Test - void testGlobalsWithoutTarget() { + void globalsWithoutTarget() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INVALID_CONTEXT, CLASS)); assertThatExceptionOfType(BeanCreationException.class).as("Should require target name").isThrownBy(() -> @@ -501,7 +502,7 @@ class ProxyFactoryBeanTests { * to be included in proxiedInterface []. */ @Test - void testGlobalsCanAddAspectInterfaces() { + void globalsCanAddAspectInterfaces() { AddedGlobalInterface agi = (AddedGlobalInterface) factory.getBean("autoInvoker"); assertThat(agi.globalsAdded()).isEqualTo(-1); @@ -520,7 +521,7 @@ class ProxyFactoryBeanTests { } @Test - void testSerializableSingletonProxy() throws Exception { + void serializableSingletonProxy() throws Exception { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS)); Person p = (Person) bf.getBean("serializableSingleton"); @@ -543,7 +544,7 @@ class ProxyFactoryBeanTests { } @Test - void testSerializablePrototypeProxy() throws Exception { + void serializablePrototypeProxy() throws Exception { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS)); Person p = (Person) bf.getBean("serializablePrototype"); @@ -555,7 +556,7 @@ class ProxyFactoryBeanTests { } @Test - void testSerializableSingletonProxyFactoryBean() throws Exception { + void serializableSingletonProxyFactoryBean() throws Exception { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS)); Person p = (Person) bf.getBean("serializableSingleton"); @@ -568,7 +569,7 @@ class ProxyFactoryBeanTests { } @Test - void testProxyNotSerializableBecauseOfAdvice() throws Exception { + void proxyNotSerializableBecauseOfAdvice() throws Exception { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS)); Person p = (Person) bf.getBean("interceptorNotSerializableSingleton"); @@ -576,7 +577,7 @@ class ProxyFactoryBeanTests { } @Test - void testPrototypeAdvisor() { + void prototypeAdvisor() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(CONTEXT, CLASS)); @@ -597,7 +598,7 @@ class ProxyFactoryBeanTests { } @Test - void testPrototypeInterceptorSingletonTarget() { + void prototypeInterceptorSingletonTarget() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(CONTEXT, CLASS)); @@ -622,14 +623,14 @@ class ProxyFactoryBeanTests { * Checks for correct use of getType() by bean factory. */ @Test - void testInnerBeanTargetUsingAutowiring() { + void innerBeanTargetUsingAutowiring() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(AUTOWIRING_CONTEXT, CLASS)); bf.getBean("testBean"); } @Test - void testFrozenFactoryBean() { + void frozenFactoryBean() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(FROZEN_CONTEXT, CLASS)); @@ -638,7 +639,7 @@ class ProxyFactoryBeanTests { } @Test - void testDetectsInterfaces() { + void detectsInterfaces() { ProxyFactoryBean fb = new ProxyFactoryBean(); fb.setTarget(new TestBean()); fb.addAdvice(new DebugInterceptor()); @@ -649,7 +650,7 @@ class ProxyFactoryBeanTests { } @Test - void testWithInterceptorNames() { + void withInterceptorNames() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerSingleton("debug", new DebugInterceptor()); @@ -663,7 +664,7 @@ class ProxyFactoryBeanTests { } @Test - void testWithLateInterceptorNames() { + void withLateInterceptorNames() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerSingleton("debug", new DebugInterceptor()); diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java index affe8a42da4..e0efad450d1 100644 --- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java @@ -71,7 +71,7 @@ class CommonsPool2TargetSourceTests { this.beanFactory.destroySingletons(); } - private void testFunctionality(String name) { + private void assertFunctionality(String name) { SideEffectBean pooled = (SideEffectBean) beanFactory.getBean(name); assertThat(pooled.getCount()).isEqualTo(INITIAL_COUNT); pooled.doWork(); @@ -85,17 +85,17 @@ class CommonsPool2TargetSourceTests { } @Test - void testFunctionality() { - testFunctionality("pooled"); + void functionality() { + assertFunctionality("pooled"); } @Test - void testFunctionalityWithNoInterceptors() { - testFunctionality("pooledNoInterceptors"); + void functionalityWithNoInterceptors() { + assertFunctionality("pooledNoInterceptors"); } @Test - void testConfigMixin() { + void configMixin() { SideEffectBean pooled = (SideEffectBean) beanFactory.getBean("pooledWithMixin"); assertThat(pooled.getCount()).isEqualTo(INITIAL_COUNT); PoolingConfig conf = (PoolingConfig) beanFactory.getBean("pooledWithMixin"); @@ -110,7 +110,7 @@ class CommonsPool2TargetSourceTests { } @Test - void testTargetSourceSerializableWithoutConfigMixin() throws Exception { + void targetSourceSerializableWithoutConfigMixin() throws Exception { CommonsPool2TargetSource cpts = (CommonsPool2TargetSource) beanFactory.getBean("personPoolTargetSource"); SingletonTargetSource serialized = SerializationTestUtils.serializeAndDeserialize(cpts, SingletonTargetSource.class); @@ -118,7 +118,7 @@ class CommonsPool2TargetSourceTests { } @Test - void testProxySerializableWithoutConfigMixin() throws Exception { + void proxySerializableWithoutConfigMixin() throws Exception { Person pooled = (Person) beanFactory.getBean("pooledPerson"); boolean condition1 = ((Advised) pooled).getTargetSource() instanceof CommonsPool2TargetSource; @@ -133,7 +133,7 @@ class CommonsPool2TargetSourceTests { } @Test - void testHitMaxSize() throws Exception { + void hitMaxSize() throws Exception { int maxSize = 10; CommonsPool2TargetSource targetSource = new CommonsPool2TargetSource(); @@ -164,7 +164,7 @@ class CommonsPool2TargetSourceTests { } @Test - void testHitMaxSizeLoadedFromContext() throws Exception { + void hitMaxSizeLoadedFromContext() throws Exception { Advised person = (Advised) beanFactory.getBean("maxSizePooledPerson"); CommonsPool2TargetSource targetSource = (CommonsPool2TargetSource) person.getTargetSource(); @@ -192,7 +192,7 @@ class CommonsPool2TargetSourceTests { } @Test - void testSetWhenExhaustedAction() { + void setWhenExhaustedAction() { CommonsPool2TargetSource targetSource = new CommonsPool2TargetSource(); targetSource.setBlockWhenExhausted(true); assertThat(targetSource.isBlockWhenExhausted()).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java index f293ddf7fe4..8e69d52afdf 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java @@ -49,7 +49,7 @@ class LookupMethodWrappedByCglibProxyTests { } @Test - void testAutoProxiedLookup() { + void autoProxiedLookup() { OverloadLookup olup = (OverloadLookup) applicationContext.getBean("autoProxiedOverload"); ITestBean jenny = olup.newTestBean(); assertThat(jenny.getName()).isEqualTo("Jenny"); @@ -58,7 +58,7 @@ class LookupMethodWrappedByCglibProxyTests { } @Test - void testRegularlyProxiedLookup() { + void regularlyProxiedLookup() { OverloadLookup olup = (OverloadLookup) applicationContext.getBean("regularlyProxiedOverload"); ITestBean jenny = olup.newTestBean(); assertThat(jenny.getName()).isEqualTo("Jenny"); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java index 82dacabf8ff..72f5cc4e604 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java @@ -53,7 +53,7 @@ class QualifierAnnotationTests { @Test - void testNonQualifiedFieldFails() { + void nonQualifiedFieldFails() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -65,7 +65,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByValue() { + void qualifiedByValue() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -77,7 +77,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByParentValue() { + void qualifiedByParentValue() { StaticApplicationContext parent = new StaticApplicationContext(); GenericBeanDefinition parentLarry = new GenericBeanDefinition(); parentLarry.setBeanClass(Person.class); @@ -102,7 +102,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByBeanName() { + void qualifiedByBeanName() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -116,7 +116,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByFieldName() { + void qualifiedByFieldName() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -128,7 +128,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByParameterName() { + void qualifiedByParameterName() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -140,7 +140,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByAlias() { + void qualifiedByAlias() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -152,7 +152,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByAnnotation() { + void qualifiedByAnnotation() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -164,7 +164,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByCustomValue() { + void qualifiedByCustomValue() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -176,7 +176,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByAnnotationValue() { + void qualifiedByAnnotationValue() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -188,7 +188,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByAttributesFailsWithoutCustomQualifierRegistered() { + void qualifiedByAttributesFailsWithoutCustomQualifierRegistered() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -200,7 +200,7 @@ class QualifierAnnotationTests { } @Test - void testQualifiedByAttributesWithCustomQualifierRegistered() { + void qualifiedByAttributesWithCustomQualifierRegistered() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); @@ -217,7 +217,7 @@ class QualifierAnnotationTests { } @Test - void testInterfaceWithOneQualifiedFactoryAndOneQualifiedBean() { + void interfaceWithOneQualifiedFactoryAndOneQualifiedBean() { StaticApplicationContext context = new StaticApplicationContext(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(CONFIG_LOCATION); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index d3d6bba777c..1e57b7a6da2 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -98,19 +98,19 @@ class CustomNamespaceHandlerTests { @Test - void testSimpleParser() { + void simpleParser() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); assertTestBean(bean); } @Test - void testSimpleDecorator() { + void simpleDecorator() { TestBean bean = (TestBean) this.beanFactory.getBean("customisedTestBean"); assertTestBean(bean); } @Test - void testProxyingDecorator() { + void proxyingDecorator() { ITestBean bean = (ITestBean) this.beanFactory.getBean("debuggingTestBean"); assertTestBean(bean); assertThat(AopUtils.isAopProxy(bean)).isTrue(); @@ -120,7 +120,7 @@ class CustomNamespaceHandlerTests { } @Test - void testProxyingDecoratorNoInstance() { + void proxyingDecoratorNoInstance() { String[] beanNames = this.beanFactory.getBeanNamesForType(ApplicationListener.class); assertThat(Arrays.asList(beanNames)).contains("debuggingTestBeanNoInstance"); assertThat(this.beanFactory.getType("debuggingTestBeanNoInstance")).isEqualTo(ApplicationListener.class); @@ -131,7 +131,7 @@ class CustomNamespaceHandlerTests { } @Test - void testChainedDecorators() { + void chainedDecorators() { ITestBean bean = (ITestBean) this.beanFactory.getBean("chainedTestBean"); assertTestBean(bean); assertThat(AopUtils.isAopProxy(bean)).isTrue(); @@ -142,27 +142,27 @@ class CustomNamespaceHandlerTests { } @Test - void testDecorationViaAttribute() { + void decorationViaAttribute() { BeanDefinition beanDefinition = this.beanFactory.getBeanDefinition("decorateWithAttribute"); assertThat(beanDefinition.getAttribute("objectName")).isEqualTo("foo"); } @Test // SPR-2728 - public void testCustomElementNestedWithinUtilList() { + void customElementNestedWithinUtilList() { List things = (List) this.beanFactory.getBean("list.of.things"); assertThat(things).isNotNull(); assertThat(things).hasSize(2); } @Test // SPR-2728 - public void testCustomElementNestedWithinUtilSet() { + void customElementNestedWithinUtilSet() { Set things = (Set) this.beanFactory.getBean("set.of.things"); assertThat(things).isNotNull(); assertThat(things).hasSize(2); } @Test // SPR-2728 - public void testCustomElementNestedWithinUtilMap() { + void customElementNestedWithinUtilMap() { Map things = (Map) this.beanFactory.getBean("map.of.things"); assertThat(things).isNotNull(); assertThat(things).hasSize(2); diff --git a/spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java b/spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java index 651bfd2f48a..1b1cf47d0b3 100644 --- a/spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java +++ b/spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java @@ -35,14 +35,14 @@ class NoOpCacheManagerTests { private final CacheManager manager = new NoOpCacheManager(); @Test - void testGetCache() { + void getCache() { Cache cache = this.manager.getCache("bucket"); assertThat(cache).isNotNull(); assertThat(this.manager.getCache("bucket")).isSameAs(cache); } @Test - void testNoOpCache() { + void noOpCache() { String name = createRandomKey(); Cache cache = this.manager.getCache(name); assertThat(cache.getName()).isEqualTo(name); @@ -54,7 +54,7 @@ class NoOpCacheManagerTests { } @Test - void testCacheName() { + void cacheName() { String name = "bucket"; assertThat(this.manager.getCacheNames()).doesNotContain(name); this.manager.getCache(name); @@ -62,7 +62,7 @@ class NoOpCacheManagerTests { } @Test - void testCacheCallable() { + void cacheCallable() { String name = createRandomKey(); Cache cache = this.manager.getCache(name); Object returnValue = new Object(); @@ -71,7 +71,7 @@ class NoOpCacheManagerTests { } @Test - void testCacheGetCallableFail() { + void cacheGetCallableFail() { Cache cache = this.manager.getCache(createRandomKey()); String key = createRandomKey(); try { diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java index 247dc1e3b59..0804a840665 100644 --- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java +++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ConcurrentMapCacheManagerTests { @Test - void testDynamicMode() { + void dynamicMode() { ConcurrentMapCacheManager cm = new ConcurrentMapCacheManager(); Cache cache1 = cm.getCache("c1"); assertThat(cache1).isInstanceOf(ConcurrentMapCache.class); @@ -75,7 +75,7 @@ class ConcurrentMapCacheManagerTests { } @Test - void testStaticMode() { + void staticMode() { ConcurrentMapCacheManager cm = new ConcurrentMapCacheManager("c1", "c2"); Cache cache1 = cm.getCache("c1"); assertThat(cache1).isInstanceOf(ConcurrentMapCache.class); @@ -135,7 +135,7 @@ class ConcurrentMapCacheManagerTests { } @Test - void testChangeStoreByValue() { + void changeStoreByValue() { ConcurrentMapCacheManager cm = new ConcurrentMapCacheManager("c1", "c2"); assertThat(cm.isStoreByValue()).isFalse(); Cache cache1 = cm.getCache("c1"); diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java index 8f13eabc2f0..0606301935a 100644 --- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java +++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java @@ -73,13 +73,13 @@ class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests @@ -104,7 +104,7 @@ class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests ops = getOps("multipleCaching"); assertThat(ops).hasSize(2); Iterator it = ops.iterator(); @@ -76,7 +76,7 @@ class CacheOperationExpressionEvaluatorTests { } @Test - void testMultipleCachingEval() { + void multipleCachingEval() { AnnotatedClass target = new AnnotatedClass(); Method method = ReflectionUtils.findMethod( AnnotatedClass.class, "multipleCaching", Object.class, Object.class); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java index db7fda429e8..00ee7e4825f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java @@ -64,7 +64,7 @@ class ClassPathBeanDefinitionScannerTests { @Test - void testSimpleScanWithDefaultFiltersAndPostProcessors() { + void simpleScanWithDefaultFiltersAndPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int beanCount = scanner.scan(BASE_PACKAGE); @@ -91,7 +91,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndPrimaryLazyBean() { + void simpleScanWithDefaultFiltersAndPrimaryLazyBean() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.scan(BASE_PACKAGE); @@ -113,7 +113,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithIndex() { + void simpleScanWithIndex() { GenericApplicationContext context = new GenericApplicationContext(); context.setClassLoader(CandidateComponentsTestClassLoader.index( ClassPathScanningCandidateComponentProviderTests.class.getClassLoader(), @@ -132,7 +132,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testDoubleScan() { + void doubleScan() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int beanCount = scanner.scan(BASE_PACKAGE); @@ -157,7 +157,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testDoubleScanWithIndex() { + void doubleScanWithIndex() { GenericApplicationContext context = new GenericApplicationContext(); context.setClassLoader(CandidateComponentsTestClassLoader.index( ClassPathScanningCandidateComponentProviderTests.class.getClassLoader(), @@ -186,7 +186,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndNoPostProcessors() { + void simpleScanWithDefaultFiltersAndNoPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); @@ -201,7 +201,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndOverridingBean() { + void simpleScanWithDefaultFiltersAndOverridingBean() { GenericApplicationContext context = new GenericApplicationContext(); context.setAllowBeanDefinitionOverriding(true); context.registerBeanDefinition("stubFooDao", new RootBeanDefinition(TestBean.class)); @@ -213,7 +213,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndOverridingBeanNotAllowed() { + void simpleScanWithDefaultFiltersAndOverridingBeanNotAllowed() { GenericApplicationContext context = new GenericApplicationContext(); context.getDefaultListableBeanFactory().setAllowBeanDefinitionOverriding(false); context.registerBeanDefinition("stubFooDao", new RootBeanDefinition(TestBean.class)); @@ -226,7 +226,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndOverridingBeanAcceptedForSameBeanClass() { + void simpleScanWithDefaultFiltersAndOverridingBeanAcceptedForSameBeanClass() { GenericApplicationContext context = new GenericApplicationContext(); context.getDefaultListableBeanFactory().setAllowBeanDefinitionOverriding(false); context.registerBeanDefinition("stubFooDao", new RootBeanDefinition(StubFooDao.class)); @@ -238,7 +238,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndDefaultBeanNameClash() { + void simpleScanWithDefaultFiltersAndDefaultBeanNameClash() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); @@ -250,7 +250,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndOverriddenEqualNamedBean() { + void simpleScanWithDefaultFiltersAndOverriddenEqualNamedBean() { GenericApplicationContext context = new GenericApplicationContext(); context.registerBeanDefinition("myNamedDao", new RootBeanDefinition(NamedStubDao.class)); int initialBeanCount = context.getBeanDefinitionCount(); @@ -268,7 +268,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndOverriddenCompatibleNamedBean() { + void simpleScanWithDefaultFiltersAndOverriddenCompatibleNamedBean() { GenericApplicationContext context = new GenericApplicationContext(); RootBeanDefinition bd = new RootBeanDefinition(NamedStubDao.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); @@ -288,7 +288,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndSameBeanTwice() { + void simpleScanWithDefaultFiltersAndSameBeanTwice() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); @@ -298,7 +298,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testSimpleScanWithDefaultFiltersAndSpecifiedBeanNameClash() { + void simpleScanWithDefaultFiltersAndSpecifiedBeanNameClash() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); @@ -311,7 +311,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomIncludeFilterWithoutDefaultsButIncludingPostProcessors() { + void customIncludeFilterWithoutDefaultsButIncludingPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, false); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); @@ -326,7 +326,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomIncludeFilterWithoutDefaultsAndNoPostProcessors() { + void customIncludeFilterWithoutDefaultsAndNoPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, false); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); @@ -346,7 +346,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomIncludeFilterAndDefaults() { + void customIncludeFilterAndDefaults() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); @@ -366,7 +366,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomAnnotationExcludeFilterAndDefaults() { + void customAnnotationExcludeFilterAndDefaults() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class)); @@ -384,7 +384,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomAssignableTypeExcludeFilterAndDefaults() { + void customAssignableTypeExcludeFilterAndDefaults() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); @@ -403,7 +403,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomAssignableTypeExcludeFilterAndDefaultsWithoutPostProcessors() { + void customAssignableTypeExcludeFilterAndDefaultsWithoutPostProcessors() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.setIncludeAnnotationConfig(false); @@ -421,7 +421,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testMultipleCustomExcludeFiltersAndDefaults() { + void multipleCustomExcludeFiltersAndDefaults() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); @@ -441,7 +441,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testCustomBeanNameGenerator() { + void customBeanNameGenerator() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setBeanNameGenerator(new TestBeanNameGenerator()); @@ -461,7 +461,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testMultipleBasePackagesWithDefaultsOnly() { + void multipleBasePackagesWithDefaultsOnly() { GenericApplicationContext singlePackageContext = new GenericApplicationContext(); ClassPathBeanDefinitionScanner singlePackageScanner = new ClassPathBeanDefinitionScanner(singlePackageContext); GenericApplicationContext multiPackageContext = new GenericApplicationContext(); @@ -473,7 +473,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testMultipleScanCalls() { + void multipleScanCalls() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int initialBeanCount = context.getBeanDefinitionCount(); @@ -485,7 +485,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testBeanAutowiredWithAnnotationConfigEnabled() { + void beanAutowiredWithAnnotationConfigEnabled() { GenericApplicationContext context = new GenericApplicationContext(); context.registerBeanDefinition("myBf", new RootBeanDefinition(StaticListableBeanFactory.class)); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); @@ -514,7 +514,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testBeanNotAutowiredWithAnnotationConfigDisabled() { + void beanNotAutowiredWithAnnotationConfigDisabled() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); @@ -534,7 +534,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testAutowireCandidatePatternMatches() { + void autowireCandidatePatternMatches() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(true); @@ -549,7 +549,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testAutowireCandidatePatternDoesNotMatch() { + void autowireCandidatePatternDoesNotMatch() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(true); @@ -564,7 +564,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testWithManualProgrammaticIndex() { + void withManualProgrammaticIndex() { // Pre-populating an index in order to replace a runtime scan GenericApplicationContext context = new GenericApplicationContext(); @@ -589,7 +589,7 @@ class ClassPathBeanDefinitionScannerTests { } @Test - void testWithDerivedProgrammaticIndex() { + void withDerivedProgrammaticIndex() { // Recording an index from a scan (e.g. during refreshForAotProcessing) GenericApplicationContext context = new GenericApplicationContext(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java index 1aa584491e6..67f98a29d57 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java @@ -43,7 +43,7 @@ class ClassPathFactoryBeanDefinitionScannerTests { @Test - void testSingletonScopedFactoryMethod() { + void singletonScopedFactoryMethod() { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java index 282275aee5f..108f1991335 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java @@ -43,7 +43,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultLazyInit() { + void defaultLazyInit() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultWithNoOverridesTests.xml"); @@ -54,7 +54,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testLazyInitTrue() { + void lazyInitTrue() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultLazyInitTrueTests.xml"); @@ -67,7 +67,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testLazyInitFalse() { + void lazyInitFalse() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultLazyInitFalseTests.xml"); @@ -78,7 +78,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultAutowire() { + void defaultAutowire() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultWithNoOverridesTests.xml"); @@ -90,7 +90,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testAutowireNo() { + void autowireNo() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultAutowireNoTests.xml"); @@ -102,7 +102,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testAutowireConstructor() { + void autowireConstructor() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultAutowireConstructorTests.xml"); @@ -115,7 +115,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testAutowireByType() { + void autowireByType() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultAutowireByTypeTests.xml"); @@ -124,7 +124,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testAutowireByName() { + void autowireByName() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultAutowireByNameTests.xml"); @@ -137,7 +137,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultDependencyCheck() { + void defaultDependencyCheck() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultWithNoOverridesTests.xml"); @@ -149,7 +149,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultInitAndDestroyMethodsNotDefined() { + void defaultInitAndDestroyMethodsNotDefined() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultWithNoOverridesTests.xml"); @@ -161,7 +161,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultInitAndDestroyMethodsDefined() { + void defaultInitAndDestroyMethodsDefined() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultInitAndDestroyMethodsTests.xml"); @@ -173,7 +173,7 @@ class ComponentScanParserBeanDefinitionDefaultsTests { } @Test - void testDefaultNonExistingInitAndDestroyMethodsDefined() { + void defaultNonExistingInitAndDestroyMethodsDefined() { GenericApplicationContext context = new GenericApplicationContext(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultNonExistingInitAndDestroyMethodsTests.xml"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java index d81a5ca15fe..bd3a1b5d98e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class ComponentScanParserScopedProxyTests { @Test - void testDefaultScopedProxy() { + void defaultScopedProxy() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/springframework/context/annotation/scopedProxyDefaultTests.xml"); context.getBeanFactory().registerScope("myScope", new SimpleMapScope()); @@ -49,7 +49,7 @@ class ComponentScanParserScopedProxyTests { } @Test - void testNoScopedProxy() { + void noScopedProxy() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/springframework/context/annotation/scopedProxyNoTests.xml"); context.getBeanFactory().registerScope("myScope", new SimpleMapScope()); @@ -61,7 +61,7 @@ class ComponentScanParserScopedProxyTests { } @Test - void testInterfacesScopedProxy() throws Exception { + void interfacesScopedProxy() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/springframework/context/annotation/scopedProxyInterfacesTests.xml"); context.getBeanFactory().registerScope("myScope", new SimpleMapScope()); @@ -79,7 +79,7 @@ class ComponentScanParserScopedProxyTests { } @Test - void testTargetClassScopedProxy() throws Exception { + void targetClassScopedProxy() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/springframework/context/annotation/scopedProxyTargetClassTests.xml"); context.getBeanFactory().registerScope("myScope", new SimpleMapScope()); @@ -97,7 +97,7 @@ class ComponentScanParserScopedProxyTests { @Test @SuppressWarnings("resource") - public void testInvalidConfigScopedProxy() { + void invalidConfigScopedProxy() { assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(() -> new ClassPathXmlApplicationContext("org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml")) .withMessageContaining("Cannot define both 'scope-resolver' and 'scoped-proxy' on tag") diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index bf8ce5ca494..01be9631453 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; class SimpleConfigTests { @Test - void testFooService() throws Exception { + void fooService() throws Exception { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass()); FooService fooService = ctx.getBean("fooServiceImpl", FooService.class); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java index 3afd46c71b1..e6889b3e252 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java @@ -36,7 +36,7 @@ class SimpleScanTests { } @Test - void testFooService() { + void fooService() { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass()); FooService fooService = (FooService) ctx.getBean("fooServiceImpl"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java index a2c2ff62373..02d1bea02ab 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr16217Tests.java @@ -27,7 +27,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; class Spr16217Tests { @Test - public void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInRegisterBeanPhase() { + void baseConfigurationIsIncludedWhenFirstSuperclassReferenceIsSkippedInRegisterBeanPhase() { try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(RegisterBeanPhaseImportingConfiguration.class)) { context.getBean("someBean"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java index 742c020b7ec..4ab41cb1764 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java @@ -34,12 +34,12 @@ import static org.assertj.core.api.Assertions.assertThat; class Spr6602Tests { @Test - void testXmlBehavior() throws Exception { + void xmlBehavior() throws Exception { doAssertions(new ClassPathXmlApplicationContext("Spr6602Tests-context.xml", Spr6602Tests.class)); } @Test - void testConfigurationClassBehavior() throws Exception { + void configurationClassBehavior() throws Exception { doAssertions(new AnnotationConfigApplicationContext(FooConfig.class)); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java index 8d3e29544b4..45188f96911 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java @@ -63,7 +63,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class AutowiredConfigurationTests { @Test - void testAutowiredConfigurationDependencies() { + void autowiredConfigurationDependencies() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class); @@ -73,7 +73,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredConfigurationMethodDependencies() { + void autowiredConfigurationMethodDependencies() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( AutowiredMethodConfig.class, ColorConfig.class); @@ -83,7 +83,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredConfigurationMethodDependenciesWithOptionalAndAvailable() { + void autowiredConfigurationMethodDependenciesWithOptionalAndAvailable() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( OptionalAutowiredMethodConfig.class, ColorConfig.class); @@ -93,7 +93,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredConfigurationMethodDependenciesWithOptionalAndNotAvailable() { + void autowiredConfigurationMethodDependenciesWithOptionalAndNotAvailable() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( OptionalAutowiredMethodConfig.class); @@ -103,7 +103,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredConfigurationMethodDependenciesWithQualifier() { + void autowiredConfigurationMethodDependenciesWithQualifier() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( QualifiedAutowiredMethodConfig.class); @@ -113,7 +113,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredSingleConstructorSupported() { + void autowiredSingleConstructorSupported() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions( new ClassPathResource("annotation-config.xml", AutowiredConstructorConfig.class)); @@ -126,7 +126,7 @@ class AutowiredConfigurationTests { } @Test - void testObjectFactoryConstructorWithTypeVariable() { + void objectFactoryConstructorWithTypeVariable() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions( new ClassPathResource("annotation-config.xml", ObjectFactoryConstructorConfig.class)); @@ -139,7 +139,7 @@ class AutowiredConfigurationTests { } @Test - void testAutowiredAnnotatedConstructorSupported() { + void autowiredAnnotatedConstructorSupported() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions( new ClassPathResource("annotation-config.xml", MultipleConstructorConfig.class)); @@ -152,7 +152,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjection() { + void valueInjection() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "ValueInjectionTests.xml", AutowiredConfigurationTests.class); doTestValueInjection(context); @@ -160,7 +160,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithMetaAnnotation() { + void valueInjectionWithMetaAnnotation() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ValueConfigWithMetaAnnotation.class); doTestValueInjection(context); @@ -168,7 +168,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithAliasedMetaAnnotation() { + void valueInjectionWithAliasedMetaAnnotation() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ValueConfigWithAliasedMetaAnnotation.class); doTestValueInjection(context); @@ -176,7 +176,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithProviderFields() { + void valueInjectionWithProviderFields() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ValueConfigWithProviderFields.class); doTestValueInjection(context); @@ -184,7 +184,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithProviderConstructorArguments() { + void valueInjectionWithProviderConstructorArguments() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ValueConfigWithProviderConstructorArguments.class); doTestValueInjection(context); @@ -192,7 +192,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithProviderMethodArguments() { + void valueInjectionWithProviderMethodArguments() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ValueConfigWithProviderMethodArguments.class); doTestValueInjection(context); @@ -200,7 +200,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithAccidentalAutowiredAnnotations() { + void valueInjectionWithAccidentalAutowiredAnnotations() { assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(() -> new AnnotationConfigApplicationContext(ValueConfigWithAccidentalAutowiredAnnotations.class)); } @@ -232,7 +232,7 @@ class AutowiredConfigurationTests { } @Test - void testCustomPropertiesWithClassPathContext() throws IOException { + void customPropertiesWithClassPathContext() throws IOException { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class); @@ -243,7 +243,7 @@ class AutowiredConfigurationTests { } @Test - void testCustomPropertiesWithGenericContext() throws IOException { + void customPropertiesWithGenericContext() throws IOException { GenericApplicationContext context = new GenericApplicationContext(); new XmlBeanDefinitionReader(context).loadBeanDefinitions( new ClassPathResource("AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class)); @@ -256,7 +256,7 @@ class AutowiredConfigurationTests { } @Test - void testValueInjectionWithRecord() { + void valueInjectionWithRecord() { System.setProperty("recordBeanName", "enigma"); try (GenericApplicationContext context = new AnnotationConfigApplicationContext(RecordBean.class)) { assertThat(context.getBean(RecordBean.class).name()).isEqualTo("enigma"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java index 1701e1bf52e..6ab7d1fcfe7 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassWithPlaceholderConfigurerBeanTests.java @@ -61,7 +61,7 @@ class ConfigurationClassWithPlaceholderConfigurerBeanTests { */ @Test @SuppressWarnings("resource") - public void valueFieldsAreNotProcessedWhenPlaceholderConfigurerIsIntegrated() { + void valueFieldsAreNotProcessedWhenPlaceholderConfigurerIsIntegrated() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithValueFieldAndPlaceholderConfigurer.class); System.setProperty("test.name", "foo"); @@ -75,7 +75,7 @@ class ConfigurationClassWithPlaceholderConfigurerBeanTests { @Test @SuppressWarnings("resource") - public void valueFieldsAreProcessedWhenStaticPlaceholderConfigurerIsIntegrated() { + void valueFieldsAreProcessedWhenStaticPlaceholderConfigurerIsIntegrated() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithValueFieldAndStaticPlaceholderConfigurer.class); System.setProperty("test.name", "foo"); @@ -88,7 +88,7 @@ class ConfigurationClassWithPlaceholderConfigurerBeanTests { @Test @SuppressWarnings("resource") - public void valueFieldsAreProcessedWhenPlaceholderConfigurerIsSegregated() { + void valueFieldsAreProcessedWhenPlaceholderConfigurerIsSegregated() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithValueField.class); ctx.register(ConfigWithPlaceholderConfigurer.class); @@ -102,7 +102,7 @@ class ConfigurationClassWithPlaceholderConfigurerBeanTests { @Test @SuppressWarnings("resource") - public void valueFieldsResolveToPlaceholderSpecifiedDefaultValuesWithPlaceholderConfigurer() { + void valueFieldsResolveToPlaceholderSpecifiedDefaultValuesWithPlaceholderConfigurer() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithValueField.class); ctx.register(ConfigWithPlaceholderConfigurer.class); @@ -114,7 +114,7 @@ class ConfigurationClassWithPlaceholderConfigurerBeanTests { @Test @SuppressWarnings("resource") - public void valueFieldsResolveToPlaceholderSpecifiedDefaultValuesWithoutPlaceholderConfigurer() { + void valueFieldsResolveToPlaceholderSpecifiedDefaultValuesWithoutPlaceholderConfigurer() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithValueField.class); // ctx.register(ConfigWithPlaceholderConfigurer.class); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index 3084e7b1eb1..b0fcf32a68c 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -86,12 +86,12 @@ class ScopingTests { @Test - void testScopeOnClasses() { + void scopeOnClasses() { genericTestScope("scopedClass"); } @Test - void testScopeOnInterfaces() { + void scopeOnInterfaces() { genericTestScope("scopedInterface"); } @@ -130,7 +130,7 @@ class ScopingTests { } @Test - void testSameScopeOnDifferentBeans() { + void sameScopeOnDifferentBeans() { Object beanAInScope = ctx.getBean("scopedClass"); Object beanBInScope = ctx.getBean("scopedInterface"); @@ -147,7 +147,7 @@ class ScopingTests { } @Test - void testRawScopes() { + void rawScopes() { String beanName = "scopedProxyInterface"; // get hidden bean @@ -158,7 +158,7 @@ class ScopingTests { } @Test - void testScopedProxyConfiguration() { + void scopedProxyConfiguration() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedInterfaceDep"); ITestBean spouse = singleton.getSpouse(); boolean condition = spouse instanceof ScopedObject; @@ -191,7 +191,7 @@ class ScopingTests { } @Test - void testScopedProxyConfigurationWithClasses() { + void scopedProxyConfigurationWithClasses() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedClassDep"); ITestBean spouse = singleton.getSpouse(); boolean condition = spouse instanceof ScopedObject; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10668Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10668Tests.java index 5dc21298ce3..4f37ab0524f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10668Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10668Tests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; class Spr10668Tests { @Test - void testSelfInjectHierarchy() { + void selfInjectHierarchy() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ChildConfig.class); assertThat(context.getBean(MyComponent.class)).isNotNull(); context.close(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java index 2f791699cd2..f2bfbb07da1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java @@ -41,7 +41,7 @@ class Spr10744Tests { @Test - void testSpr10744() { + void spr10744() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.getBeanFactory().registerScope("myTestScope", new MyTestScope()); context.register(MyTestConfiguration.class); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java index 74a73bb9f15..24563988902 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java @@ -35,7 +35,7 @@ import static org.springframework.beans.factory.config.ConfigurableBeanFactory.S class Spr12526Tests { @Test - void testInjection() { + void injection() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(TestContext.class); CustomCondition condition = ctx.getBean(CustomCondition.class); diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java index 9d4fdb4e413..e56f0a89238 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ConversionServiceContextConfigTests { @Test - void testConfigOk() { + void configOk() { try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/springframework/context/conversionservice/conversionService.xml")) { TestClient client = context.getBean("testClient", TestClient.class); assertThat(client.getBars()).hasSize(2); 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 1b5b62b6033..fcf66e9d639 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 @@ -248,7 +248,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests @Test @SuppressWarnings("unchecked") - public void proxiedListeners() { + void proxiedListeners() { MyOrderedListener1 listener1 = new MyOrderedListener1(); MyOrderedListener2 listener2 = new MyOrderedListener2(listener1); ApplicationListener proxy1 = (ApplicationListener) new ProxyFactory(listener1).getProxy(); @@ -265,7 +265,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests @Test @SuppressWarnings("unchecked") - public void proxiedListenersMixedWithTargetListeners() { + void proxiedListenersMixedWithTargetListeners() { MyOrderedListener1 listener1 = new MyOrderedListener1(); MyOrderedListener2 listener2 = new MyOrderedListener2(listener1); ApplicationListener proxy1 = (ApplicationListener) new ProxyFactory(listener1).getProxy(); @@ -301,7 +301,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests } @Test - void testEventPublicationInterceptorWithEventClass() throws Throwable { + void eventPublicationInterceptorWithEventClass() throws Throwable { MethodInvocation invocation = mock(); ApplicationContext ctx = mock(); @@ -317,7 +317,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests } @Test - void testEventPublicationInterceptorWithEventFactory() throws Throwable { + void eventPublicationInterceptorWithEventFactory() throws Throwable { MethodInvocation invocation = mock(); ApplicationContext ctx = mock(); @@ -333,7 +333,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests } @Test - void testEventPublicationInterceptorWithMethodFailure() throws Throwable { + void eventPublicationInterceptorWithMethodFailure() throws Throwable { MethodInvocation invocation = mock(); ApplicationContext ctx = mock(); @@ -347,7 +347,7 @@ class ApplicationContextEventTests extends AbstractApplicationEventListenerTests } @Test - void testEventPublicationInterceptorWithCustomFailure() throws Throwable { + void eventPublicationInterceptorWithCustomFailure() throws Throwable { MethodInvocation invocation = mock(); ApplicationContext ctx = mock(); 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 8d342eee13a..f3d8c5aa920 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 @@ -57,27 +57,27 @@ class GenericApplicationListenerAdapterTests extends AbstractApplicationEventLis } @Test // Demonstrates we can't inject that event because the generic type is lost - public void genericListenerStrictTypeTypeErasure() { + void genericListenerStrictTypeTypeErasure() { GenericTestEvent stringEvent = createGenericTestEvent("test"); ResolvableType eventType = ResolvableType.forType(stringEvent.getClass()); supportsEventType(false, StringEventListener.class, eventType); } @Test // But it works if we specify the type properly - public void genericListenerStrictTypeAndResolvableType() { + void genericListenerStrictTypeAndResolvableType() { ResolvableType eventType = ResolvableType .forClassWithGenerics(GenericTestEvent.class, String.class); supportsEventType(true, StringEventListener.class, eventType); } @Test // or if the event provides its precise type - public void genericListenerStrictTypeAndResolvableTypeProvider() { + void genericListenerStrictTypeAndResolvableTypeProvider() { ResolvableType eventType = new SmartGenericTestEvent<>(this, "foo").getResolvableType(); supportsEventType(true, StringEventListener.class, eventType); } @Test // Demonstrates it works if we actually use the subtype - public void genericListenerStrictTypeEventSubType() { + void genericListenerStrictTypeEventSubType() { StringEvent stringEvent = new StringEvent(this, "test"); ResolvableType eventType = ResolvableType.forType(stringEvent.getClass()); supportsEventType(true, StringEventListener.class, eventType); @@ -127,7 +127,7 @@ class GenericApplicationListenerAdapterTests extends AbstractApplicationEventLis } @Test // Demonstrates we cannot inject that event because the listener has a wildcard - public void genericListenerWildcardTypeTypeErasure() { + void genericListenerWildcardTypeTypeErasure() { GenericTestEvent stringEvent = createGenericTestEvent("test"); ResolvableType eventType = ResolvableType.forType(stringEvent.getClass()); supportsEventType(true, GenericEventListener.class, eventType); @@ -140,7 +140,7 @@ class GenericApplicationListenerAdapterTests extends AbstractApplicationEventLis } @Test // Demonstrates we cannot inject that event because the listener has a raw type - public void genericListenerRawTypeTypeErasure() { + void genericListenerRawTypeTypeErasure() { GenericTestEvent stringEvent = createGenericTestEvent("test"); ResolvableType eventType = ResolvableType.forType(stringEvent.getClass()); supportsEventType(true, RawApplicationListener.class, eventType); diff --git a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java index bd1a8fa7f85..b430af5f5a1 100644 --- a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java @@ -71,7 +71,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testEventClassWithPayloadType() { + void eventClassWithPayloadType() { ConfigurableApplicationContext ac = new AnnotationConfigApplicationContext(NumberHolderListener.class); PayloadApplicationEvent> event = new PayloadApplicationEvent<>(this, @@ -83,7 +83,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testEventClassWithPayloadTypeOnParentContext() { + void eventClassWithPayloadTypeOnParentContext() { ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(NumberHolderListener.class); ConfigurableApplicationContext ac = new GenericApplicationContext(parent); ac.refresh(); @@ -98,7 +98,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testPayloadObjectWithPayloadType() { + void payloadObjectWithPayloadType() { final NumberHolder payload = new NumberHolder<>(42); AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(NumberHolderListener.class) { @@ -116,7 +116,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testPayloadObjectWithPayloadTypeOnParentContext() { + void payloadObjectWithPayloadTypeOnParentContext() { final NumberHolder payload = new NumberHolder<>(42); ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(NumberHolderListener.class); @@ -137,7 +137,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testEventClassWithInterface() { + void eventClassWithInterface() { ConfigurableApplicationContext ac = new AnnotationConfigApplicationContext(AuditableListener.class); AuditablePayloadEvent event = new AuditablePayloadEvent<>(this, "xyz"); @@ -148,7 +148,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testEventClassWithInterfaceOnParentContext() { + void eventClassWithInterfaceOnParentContext() { ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(AuditableListener.class); ConfigurableApplicationContext ac = new GenericApplicationContext(parent); ac.refresh(); @@ -162,7 +162,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testProgrammaticEventListener() { + void programmaticEventListener() { List events = new ArrayList<>(); ApplicationListener> listener = events::add; ApplicationListener> mismatch = (PayloadApplicationEvent::getPayload); @@ -180,7 +180,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testProgrammaticEventListenerOnParentContext() { + void programmaticEventListenerOnParentContext() { List events = new ArrayList<>(); ApplicationListener> listener = events::add; ApplicationListener> mismatch = (PayloadApplicationEvent::getPayload); @@ -201,7 +201,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testProgrammaticPayloadListener() { + void programmaticPayloadListener() { List events = new ArrayList<>(); ApplicationListener> listener = ApplicationListener.forPayload(events::add); ApplicationListener> mismatch = ApplicationListener.forPayload(Integer::intValue); @@ -219,7 +219,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testProgrammaticPayloadListenerOnParentContext() { + void programmaticPayloadListenerOnParentContext() { List events = new ArrayList<>(); ApplicationListener> listener = ApplicationListener.forPayload(events::add); ApplicationListener> mismatch = ApplicationListener.forPayload(Integer::intValue); @@ -240,7 +240,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testPlainPayloadListener() { + void plainPayloadListener() { ConfigurableApplicationContext ac = new AnnotationConfigApplicationContext(PlainPayloadListener.class); String payload = "xyz"; @@ -251,7 +251,7 @@ class PayloadApplicationEventTests { @Test @SuppressWarnings("resource") - void testPlainPayloadListenerOnParentContext() { + void plainPayloadListenerOnParentContext() { ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(PlainPayloadListener.class); ConfigurableApplicationContext ac = new GenericApplicationContext(parent); ac.refresh(); diff --git a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java index a23214ae2f2..ca33007666c 100644 --- a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java +++ b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; class LocaleContextHolderTests { @Test - void testSetLocaleContext() { + void setLocaleContext() { LocaleContext lc = new SimpleLocaleContext(Locale.GERMAN); LocaleContextHolder.setLocaleContext(lc); assertThat(LocaleContextHolder.getLocaleContext()).isSameAs(lc); @@ -49,7 +49,7 @@ class LocaleContextHolderTests { } @Test - void testSetTimeZoneAwareLocaleContext() { + void setTimeZoneAwareLocaleContext() { LocaleContext lc = new SimpleTimeZoneAwareLocaleContext(Locale.GERMANY, TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setLocaleContext(lc); assertThat(LocaleContextHolder.getLocaleContext()).isSameAs(lc); @@ -63,7 +63,7 @@ class LocaleContextHolderTests { } @Test - void testSetLocale() { + void setLocale() { LocaleContextHolder.setLocale(Locale.GERMAN); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); @@ -90,7 +90,7 @@ class LocaleContextHolderTests { } @Test - void testSetTimeZone() { + void setTimeZone() { LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+1")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); @@ -119,7 +119,7 @@ class LocaleContextHolderTests { } @Test - void testSetLocaleAndSetTimeZoneMixed() { + void setLocaleAndSetTimeZoneMixed() { LocaleContextHolder.setLocale(Locale.GERMANY); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java index f59729b846b..f0781ab61ac 100644 --- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java @@ -241,7 +241,7 @@ class PropertySourcesPlaceholderConfigurerTests { @Test @SuppressWarnings("serial") - public void explicitPropertySourcesExcludesLocalProperties() { + void explicitPropertySourcesExcludesLocalProperties() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerBeanDefinition("testBean", genericBeanDefinition(TestBean.class) @@ -294,7 +294,7 @@ class PropertySourcesPlaceholderConfigurerTests { @Test // https://github.com/spring-projects/spring-framework/issues/27947 - public void ignoreUnresolvablePlaceholdersInAtValueAnnotation__falseIsDefault() { + void ignoreUnresolvablePlaceholdersInAtValueAnnotation__falseIsDefault() { MockPropertySource mockPropertySource = new MockPropertySource("test"); mockPropertySource.setProperty("my.key", "${enigma}"); @SuppressWarnings("resource") @@ -311,7 +311,7 @@ class PropertySourcesPlaceholderConfigurerTests { @Test // https://github.com/spring-projects/spring-framework/issues/27947 - public void ignoreUnresolvablePlaceholdersInAtValueAnnotation_true() { + void ignoreUnresolvablePlaceholdersInAtValueAnnotation_true() { MockPropertySource mockPropertySource = new MockPropertySource("test"); mockPropertySource.setProperty("my.key", "${enigma}"); @SuppressWarnings("resource") @@ -326,7 +326,7 @@ class PropertySourcesPlaceholderConfigurerTests { @Test @SuppressWarnings("serial") - public void nestedUnresolvablePlaceholder() { + void nestedUnresolvablePlaceholder() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerBeanDefinition("testBean", genericBeanDefinition(TestBean.class) @@ -343,7 +343,7 @@ class PropertySourcesPlaceholderConfigurerTests { @Test @SuppressWarnings("serial") - public void ignoredNestedUnresolvablePlaceholder() { + void ignoredNestedUnresolvablePlaceholder() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerBeanDefinition("testBean", genericBeanDefinition(TestBean.class) diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java index 1e6bbbb0f63..cda9e3a3e9c 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java @@ -81,13 +81,13 @@ class StaticApplicationContextMulticasterTests extends AbstractApplicationContex @Test @Override - public void count() { + protected void count() { assertCount(15); } @Test @Override - public void events() throws Exception { + protected void events() throws Exception { TestApplicationEventMulticaster.counter = 0; super.events(); assertThat(TestApplicationEventMulticaster.counter).isEqualTo(1); diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java index 0c0a745934f..3ca0962163f 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java @@ -70,7 +70,7 @@ class StaticApplicationContextTests extends AbstractApplicationContextTests { @Test @Override - public void count() { + protected void count() { assertCount(15); } diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java index 5af2fb07d9a..57e3637bc91 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java @@ -57,14 +57,14 @@ class StaticMessageSourceTests extends AbstractApplicationContextTests { @Test @Override - public void count() { + protected void count() { assertCount(15); } @Test @Override @Disabled("Do nothing here since super is looking for errorCodes we do NOT have in the Context") - public void messageSource() throws NoSuchMessageException { + protected void messageSource() throws NoSuchMessageException { } @Test diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java index 64147d14545..3a046926cd1 100644 --- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java @@ -51,21 +51,21 @@ class JeeNamespaceHandlerEventTests { @Test - void testJndiLookupComponentEventReceived() { + void jndiLookupComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simple"); boolean condition = component instanceof BeanComponentDefinition; assertThat(condition).isTrue(); } @Test - void testLocalSlsbComponentEventReceived() { + void localSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleLocalEjb"); boolean condition = component instanceof BeanComponentDefinition; assertThat(condition).isTrue(); } @Test - void testRemoteSlsbComponentEventReceived() { + void remoteSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleRemoteEjb"); boolean condition = component instanceof BeanComponentDefinition; assertThat(condition).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java index f97b13222ac..59f4987cb92 100644 --- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java @@ -57,7 +57,7 @@ class JeeNamespaceHandlerTests { @Test - void testSimpleDefinition() { + void simpleDefinition() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("simple"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "jdbc/MyDataSource"); @@ -65,7 +65,7 @@ class JeeNamespaceHandlerTests { } @Test - void testComplexDefinition() { + void complexDefinition() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("complex"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "jdbc/MyDataSource"); @@ -79,21 +79,21 @@ class JeeNamespaceHandlerTests { } @Test - void testWithEnvironment() { + void withEnvironment() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("withEnvironment"); assertPropertyValue(beanDefinition, "jndiEnvironment", "foo=bar"); assertPropertyValue(beanDefinition, "defaultObject", new RuntimeBeanReference("myBean")); } @Test - void testWithReferencedEnvironment() { + void withReferencedEnvironment() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("withReferencedEnvironment"); assertPropertyValue(beanDefinition, "jndiEnvironment", new RuntimeBeanReference("myEnvironment")); assertThat(beanDefinition.getPropertyValues().contains("environmentRef")).isFalse(); } @Test - void testSimpleLocalSlsb() { + void simpleLocalSlsb() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("simpleLocalEjb"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "ejb/MyLocalBean"); @@ -104,7 +104,7 @@ class JeeNamespaceHandlerTests { } @Test - void testSimpleRemoteSlsb() { + void simpleRemoteSlsb() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("simpleRemoteEjb"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "ejb/MyRemoteBean"); @@ -115,7 +115,7 @@ class JeeNamespaceHandlerTests { } @Test - void testComplexLocalSlsb() { + void complexLocalSlsb() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("complexLocalEjb"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "ejb/MyLocalBean"); @@ -126,7 +126,7 @@ class JeeNamespaceHandlerTests { } @Test - void testComplexRemoteSlsb() { + void complexRemoteSlsb() { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("complexRemoteEjb"); assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName()); assertPropertyValue(beanDefinition, "jndiName", "ejb/MyRemoteBean"); @@ -137,7 +137,7 @@ class JeeNamespaceHandlerTests { } @Test - void testLazyInitJndiLookup() { + void lazyInitJndiLookup() { BeanDefinition definition = this.beanFactory.getMergedBeanDefinition("lazyDataSource"); assertThat(definition.isLazyInit()).isTrue(); definition = this.beanFactory.getMergedBeanDefinition("lazyLocalBean"); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java index fda3b4bc5de..0c8db3c2167 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java @@ -83,7 +83,7 @@ class DateFormattingTests { @Test - void testBindLong() { + void bindLong() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("millis", "1256961600"); binder.bind(propertyValues); @@ -92,7 +92,7 @@ class DateFormattingTests { } @Test - void testBindLongAnnotated() { + void bindLongAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleMillis", "10/31/09"); binder.bind(propertyValues); @@ -101,7 +101,7 @@ class DateFormattingTests { } @Test - void testBindCalendarAnnotated() { + void bindCalendarAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleCalendar", "10/31/09"); binder.bind(propertyValues); @@ -110,7 +110,7 @@ class DateFormattingTests { } @Test - void testBindDateAnnotated() { + void bindDateAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleDate", "10/31/09"); binder.bind(propertyValues); @@ -152,7 +152,7 @@ class DateFormattingTests { } @Test - void testBindDateArray() { + void bindDateArray() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleDate", new String[]{"10/31/09 12:00 PM"}); binder.bind(propertyValues); @@ -160,7 +160,7 @@ class DateFormattingTests { } @Test - void testBindDateAnnotatedWithError() { + void bindDateAnnotatedWithError() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleDate", "Oct X31, 2009"); binder.bind(propertyValues); @@ -170,7 +170,7 @@ class DateFormattingTests { @Test @Disabled - void testBindDateAnnotatedWithFallbackError() { + void bindDateAnnotatedWithFallbackError() { // TODO This currently passes because the Date(String) constructor fallback is used MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleDate", "Oct 031, 2009"); @@ -180,7 +180,7 @@ class DateFormattingTests { } @Test - void testBindDateTimePatternAnnotated() { + void bindDateTimePatternAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternDate", "10/31/09 1:05"); binder.bind(propertyValues); @@ -189,7 +189,7 @@ class DateFormattingTests { } @Test - void testBindDateTimePatternAnnotatedWithGlobalFormat() { + void bindDateTimePatternAnnotatedWithGlobalFormat() { DateFormatterRegistrar registrar = new DateFormatterRegistrar(); DateFormatter dateFormatter = new DateFormatter(); dateFormatter.setIso(ISO.DATE_TIME); @@ -204,7 +204,7 @@ class DateFormattingTests { } @Test - void testBindDateTimePatternAnnotatedWithOverflow() { + void bindDateTimePatternAnnotatedWithOverflow() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternDate", "02/29/09 12:00 PM"); binder.bind(propertyValues); @@ -212,7 +212,7 @@ class DateFormattingTests { } @Test - void testBindISODate() { + void bindISODate() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoDate", "2009-10-31"); binder.bind(propertyValues); @@ -221,7 +221,7 @@ class DateFormattingTests { } @Test - void testBindISOTime() { + void bindISOTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoTime", "12:00:00.000-05:00"); binder.bind(propertyValues); @@ -230,7 +230,7 @@ class DateFormattingTests { } @Test - void testBindISODateTime() { + void bindISODateTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoDateTime", "2009-10-31T12:00:00.000-08:00"); binder.bind(propertyValues); @@ -239,7 +239,7 @@ class DateFormattingTests { } @Test - void testBindNestedDateAnnotated() { + void bindNestedDateAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("children[0].styleDate", "10/31/09"); binder.bind(propertyValues); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java index b26ffcf2c74..ec093ae3ae5 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java @@ -113,7 +113,7 @@ class DateTimeFormattingTests { @Test - void testBindLocalDate() { + void bindLocalDate() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", "10/31/09"); binder.bind(propertyValues); @@ -122,7 +122,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateWithISO() { + void bindLocalDateWithISO() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", "2009-10-31"); binder.bind(propertyValues); @@ -131,7 +131,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateWithSpecificStyle() { + void bindLocalDateWithSpecificStyle() { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setDateStyle(FormatStyle.LONG); setup(registrar); @@ -143,7 +143,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateWithSpecificFormatter() { + void bindLocalDateWithSpecificFormatter() { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setDateFormatter(DateTimeFormatter.ofPattern("yyyyMMdd")); setup(registrar); @@ -155,7 +155,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateArray() { + void bindLocalDateArray() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", new String[] {"10/31/09"}); binder.bind(propertyValues); @@ -163,7 +163,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateAnnotated() { + void bindLocalDateAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalDate", "Oct 31, 2009"); binder.bind(propertyValues); @@ -172,7 +172,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateAnnotatedWithError() { + void bindLocalDateAnnotatedWithError() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalDate", "Oct -31, 2009"); binder.bind(propertyValues); @@ -181,7 +181,7 @@ class DateTimeFormattingTests { } @Test - void testBindNestedLocalDateAnnotated() { + void bindNestedLocalDateAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("children[0].styleLocalDate", "Oct 31, 2009"); binder.bind(propertyValues); @@ -190,7 +190,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateAnnotatedWithDirectFieldAccess() { + void bindLocalDateAnnotatedWithDirectFieldAccess() { binder.initDirectFieldAccess(); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalDate", "Oct 31, 2009"); @@ -200,7 +200,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateAnnotatedWithDirectFieldAccessAndError() { + void bindLocalDateAnnotatedWithDirectFieldAccessAndError() { binder.initDirectFieldAccess(); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalDate", "Oct -31, 2009"); @@ -210,7 +210,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateFromJavaUtilCalendar() { + void bindLocalDateFromJavaUtilCalendar() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", new GregorianCalendar(2009, 9, 31, 0, 0)); binder.bind(propertyValues); @@ -219,7 +219,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTime() { + void bindLocalTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localTime", "12:00%sPM".formatted(TIME_SEPARATOR)); binder.bind(propertyValues); @@ -229,7 +229,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTimeWithISO() { + void bindLocalTimeWithISO() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localTime", "12:00:00"); binder.bind(propertyValues); @@ -239,7 +239,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTimeWithSpecificStyle() { + void bindLocalTimeWithSpecificStyle() { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setTimeStyle(FormatStyle.MEDIUM); setup(registrar); @@ -252,7 +252,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTimeWithSpecificFormatter() { + void bindLocalTimeWithSpecificFormatter() { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setTimeFormatter(DateTimeFormatter.ofPattern("HHmmss")); setup(registrar); @@ -264,7 +264,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTimeAnnotated() { + void bindLocalTimeAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalTime", "12:00:00%sPM".formatted(TIME_SEPARATOR)); binder.bind(propertyValues); @@ -274,7 +274,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalTimeFromJavaUtilCalendar() { + void bindLocalTimeFromJavaUtilCalendar() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localTime", new GregorianCalendar(1970, 0, 0, 12, 0)); binder.bind(propertyValues); @@ -284,7 +284,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateTime() { + void bindLocalDateTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDateTime", LocalDateTime.of(2009, 10, 31, 12, 0)); binder.bind(propertyValues); @@ -295,7 +295,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateTimeWithISO() { + void bindLocalDateTimeWithISO() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDateTime", "2009-10-31T12:00:00"); binder.bind(propertyValues); @@ -306,7 +306,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateTimeAnnotated() { + void bindLocalDateTimeAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleLocalDateTime", LocalDateTime.of(2009, 10, 31, 12, 0)); binder.bind(propertyValues); @@ -317,7 +317,7 @@ class DateTimeFormattingTests { } @Test - void testBindLocalDateTimeFromJavaUtilCalendar() { + void bindLocalDateTimeFromJavaUtilCalendar() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDateTime", new GregorianCalendar(2009, 9, 31, 12, 0)); binder.bind(propertyValues); @@ -328,7 +328,7 @@ class DateTimeFormattingTests { } @Test - void testBindDateTimeWithSpecificStyle() { + void bindDateTimeWithSpecificStyle() { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setDateTimeStyle(FormatStyle.MEDIUM); setup(registrar); @@ -342,7 +342,7 @@ class DateTimeFormattingTests { } @Test - void testBindPatternLocalDateTime() { + void bindPatternLocalDateTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternLocalDateTime", "10/31/09 12:00 PM"); binder.bind(propertyValues); @@ -351,7 +351,7 @@ class DateTimeFormattingTests { } @Test - void testBindDateTimeOverflow() { + void bindDateTimeOverflow() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternLocalDateTime", "02/29/09 12:00 PM"); binder.bind(propertyValues); @@ -359,7 +359,7 @@ class DateTimeFormattingTests { } @Test - void testBindISODate() { + void bindISODate() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoLocalDate", "2009-10-31"); binder.bind(propertyValues); @@ -398,7 +398,7 @@ class DateTimeFormattingTests { } @Test - void testBindISOTime() { + void bindISOTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoLocalTime", "12:00:00"); binder.bind(propertyValues); @@ -407,7 +407,7 @@ class DateTimeFormattingTests { } @Test - void testBindISOTimeWithZone() { + void bindISOTimeWithZone() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoLocalTime", "12:00:00.000-05:00"); binder.bind(propertyValues); @@ -416,7 +416,7 @@ class DateTimeFormattingTests { } @Test - void testBindISODateTime() { + void bindISODateTime() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoLocalDateTime", "2009-10-31T12:00:00"); binder.bind(propertyValues); @@ -425,7 +425,7 @@ class DateTimeFormattingTests { } @Test - void testBindISODateTimeWithZone() { + void bindISODateTimeWithZone() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("isoLocalDateTime", "2009-10-31T12:00:00.000Z"); binder.bind(propertyValues); @@ -434,7 +434,7 @@ class DateTimeFormattingTests { } @Test - void testBindInstant() { + void bindInstant() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("instant", "2009-10-31T12:00:00.000Z"); binder.bind(propertyValues); @@ -443,7 +443,7 @@ class DateTimeFormattingTests { } @Test - void testBindInstantAnnotated() { + void bindInstantAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleInstant", "2017-02-21T13:00"); binder.bind(propertyValues); @@ -453,7 +453,7 @@ class DateTimeFormattingTests { @Test @SuppressWarnings("deprecation") - void testBindInstantFromJavaUtilDate() { + void bindInstantFromJavaUtilDate() { TimeZone defaultZone = TimeZone.getDefault(); TimeZone.setDefault(TimeZone.getTimeZone("GMT")); try { @@ -469,7 +469,7 @@ class DateTimeFormattingTests { } @Test - void testBindPeriod() { + void bindPeriod() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("period", "P6Y3M1D"); binder.bind(propertyValues); @@ -478,7 +478,7 @@ class DateTimeFormattingTests { } @Test - void testBindDuration() { + void bindDuration() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("duration", "PT8H6M12.345S"); binder.bind(propertyValues); @@ -487,7 +487,7 @@ class DateTimeFormattingTests { } @Test - void testBindDurationAnnotated() { + void bindDurationAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("styleDuration", "2ms"); binder.bind(propertyValues); @@ -498,7 +498,7 @@ class DateTimeFormattingTests { } @Test - void testBindYear() { + void bindYear() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("year", "2007"); binder.bind(propertyValues); @@ -507,7 +507,7 @@ class DateTimeFormattingTests { } @Test - void testBindMonth() { + void bindMonth() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("month", "JULY"); binder.bind(propertyValues); @@ -516,7 +516,7 @@ class DateTimeFormattingTests { } @Test - void testBindMonthInAnyCase() { + void bindMonthInAnyCase() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("month", "July"); binder.bind(propertyValues); @@ -525,7 +525,7 @@ class DateTimeFormattingTests { } @Test - void testBindYearMonth() { + void bindYearMonth() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("yearMonth", "2007-12"); binder.bind(propertyValues); @@ -534,7 +534,7 @@ class DateTimeFormattingTests { } @Test - void testBindYearMonthAnnotatedPattern() { + void bindYearMonthAnnotatedPattern() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("yearMonthAnnotatedPattern", "12/2007"); binder.bind(propertyValues); @@ -544,7 +544,7 @@ class DateTimeFormattingTests { } @Test - void testBindMonthDay() { + void bindMonthDay() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("monthDay", "--12-03"); binder.bind(propertyValues); @@ -553,7 +553,7 @@ class DateTimeFormattingTests { } @Test - void testBindMonthDayAnnotatedPattern() { + void bindMonthDayAnnotatedPattern() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("monthDayAnnotatedPattern", "1/3"); binder.bind(propertyValues); @@ -695,7 +695,7 @@ class DateTimeFormattingTests { } @Test - void testBindInstantAsLongEpochMillis() { + void bindInstantAsLongEpochMillis() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("instant", 1234L); binder.bind(propertyValues); diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java index cccdab049c0..a90630f7559 100644 --- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java @@ -70,7 +70,7 @@ class NumberFormattingTests { @Test - void testDefaultNumberFormatting() { + void defaultNumberFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("numberDefault", "3,339.12"); binder.bind(propertyValues); @@ -79,7 +79,7 @@ class NumberFormattingTests { } @Test - void testDefaultNumberFormattingAnnotated() { + void defaultNumberFormattingAnnotated() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("numberDefaultAnnotated", "3,339.12"); binder.bind(propertyValues); @@ -88,7 +88,7 @@ class NumberFormattingTests { } @Test - void testCurrencyFormatting() { + void currencyFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("currency", "$3,339.12"); binder.bind(propertyValues); @@ -97,7 +97,7 @@ class NumberFormattingTests { } @Test - void testPercentFormatting() { + void percentFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("percent", "53%"); binder.bind(propertyValues); @@ -106,7 +106,7 @@ class NumberFormattingTests { } @Test - void testPatternFormatting() { + void patternFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("pattern", "1,25.00"); binder.bind(propertyValues); @@ -115,7 +115,7 @@ class NumberFormattingTests { } @Test - void testPatternArrayFormatting() { + void patternArrayFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternArray", new String[] { "1,25.00", "2,35.00" }); binder.bind(propertyValues); @@ -133,7 +133,7 @@ class NumberFormattingTests { } @Test - void testPatternListFormatting() { + void patternListFormatting() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternList", new String[] { "1,25.00", "2,35.00" }); binder.bind(propertyValues); @@ -151,7 +151,7 @@ class NumberFormattingTests { } @Test - void testPatternList2FormattingListElement() { + void patternList2FormattingListElement() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternList2[0]", "1,25.00"); propertyValues.add("patternList2[1]", "2,35.00"); @@ -162,7 +162,7 @@ class NumberFormattingTests { } @Test - void testPatternList2FormattingList() { + void patternList2FormattingList() { MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("patternList2[0]", "1,25.00"); propertyValues.add("patternList2[1]", "2,35.00"); diff --git a/spring-context/src/test/java/org/springframework/format/number/money/MoneyFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/money/MoneyFormattingTests.java index badd64a4259..9c5f0308d26 100644 --- a/spring-context/src/test/java/org/springframework/format/number/money/MoneyFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/money/MoneyFormattingTests.java @@ -55,7 +55,7 @@ class MoneyFormattingTests { @Test - void testAmountAndUnit() { + void amountAndUnit() { MoneyHolder bean = new MoneyHolder(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); @@ -81,7 +81,7 @@ class MoneyFormattingTests { } @Test - void testAmountWithNumberFormat1() { + void amountWithNumberFormat1() { FormattedMoneyHolder1 bean = new FormattedMoneyHolder1(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); @@ -104,7 +104,7 @@ class MoneyFormattingTests { } @Test - void testAmountWithNumberFormat2() { + void amountWithNumberFormat2() { FormattedMoneyHolder2 bean = new FormattedMoneyHolder2(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); @@ -119,7 +119,7 @@ class MoneyFormattingTests { } @Test - void testAmountWithNumberFormat3() { + void amountWithNumberFormat3() { FormattedMoneyHolder3 bean = new FormattedMoneyHolder3(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); @@ -134,7 +134,7 @@ class MoneyFormattingTests { } @Test - void testAmountWithNumberFormat4() { + void amountWithNumberFormat4() { FormattedMoneyHolder4 bean = new FormattedMoneyHolder4(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); @@ -149,7 +149,7 @@ class MoneyFormattingTests { } @Test - void testAmountWithNumberFormat5() { + void amountWithNumberFormat5() { FormattedMoneyHolder5 bean = new FormattedMoneyHolder5(); DataBinder binder = new DataBinder(bean); binder.setConversionService(conversionService); diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java index 1cbf8f384e9..34a6309a373 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class FormattingConversionServiceFactoryBeanTests { @Test - void testDefaultFormattersOn() throws Exception { + void defaultFormattersOn() throws Exception { FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); factory.afterPropertiesSet(); FormattingConversionService fcs = factory.getObject(); @@ -68,7 +68,7 @@ class FormattingConversionServiceFactoryBeanTests { } @Test - void testDefaultFormattersOff() throws Exception { + void defaultFormattersOff() throws Exception { FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); factory.setRegisterDefaultFormatters(false); factory.afterPropertiesSet(); @@ -81,7 +81,7 @@ class FormattingConversionServiceFactoryBeanTests { } @Test - void testCustomFormatter() throws Exception { + void customFormatter() throws Exception { FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); Set formatters = new HashSet<>(); formatters.add(new TestBeanFormatter()); @@ -102,7 +102,7 @@ class FormattingConversionServiceFactoryBeanTests { } @Test - void testFormatterRegistrar() { + void formatterRegistrar() { FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); Set registrars = new HashSet<>(); registrars.add(new TestFormatterRegistrar()); @@ -116,7 +116,7 @@ class FormattingConversionServiceFactoryBeanTests { } @Test - void testInvalidFormatter() { + void invalidFormatter() { FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); Set formatters = new HashSet<>(); formatters.add(new Object()); diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java index 52191b47a51..981d0defc15 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; class InstrumentableClassLoaderTests { @Test - void testDefaultLoadTimeWeaver() { + void defaultLoadTimeWeaver() { ClassLoader loader = new SimpleInstrumentableClassLoader(ClassUtils.getDefaultClassLoader()); ReflectiveLoadTimeWeaver handler = new ReflectiveLoadTimeWeaver(loader); assertThat(handler.getInstrumentableClassLoader()).isSameAs(loader); diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java index 30eff1fcd17..39f199f34b1 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java @@ -34,19 +34,19 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; class ReflectiveLoadTimeWeaverTests { @Test - void testCtorWithNullClassLoader() { + void ctorWithNullClassLoader() { assertThatIllegalArgumentException().isThrownBy(() -> new ReflectiveLoadTimeWeaver(null)); } @Test - void testCtorWithClassLoaderThatDoesNotExposeAnAddTransformerMethod() { + void ctorWithClassLoaderThatDoesNotExposeAnAddTransformerMethod() { assertThatIllegalStateException().isThrownBy(() -> new ReflectiveLoadTimeWeaver(getClass().getClassLoader())); } @Test - void testCtorWithClassLoaderThatDoesNotExposeAGetThrowawayClassLoaderMethodIsOkay() { + void ctorWithClassLoaderThatDoesNotExposeAGetThrowawayClassLoaderMethodIsOkay() { JustAddTransformerClassLoader classLoader = new JustAddTransformerClassLoader(); ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(classLoader); weaver.addTransformer(new ClassFileTransformer() { @@ -59,20 +59,20 @@ class ReflectiveLoadTimeWeaverTests { } @Test - void testAddTransformerWithNullTransformer() { + void addTransformerWithNullTransformer() { assertThatIllegalArgumentException().isThrownBy(() -> new ReflectiveLoadTimeWeaver(new JustAddTransformerClassLoader()).addTransformer(null)); } @Test - void testGetThrowawayClassLoaderWithClassLoaderThatDoesNotExposeAGetThrowawayClassLoaderMethodYieldsFallbackClassLoader() { + void getThrowawayClassLoaderWithClassLoaderThatDoesNotExposeAGetThrowawayClassLoaderMethodYieldsFallbackClassLoader() { ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(new JustAddTransformerClassLoader()); ClassLoader throwawayClassLoader = weaver.getThrowawayClassLoader(); assertThat(throwawayClassLoader).isNotNull(); } @Test - void testGetThrowawayClassLoaderWithTotallyCompliantClassLoader() { + void getThrowawayClassLoaderWithTotallyCompliantClassLoader() { TotallyCompliantClassLoader classLoader = new TotallyCompliantClassLoader(); ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(classLoader); ClassLoader throwawayClassLoader = weaver.getThrowawayClassLoader(); diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java index 2212549887c..9e877cfd901 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java @@ -38,40 +38,40 @@ class ResourceOverridingShadowingClassLoaderTests { @Test - void testFindsExistingResourceWithGetResourceAndNoOverrides() { + void findsExistingResourceWithGetResourceAndNoOverrides() { assertThat(thisClassLoader.getResource(EXISTING_RESOURCE)).isNotNull(); assertThat(overridingLoader.getResource(EXISTING_RESOURCE)).isNotNull(); } @Test - void testDoesNotFindExistingResourceWithGetResourceAndNullOverride() { + void doesNotFindExistingResourceWithGetResourceAndNullOverride() { assertThat(thisClassLoader.getResource(EXISTING_RESOURCE)).isNotNull(); overridingLoader.override(EXISTING_RESOURCE, null); assertThat(overridingLoader.getResource(EXISTING_RESOURCE)).isNull(); } @Test - void testFindsExistingResourceWithGetResourceAsStreamAndNoOverrides() { + void findsExistingResourceWithGetResourceAsStreamAndNoOverrides() { assertThat(thisClassLoader.getResourceAsStream(EXISTING_RESOURCE)).isNotNull(); assertThat(overridingLoader.getResourceAsStream(EXISTING_RESOURCE)).isNotNull(); } @Test - void testDoesNotFindExistingResourceWithGetResourceAsStreamAndNullOverride() { + void doesNotFindExistingResourceWithGetResourceAsStreamAndNullOverride() { assertThat(thisClassLoader.getResourceAsStream(EXISTING_RESOURCE)).isNotNull(); overridingLoader.override(EXISTING_RESOURCE, null); assertThat(overridingLoader.getResourceAsStream(EXISTING_RESOURCE)).isNull(); } @Test - void testFindsExistingResourceWithGetResourcesAndNoOverrides() throws IOException { + void findsExistingResourceWithGetResourcesAndNoOverrides() throws IOException { assertThat(thisClassLoader.getResources(EXISTING_RESOURCE)).isNotNull(); assertThat(overridingLoader.getResources(EXISTING_RESOURCE)).isNotNull(); assertThat(countElements(overridingLoader.getResources(EXISTING_RESOURCE))).isEqualTo(1); } @Test - void testDoesNotFindExistingResourceWithGetResourcesAndNullOverride() throws IOException { + void doesNotFindExistingResourceWithGetResourcesAndNullOverride() throws IOException { assertThat(thisClassLoader.getResources(EXISTING_RESOURCE)).isNotNull(); overridingLoader.override(EXISTING_RESOURCE, null); assertThat(countElements(overridingLoader.getResources(EXISTING_RESOURCE))).isEqualTo(0); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java index 5bcaf3f279d..82e5ba85ab1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class MBeanExporterOperationsTests extends AbstractMBeanServerTests { @Test - void testRegisterManagedResourceWithUserSuppliedObjectName() throws Exception { + void registerManagedResourceWithUserSuppliedObjectName() throws Exception { ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo"); JmxTestBean bean = new JmxTestBean(); @@ -54,7 +54,7 @@ class MBeanExporterOperationsTests extends AbstractMBeanServerTests { } @Test - void testRegisterExistingMBeanWithUserSuppliedObjectName() throws Exception { + void registerExistingMBeanWithUserSuppliedObjectName() throws Exception { ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo"); ModelMBeanInfo info = new ModelMBeanInfoSupport("myClass", "myDescription", null, null, null, null); RequiredModelMBean bean = new RequiredModelMBean(info); @@ -68,7 +68,7 @@ class MBeanExporterOperationsTests extends AbstractMBeanServerTests { } @Test - void testRegisterManagedResourceWithGeneratedObjectName() throws Exception { + void registerManagedResourceWithGeneratedObjectName() throws Exception { final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test"); MBeanExporter exporter = new MBeanExporter(); @@ -89,7 +89,7 @@ class MBeanExporterOperationsTests extends AbstractMBeanServerTests { } @Test - void testRegisterManagedResourceWithGeneratedObjectNameWithoutUniqueness() throws Exception { + void registerManagedResourceWithGeneratedObjectNameWithoutUniqueness() throws Exception { final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test"); MBeanExporter exporter = new MBeanExporter(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java index 20cf89e8ccb..0785fd551df 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java @@ -46,7 +46,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({"rawtypes", "unchecked"}) @Test - void testRegisterNotificationListenerForMBean() throws Exception { + void registerNotificationListenerForMBean() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); JmxTestBean bean = new JmxTestBean(); @@ -72,7 +72,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithWildcard() throws Exception { + void registerNotificationListenerWithWildcard() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); JmxTestBean bean = new JmxTestBean(); @@ -97,7 +97,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { } @Test - void testRegisterNotificationListenerWithHandback() throws Exception { + void registerNotificationListenerWithHandback() throws Exception { String objectName = "spring:name=Test"; JmxTestBean bean = new JmxTestBean(); @@ -128,7 +128,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { } @Test - void testRegisterNotificationListenerForAllMBeans() throws Exception { + void registerNotificationListenerForAllMBeans() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); JmxTestBean bean = new JmxTestBean(); @@ -155,7 +155,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings("serial") @Test - void testRegisterNotificationListenerWithFilter() throws Exception { + void registerNotificationListenerWithFilter() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); JmxTestBean bean = new JmxTestBean(); @@ -193,14 +193,14 @@ class NotificationListenerTests extends AbstractMBeanServerTests { } @Test - void testCreationWithNoNotificationListenerSet() { + void creationWithNoNotificationListenerSet() { assertThatIllegalArgumentException().as("no NotificationListener supplied").isThrownBy( new NotificationListenerBean()::afterPropertiesSet); } @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithBeanNameAndBeanNameInBeansMap() throws Exception { + void registerNotificationListenerWithBeanNameAndBeanNameInBeansMap() throws Exception { String beanName = "testBean"; ObjectName objectName = ObjectName.getInstance("spring:name=Test"); @@ -231,7 +231,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithBeanNameAndBeanInstanceInBeansMap() throws Exception { + void registerNotificationListenerWithBeanNameAndBeanInstanceInBeansMap() throws Exception { String beanName = "testBean"; ObjectName objectName = ObjectName.getInstance("spring:name=Test"); @@ -262,7 +262,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithBeanNameBeforeObjectNameMappedToSameBeanInstance() throws Exception { + void registerNotificationListenerWithBeanNameBeforeObjectNameMappedToSameBeanInstance() throws Exception { String beanName = "testBean"; ObjectName objectName = ObjectName.getInstance("spring:name=Test"); @@ -294,7 +294,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithObjectNameBeforeBeanNameMappedToSameBeanInstance() throws Exception { + void registerNotificationListenerWithObjectNameBeforeBeanNameMappedToSameBeanInstance() throws Exception { String beanName = "testBean"; ObjectName objectName = ObjectName.getInstance("spring:name=Test"); @@ -326,7 +326,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - void testRegisterNotificationListenerWithTwoBeanNamesMappedToDifferentBeanInstances() throws Exception { + void registerNotificationListenerWithTwoBeanNamesMappedToDifferentBeanInstances() throws Exception { String beanName1 = "testBean1"; String beanName2 = "testBean2"; @@ -369,7 +369,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { } @Test - void testNotificationListenerRegistrar() throws Exception { + void notificationListenerRegistrar() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); JmxTestBean bean = new JmxTestBean(); @@ -402,7 +402,7 @@ class NotificationListenerTests extends AbstractMBeanServerTests { } @Test - void testNotificationListenerRegistrarWithMultipleNames() throws Exception { + void notificationListenerRegistrarWithMultipleNames() throws Exception { ObjectName objectName = ObjectName.getInstance("spring:name=Test"); ObjectName objectName2 = ObjectName.getInstance("spring:name=Test2"); JmxTestBean bean = new JmxTestBean(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java index 12c30300d99..80be7d709a1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java @@ -49,7 +49,7 @@ class NotificationPublisherTests extends AbstractMBeanServerTests { private CountingNotificationListener listener = new CountingNotificationListener(); @Test - void testSimpleBean() throws Exception { + void simpleBean() throws Exception { // start the MBeanExporter ConfigurableApplicationContext ctx = loadContext("org/springframework/jmx/export/notificationPublisherTests.xml"); this.server.addNotificationListener(ObjectNameManager.getInstance("spring:type=Publisher"), listener, null, @@ -62,7 +62,7 @@ class NotificationPublisherTests extends AbstractMBeanServerTests { } @Test - void testSimpleBeanRegisteredManually() throws Exception { + void simpleBeanRegisteredManually() throws Exception { // start the MBeanExporter ConfigurableApplicationContext ctx = loadContext("org/springframework/jmx/export/notificationPublisherTests.xml"); MBeanExporter exporter = (MBeanExporter) ctx.getBean("exporter"); @@ -77,7 +77,7 @@ class NotificationPublisherTests extends AbstractMBeanServerTests { } @Test - void testMBean() throws Exception { + void mBean() throws Exception { // start the MBeanExporter ConfigurableApplicationContext ctx = loadContext("org/springframework/jmx/export/notificationPublisherTests.xml"); this.server.addNotificationListener(ObjectNameManager.getInstance("spring:type=PublisherMBean"), listener, @@ -90,7 +90,7 @@ class NotificationPublisherTests extends AbstractMBeanServerTests { /* @Test - void testStandardMBean() throws Exception { + void standardMBean() throws Exception { // start the MBeanExporter ApplicationContext ctx = new ClassPathXmlApplicationContext("org/springframework/jmx/export/notificationPublisherTests.xml"); this.server.addNotificationListener(ObjectNameManager.getInstance("spring:type=PublisherStandardMBean"), listener, null, null); @@ -102,7 +102,7 @@ class NotificationPublisherTests extends AbstractMBeanServerTests { */ @Test - void testLazyInit() throws Exception { + void lazyInit() throws Exception { // start the MBeanExporter ConfigurableApplicationContext ctx = loadContext("org/springframework/jmx/export/notificationPublisherLazyTests.xml"); assertThat(ctx.getBeanFactory().containsSingleton("publisher")).as("Should not have instantiated the bean yet").isFalse(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java index 14d86643656..8bb828da121 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java @@ -50,7 +50,7 @@ class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerTests { } @Test - void testAttributeFromInterface() throws Exception { + void attributeFromInterface() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute("Colour"); assertThat(attr.isWritable()).as("The name attribute should be writable").isTrue(); @@ -58,21 +58,21 @@ class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerTests { } @Test - void testOperationFromInterface() throws Exception { + void operationFromInterface() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanOperationInfo op = inf.getOperation("fromInterface"); assertThat(op).isNotNull(); } @Test - void testOperationOnGetter() throws Exception { + void operationOnGetter() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanOperationInfo op = inf.getOperation("getExpensiveToCalculate"); assertThat(op).isNotNull(); } @Test - void testRegistrationOnInterface() throws Exception { + void registrationOnInterface() throws Exception { Object bean = getContext().getBean("testInterfaceBean"); ModelMBeanInfo inf = getAssembler().getMBeanInfo(bean, "bean:name=interfaceTestBean"); assertThat(inf).isNotNull(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java index 5156e9269c0..23d8415a02b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java @@ -63,7 +63,7 @@ class EnableMBeanExportConfigurationTests { @Test - void testLazyNaming() throws Exception { + void lazyNaming() throws Exception { load(LazyNamingConfiguration.class); validateAnnotationTestBean(); } @@ -73,14 +73,14 @@ class EnableMBeanExportConfigurationTests { } @Test - void testOnlyTargetClassIsExposed() throws Exception { + void onlyTargetClassIsExposed() throws Exception { load(ProxyConfiguration.class); validateAnnotationTestBean(); } @Test @SuppressWarnings("resource") - public void testPackagePrivateExtensionCantBeExposed() { + void packagePrivateExtensionCantBeExposed() { assertThatExceptionOfType(InvalidMetadataException.class).isThrownBy(() -> new AnnotationConfigApplicationContext(PackagePrivateConfiguration.class)) .withMessageContaining(PackagePrivateTestBean.class.getName()) @@ -89,7 +89,7 @@ class EnableMBeanExportConfigurationTests { @Test @SuppressWarnings("resource") - public void testPackagePrivateImplementationCantBeExposed() { + void packagePrivateImplementationCantBeExposed() { assertThatExceptionOfType(InvalidMetadataException.class).isThrownBy(() -> new AnnotationConfigApplicationContext(PackagePrivateInterfaceImplementationConfiguration.class)) .withMessageContaining(PackagePrivateAnnotationTestBean.class.getName()) @@ -97,13 +97,13 @@ class EnableMBeanExportConfigurationTests { } @Test - void testPackagePrivateClassExtensionCanBeExposed() throws Exception { + void packagePrivateClassExtensionCanBeExposed() throws Exception { load(PackagePrivateExtensionConfiguration.class); validateAnnotationTestBean(); } @Test - void testPlaceholderBased() throws Exception { + void placeholderBased() throws Exception { MockEnvironment env = new MockEnvironment(); env.setProperty("serverName", "server"); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); @@ -115,7 +115,7 @@ class EnableMBeanExportConfigurationTests { } @Test - void testLazyAssembling() throws Exception { + void lazyAssembling() throws Exception { System.setProperty("domain", "bean"); load(LazyAssemblingConfiguration.class); try { @@ -132,7 +132,7 @@ class EnableMBeanExportConfigurationTests { } @Test - void testComponentScan() throws Exception { + void componentScan() throws Exception { load(ComponentScanConfiguration.class); MBeanServer server = (MBeanServer) this.ctx.getBean("server"); validateMBeanAttribute(server, "bean:name=testBean4", null); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index a4314283498..6a7a7292f1c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -49,20 +49,20 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble protected static final String CACHE_ENTRIES_METRIC = "CacheEntries"; @Test - void testDescription() throws Exception { + void description() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); assertThat(info.getDescription()).as("The descriptions are not the same").isEqualTo("My Managed Bean"); } @Test - void testAttributeDescriptionOnSetter() throws Exception { + void attributeDescriptionOnSetter() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute(AGE_ATTRIBUTE); assertThat(attr.getDescription()).as("The description for the age attribute is incorrect").isEqualTo("The Age Attribute"); } @Test - void testAttributeDescriptionOnGetter() throws Exception { + void attributeDescriptionOnGetter() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute(NAME_ATTRIBUTE); assertThat(attr.getDescription()).as("The description for the name attribute is incorrect").isEqualTo("The Name Attribute"); @@ -72,14 +72,14 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble * Tests the situation where the attribute is only defined on the getter. */ @Test - void testReadOnlyAttribute() throws Exception { + void readOnlyAttribute() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute(AGE_ATTRIBUTE); assertThat(attr.isWritable()).as("The age attribute should not be writable").isFalse(); } @Test - void testReadWriteAttribute() throws Exception { + void readWriteAttribute() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute(NAME_ATTRIBUTE); assertThat(attr.isWritable()).as("The name attribute should be writable").isTrue(); @@ -90,7 +90,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble * Tests the situation where the property only has a getter. */ @Test - void testWithOnlySetter() throws Exception { + void withOnlySetter() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = inf.getAttribute("NickName"); assertThat(attr).as("Attribute should not be null").isNotNull(); @@ -100,14 +100,14 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble * Tests the situation where the property only has a setter. */ @Test - void testWithOnlyGetter() throws Exception { + void withOnlyGetter() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute("Superman"); assertThat(attr).as("Attribute should not be null").isNotNull(); } @Test - void testManagedResourceDescriptor() throws Exception { + void managedResourceDescriptor() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); Descriptor desc = info.getMBeanDescriptor(); @@ -121,7 +121,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testAttributeDescriptor() throws Exception { + void attributeDescriptor() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); Descriptor desc = info.getAttribute(NAME_ATTRIBUTE).getDescriptor(); @@ -132,7 +132,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testOperationDescriptor() throws Exception { + void operationDescriptor() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); Descriptor desc = info.getOperation("myOperation").getDescriptor(); @@ -141,7 +141,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testOperationParameterMetadata() throws Exception { + void operationParameterMetadata() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanOperationInfo oper = info.getOperation("add"); MBeanParameterInfo[] params = oper.getSignature(); @@ -155,7 +155,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testWithCglibProxy() throws Exception { + void withCglibProxy() throws Exception { Object tb = createJmxTestBean(); ProxyFactory pf = new ProxyFactory(); pf.setTarget(tb); @@ -183,7 +183,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testMetricDescription() throws Exception { + void metricDescription() throws Exception { ModelMBeanInfo inf = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo metric = inf.getAttribute(QUEUE_SIZE_METRIC); ModelMBeanOperationInfo operation = inf.getOperation("getQueueSize"); @@ -192,7 +192,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testMetricDescriptor() throws Exception { + void metricDescriptor() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); Descriptor desc = info.getAttribute(QUEUE_SIZE_METRIC).getDescriptor(); assertThat(desc.getFieldValue("currencyTimeLimit")).as("Currency Time Limit should be 20").isEqualTo("20"); @@ -205,7 +205,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble } @Test - void testMetricDescriptorDefaults() throws Exception { + void metricDescriptorDefaults() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); Descriptor desc = info.getAttribute(CACHE_ENTRIES_METRIC).getDescriptor(); assertThat(desc.getFieldValue("currencyTimeLimit")).as("Currency Time Limit should not be populated").isNull(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index 8ad96d68356..3829e960bb1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -55,7 +55,7 @@ class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAssemblerTe } @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index b2d5b33d9e8..097d39432c1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -36,7 +36,7 @@ class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerTe protected static final String OBJECT_NAME = "bean:name=testBean4"; @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); @@ -45,19 +45,19 @@ class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerTe } @Test - void testWithUnknownClass() { + void withUnknownClass() { assertThatIllegalArgumentException().isThrownBy(() -> getWithMapping("com.foo.bar.Unknown")); } @Test - void testWithNonInterface() { + void withNonInterface() { assertThatIllegalArgumentException().isThrownBy(() -> getWithMapping("JmxTestBean")); } @Test - void testWithFallThrough() throws Exception { + void withFallThrough() throws Exception { InterfaceBasedMBeanInfoAssembler assembler = getWithMapping("foobar", "org.springframework.jmx.export.assembler.ICustomJmxBean"); assembler.setManagedInterfaces(new Class[] {IAdditionalTestMethods.class}); @@ -69,7 +69,7 @@ class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerTe } @Test - void testNickNameIsExposed() throws Exception { + void nickNameIsExposed() throws Exception { ModelMBeanInfo inf = (ModelMBeanInfo) getMBeanInfo(); MBeanAttributeInfo attr = inf.getAttribute("NickName"); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java index 61a5f34e0bd..5b8d401a6b7 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java @@ -36,7 +36,7 @@ class MethodExclusionMBeanInfoAssemblerComboTests extends AbstractJmxAssemblerTe protected static final String OBJECT_NAME = "bean:name=testBean4"; @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); assertThat(attr.isReadable()).as("Age is not readable").isTrue(); @@ -44,7 +44,7 @@ class MethodExclusionMBeanInfoAssemblerComboTests extends AbstractJmxAssemblerTe } @Test - void testNickNameIsExposed() throws Exception { + void nickNameIsExposed() throws Exception { ModelMBeanInfo inf = (ModelMBeanInfo) getMBeanInfo(); MBeanAttributeInfo attr = inf.getAttribute("NickName"); assertThat(attr).as("Nick Name should not be null").isNotNull(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java index d5d6ede2025..1283c20bc2e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java @@ -35,7 +35,7 @@ class MethodExclusionMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerT protected static final String OBJECT_NAME = "bean:name=testBean4"; @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); assertThat(attr.isReadable()).as("Age is not readable").isTrue(); @@ -43,7 +43,7 @@ class MethodExclusionMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerT } @Test - void testNickNameIsExposed() throws Exception { + void nickNameIsExposed() throws Exception { ModelMBeanInfo inf = (ModelMBeanInfo) getMBeanInfo(); MBeanAttributeInfo attr = inf.getAttribute("NickName"); assertThat(attr).as("Nick Name should not be null").isNotNull(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java index f08afbc92d6..60e369ce16b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java @@ -36,7 +36,7 @@ class MethodExclusionMBeanInfoAssemblerNotMappedTests extends AbstractJmxAssembl protected static final String OBJECT_NAME = "bean:name=testBean4"; @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); assertThat(attr.isReadable()).as("Age is not readable").isTrue(); @@ -44,7 +44,7 @@ class MethodExclusionMBeanInfoAssemblerNotMappedTests extends AbstractJmxAssembl } @Test - void testNickNameIsExposed() throws Exception { + void nickNameIsExposed() throws Exception { ModelMBeanInfo inf = (ModelMBeanInfo) getMBeanInfo(); MBeanAttributeInfo attr = inf.getAttribute("NickName"); assertThat(attr).as("Nick Name should not be null").isNotNull(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java index e4372664964..9472e1aaa89 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java @@ -66,7 +66,7 @@ class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { } @Test - void testSupermanIsReadOnly() throws Exception { + void supermanIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute("Superman"); @@ -78,7 +78,7 @@ class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { * https://opensource.atlassian.com/projects/spring/browse/SPR-2754 */ @Test - void testIsNotIgnoredDoesntIgnoreUnspecifiedBeanMethods() throws Exception { + void isNotIgnoredDoesntIgnoreUnspecifiedBeanMethods() throws Exception { final String beanKey = "myTestBean"; MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties ignored = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java index de80eca2a46..5c14b9e637a 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java @@ -36,7 +36,7 @@ class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerT @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); @@ -45,7 +45,7 @@ class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerT } @Test - void testWithFallThrough() throws Exception { + void withFallThrough() throws Exception { MethodNameBasedMBeanInfoAssembler assembler = getWithMapping("foobar", "add,myOperation,getName,setName,getAge"); assembler.setManagedMethods("getNickName", "setNickName"); @@ -57,7 +57,7 @@ class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAssemblerT } @Test - void testNickNameIsExposed() throws Exception { + void nickNameIsExposed() throws Exception { ModelMBeanInfo inf = (ModelMBeanInfo) getMBeanInfo(); MBeanAttributeInfo attr = inf.getAttribute("NickName"); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java index 7f3778bfab8..dac94033e23 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java @@ -57,7 +57,7 @@ class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { } @Test - void testGetAgeIsReadOnly() throws Exception { + void getAgeIsReadOnly() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); ModelMBeanAttributeInfo attr = info.getAttribute(AGE_ATTRIBUTE); @@ -66,7 +66,7 @@ class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { } @Test - void testSetNameParameterIsNamed() throws Exception { + void setNameParameterIsNamed() throws Exception { ModelMBeanInfo info = getMBeanInfoFromAssembler(); MBeanOperationInfo operationSetAge = info.getOperation("setName"); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 33edfc312e0..3b4cc37530f 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -37,25 +37,25 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class ModelMBeanNotificationPublisherTests { @Test - void testCtorWithNullMBean() { + void ctorWithNullMBean() { assertThatIllegalArgumentException().isThrownBy(() -> new ModelMBeanNotificationPublisher(null, createObjectName(), this)); } @Test - void testCtorWithNullObjectName() { + void ctorWithNullObjectName() { assertThatIllegalArgumentException().isThrownBy(() -> new ModelMBeanNotificationPublisher(new SpringModelMBean(), null, this)); } @Test - void testCtorWithNullManagedResource() { + void ctorWithNullManagedResource() { assertThatIllegalArgumentException().isThrownBy(() -> new ModelMBeanNotificationPublisher(new SpringModelMBean(), createObjectName(), null)); } @Test - void testSendNullNotification() throws Exception { + void sendNullNotification() throws Exception { NotificationPublisher publisher = new ModelMBeanNotificationPublisher(new SpringModelMBean(), createObjectName(), this); assertThatIllegalArgumentException().isThrownBy(() -> @@ -63,7 +63,7 @@ class ModelMBeanNotificationPublisherTests { } @Test - void testSendVanillaNotification() throws Exception { + void sendVanillaNotification() throws Exception { StubSpringModelMBean mbean = new StubSpringModelMBean(); Notification notification = new Notification("network.alarm.router", mbean, 1872); ObjectName objectName = createObjectName(); @@ -77,7 +77,7 @@ class ModelMBeanNotificationPublisherTests { } @Test - void testSendAttributeChangeNotification() throws Exception { + void sendAttributeChangeNotification() throws Exception { StubSpringModelMBean mbean = new StubSpringModelMBean(); Notification notification = new AttributeChangeNotification(mbean, 1872, System.currentTimeMillis(), "Shall we break for some tea?", "agree", "java.lang.Boolean", Boolean.FALSE, Boolean.TRUE); ObjectName objectName = createObjectName(); @@ -93,7 +93,7 @@ class ModelMBeanNotificationPublisherTests { } @Test - void testSendAttributeChangeNotificationWhereSourceIsNotTheManagedResource() throws Exception { + void sendAttributeChangeNotificationWhereSourceIsNotTheManagedResource() throws Exception { StubSpringModelMBean mbean = new StubSpringModelMBean(); Notification notification = new AttributeChangeNotification(this, 1872, System.currentTimeMillis(), "Shall we break for some tea?", "agree", "java.lang.Boolean", Boolean.FALSE, Boolean.TRUE); ObjectName objectName = createObjectName(); 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 12dee967c3a..d9e580a819f 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -44,13 +44,13 @@ import static org.mockito.Mockito.verify; class JndiObjectFactoryBeanTests { @Test - void testNoJndiName() { + void noJndiName() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); assertThatIllegalArgumentException().isThrownBy(jof::afterPropertiesSet); } @Test - void testLookupWithFullNameAndResourceRefTrue() throws Exception { + void lookupWithFullNameAndResourceRefTrue() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:comp/env/foo", o)); @@ -61,7 +61,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithFullNameAndResourceRefFalse() throws Exception { + void lookupWithFullNameAndResourceRefFalse() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:comp/env/foo", o)); @@ -72,7 +72,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithSchemeNameAndResourceRefTrue() throws Exception { + void lookupWithSchemeNameAndResourceRefTrue() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:foo", o)); @@ -83,7 +83,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithSchemeNameAndResourceRefFalse() throws Exception { + void lookupWithSchemeNameAndResourceRefFalse() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:foo", o)); @@ -94,7 +94,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithShortNameAndResourceRefTrue() throws Exception { + void lookupWithShortNameAndResourceRefTrue() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:comp/env/foo", o)); @@ -105,7 +105,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithShortNameAndResourceRefFalse() { + void lookupWithShortNameAndResourceRefFalse() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("java:comp/env/foo", o)); @@ -115,7 +115,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithArbitraryNameAndResourceRefFalse() throws Exception { + void lookupWithArbitraryNameAndResourceRefFalse() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); Object o = new Object(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", o)); @@ -126,7 +126,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithExpectedTypeAndMatch() throws Exception { + void lookupWithExpectedTypeAndMatch() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); String s = ""; jof.setJndiTemplate(new ExpectedLookupTemplate("foo", s)); @@ -137,7 +137,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithExpectedTypeAndNoMatch() { + void lookupWithExpectedTypeAndNoMatch() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", new Object())); jof.setJndiName("foo"); @@ -148,7 +148,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithDefaultObject() throws Exception { + void lookupWithDefaultObject() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", "")); jof.setJndiName("myFoo"); @@ -159,7 +159,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithDefaultObjectAndExpectedType() throws Exception { + void lookupWithDefaultObjectAndExpectedType() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", "")); jof.setJndiName("myFoo"); @@ -170,7 +170,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithDefaultObjectAndExpectedTypeConversion() throws Exception { + void lookupWithDefaultObjectAndExpectedTypeConversion() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", "")); jof.setJndiName("myFoo"); @@ -181,7 +181,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithDefaultObjectAndExpectedTypeConversionViaBeanFactory() throws Exception { + void lookupWithDefaultObjectAndExpectedTypeConversionViaBeanFactory() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", "")); jof.setJndiName("myFoo"); @@ -193,7 +193,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithDefaultObjectAndExpectedTypeNoMatch() { + void lookupWithDefaultObjectAndExpectedTypeNoMatch() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", "")); jof.setJndiName("myFoo"); @@ -203,7 +203,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterface() throws Exception { + void lookupWithProxyInterface() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", tb)); @@ -219,7 +219,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceAndDefaultObject() { + void lookupWithProxyInterfaceAndDefaultObject() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", tb)); @@ -230,7 +230,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceAndLazyLookup() throws Exception { + void lookupWithProxyInterfaceAndLazyLookup() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { @@ -258,7 +258,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceWithNotCache() throws Exception { + void lookupWithProxyInterfaceWithNotCache() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { @@ -288,7 +288,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceWithLazyLookupAndNotCache() throws Exception { + void lookupWithProxyInterfaceWithLazyLookupAndNotCache() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { @@ -322,7 +322,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLazyLookupWithoutProxyInterface() { + void lazyLookupWithoutProxyInterface() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiName("foo"); jof.setLookupOnStartup(false); @@ -330,7 +330,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testNotCacheWithoutProxyInterface() { + void notCacheWithoutProxyInterface() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); jof.setJndiName("foo"); jof.setCache(false); @@ -339,7 +339,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceAndExpectedTypeAndMatch() throws Exception { + void lookupWithProxyInterfaceAndExpectedTypeAndMatch() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", tb)); @@ -356,7 +356,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithProxyInterfaceAndExpectedTypeAndNoMatch() { + void lookupWithProxyInterfaceAndExpectedTypeAndNoMatch() { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); jof.setJndiTemplate(new ExpectedLookupTemplate("foo", tb)); @@ -369,7 +369,7 @@ class JndiObjectFactoryBeanTests { } @Test - void testLookupWithExposeAccessContext() throws Exception { + void lookupWithExposeAccessContext() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); final Context mockCtx = mock(); diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java index e588228abc9..c828b465c76 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java @@ -28,13 +28,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class JndiTemplateEditorTests { @Test - void testNullIsIllegalArgument() { + void nullIsIllegalArgument() { assertThatIllegalArgumentException().isThrownBy(() -> new JndiTemplateEditor().setAsText(null)); } @Test - void testEmptyStringMeansNullEnvironment() { + void emptyStringMeansNullEnvironment() { JndiTemplateEditor je = new JndiTemplateEditor(); je.setAsText(""); JndiTemplate jt = (JndiTemplate) je.getValue(); @@ -42,7 +42,7 @@ class JndiTemplateEditorTests { } @Test - void testCustomEnvironment() { + void customEnvironment() { JndiTemplateEditor je = new JndiTemplateEditor(); // These properties are meaningless for JNDI, but we don't worry about that: // the underlying JNDI implementation will throw exceptions when the user tries 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 040e0c611b6..489ceffb7a0 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify; class JndiTemplateTests { @Test - void testLookupSucceeds() throws Exception { + void lookupSucceeds() throws Exception { Object o = new Object(); String name = "foo"; final Context context = mock(); @@ -55,7 +55,7 @@ class JndiTemplateTests { } @Test - void testLookupFails() throws Exception { + void lookupFails() throws Exception { NameNotFoundException ne = new NameNotFoundException(); String name = "foo"; final Context context = mock(); @@ -74,7 +74,7 @@ class JndiTemplateTests { } @Test - void testLookupReturnsNull() throws Exception { + void lookupReturnsNull() throws Exception { String name = "foo"; final Context context = mock(); given(context.lookup(name)).willReturn(null); @@ -92,7 +92,7 @@ class JndiTemplateTests { } @Test - void testLookupFailsWithTypeMismatch() throws Exception { + void lookupFailsWithTypeMismatch() throws Exception { Object o = new Object(); String name = "foo"; final Context context = mock(); @@ -111,7 +111,7 @@ class JndiTemplateTests { } @Test - void testBind() throws Exception { + void bind() throws Exception { Object o = new Object(); String name = "foo"; final Context context = mock(); @@ -129,7 +129,7 @@ class JndiTemplateTests { } @Test - void testRebind() throws Exception { + void rebind() throws Exception { Object o = new Object(); String name = "foo"; final Context context = mock(); @@ -147,7 +147,7 @@ class JndiTemplateTests { } @Test - void testUnbind() throws Exception { + void unbind() throws Exception { String name = "something"; final Context context = mock(); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorTests.java index 5a59517ea07..e66a3573a1d 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptorTests.java @@ -34,7 +34,7 @@ class AnnotationAsyncExecutionInterceptorTests { @Test @SuppressWarnings("unused") - public void testGetExecutorQualifier() throws SecurityException, NoSuchMethodException { + void getExecutorQualifier() throws SecurityException, NoSuchMethodException { AnnotationAsyncExecutionInterceptor i = new AnnotationAsyncExecutionInterceptor(null); { // method level class C { @Async("qMethod") void m() { } } diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java index 854e585d37e..14fae60c3d8 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java @@ -188,7 +188,7 @@ class AsyncAnnotationBeanPostProcessorTests { @Test @SuppressWarnings("resource") - public void handleExceptionWithFuture() { + void handleExceptionWithFuture() { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithExceptionHandler.class); ITestBean testBean = context.getBean("target", ITestBean.class); 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 9d987fe2763..dbf80c4d587 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 @@ -314,7 +314,7 @@ class EnableAsyncTests { } @Test // SPR-14949 - public void findOnInterfaceWithInterfaceProxy() { + void findOnInterfaceWithInterfaceProxy() { // Arrange AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Spr14949ConfigA.class); AsyncInterface asyncBean = ctx.getBean(AsyncInterface.class); @@ -330,7 +330,7 @@ class EnableAsyncTests { } @Test // SPR-14949 - public void findOnInterfaceWithCglibProxy() { + void findOnInterfaceWithCglibProxy() { // Arrange AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Spr14949ConfigB.class); AsyncInterface asyncBean = ctx.getBean(AsyncInterface.class); @@ -347,7 +347,7 @@ class EnableAsyncTests { @Test @SuppressWarnings("resource") - public void exceptionThrownWithBeanNotOfRequiredTypeRootCause() { + void exceptionThrownWithBeanNotOfRequiredTypeRootCause() { assertThatExceptionOfType(Throwable.class).isThrownBy(() -> new AnnotationConfigApplicationContext(JdkProxyConfiguration.class)) .withCauseInstanceOf(BeanNotOfRequiredTypeException.class); diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptEvaluatorTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptEvaluatorTests.java index 1a9ca8650fc..06f75e8d0ec 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptEvaluatorTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptEvaluatorTests.java @@ -35,21 +35,21 @@ import static org.assertj.core.api.Assertions.assertThat; class BshScriptEvaluatorTests { @Test - void testBshScriptFromString() { + void bshScriptFromString() { ScriptEvaluator evaluator = new BshScriptEvaluator(); Object result = evaluator.evaluate(new StaticScriptSource("return 3 * 2;")); assertThat(result).isEqualTo(6); } @Test - void testBshScriptFromFile() { + void bshScriptFromFile() { ScriptEvaluator evaluator = new BshScriptEvaluator(); Object result = evaluator.evaluate(new ResourceScriptSource(new ClassPathResource("simple.bsh", getClass()))); assertThat(result).isEqualTo(6); } @Test - void testGroovyScriptWithArguments() { + void groovyScriptWithArguments() { ScriptEvaluator evaluator = new BshScriptEvaluator(); Map arguments = new HashMap<>(); arguments.put("a", 3); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java index 69d786d0fe4..df48a3f2914 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java @@ -94,9 +94,9 @@ class GroovyAspectTests { TestService bean = (TestService) factory.getProxy(); assertThat(logAdvice.getCountThrows()).isEqualTo(0); - assertThatExceptionOfType(TestException.class).isThrownBy( - bean::sayHello) - .withMessage(message); + assertThatExceptionOfType(TestException.class) + .isThrownBy(bean::sayHello) + .withMessage(message); assertThat(logAdvice.getCountThrows()).isEqualTo(1); } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java index 8c21e07cc13..03fcf3350ce 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java @@ -34,7 +34,7 @@ class GroovyClassLoadingTests { @Test @SuppressWarnings("resource") - public void classLoading() throws Exception { + void classLoading() throws Exception { StaticApplicationContext context = new StaticApplicationContext(); GroovyClassLoader gcl = new GroovyClassLoader(); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java index 0692737d33a..87275c542cc 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java @@ -36,21 +36,21 @@ import static org.assertj.core.api.Assertions.assertThat; class GroovyScriptEvaluatorTests { @Test - void testGroovyScriptFromString() { + void groovyScriptFromString() { ScriptEvaluator evaluator = new GroovyScriptEvaluator(); Object result = evaluator.evaluate(new StaticScriptSource("return 3 * 2")); assertThat(result).isEqualTo(6); } @Test - void testGroovyScriptFromFile() { + void groovyScriptFromFile() { ScriptEvaluator evaluator = new GroovyScriptEvaluator(); Object result = evaluator.evaluate(new ResourceScriptSource(new ClassPathResource("simple.groovy", getClass()))); assertThat(result).isEqualTo(6); } @Test - void testGroovyScriptWithArguments() { + void groovyScriptWithArguments() { ScriptEvaluator evaluator = new GroovyScriptEvaluator(); Map arguments = new HashMap<>(); arguments.put("a", 3); @@ -60,7 +60,7 @@ class GroovyScriptEvaluatorTests { } @Test - void testGroovyScriptWithCompilerConfiguration() { + void groovyScriptWithCompilerConfiguration() { GroovyScriptEvaluator evaluator = new GroovyScriptEvaluator(); MyBytecodeProcessor processor = new MyBytecodeProcessor(); evaluator.getCompilerConfiguration().setBytecodePostprocessor(processor); @@ -70,7 +70,7 @@ class GroovyScriptEvaluatorTests { } @Test - void testGroovyScriptWithImportCustomizer() { + void groovyScriptWithImportCustomizer() { GroovyScriptEvaluator evaluator = new GroovyScriptEvaluator(); ImportCustomizer importCustomizer = new ImportCustomizer(); importCustomizer.addStarImports("org.springframework.util"); @@ -80,7 +80,7 @@ class GroovyScriptEvaluatorTests { } @Test - void testGroovyScriptFromStringUsingJsr223() { + void groovyScriptFromStringUsingJsr223() { StandardScriptEvaluator evaluator = new StandardScriptEvaluator(); evaluator.setLanguage("Groovy"); Object result = evaluator.evaluate(new StaticScriptSource("return 3 * 2")); @@ -88,14 +88,14 @@ class GroovyScriptEvaluatorTests { } @Test - void testGroovyScriptFromFileUsingJsr223() { + void groovyScriptFromFileUsingJsr223() { ScriptEvaluator evaluator = new StandardScriptEvaluator(); Object result = evaluator.evaluate(new ResourceScriptSource(new ClassPathResource("simple.groovy", getClass()))); assertThat(result).isEqualTo(6); } @Test - void testGroovyScriptWithArgumentsUsingJsr223() { + void groovyScriptWithArgumentsUsingJsr223() { StandardScriptEvaluator evaluator = new StandardScriptEvaluator(); evaluator.setLanguage("Groovy"); Map arguments = new HashMap<>(); 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 86510b56784..d897569ec45 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 @@ -66,7 +66,7 @@ import static org.mockito.Mockito.mock; public class GroovyScriptFactoryTests { @Test - void testStaticScript() { + void staticScript() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator"); @@ -95,7 +95,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticScriptUsingJsr223() { + void staticScriptUsingJsr223() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator"); @@ -124,7 +124,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticPrototypeScript() { + void staticPrototypeScript() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); @@ -143,7 +143,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticPrototypeScriptUsingJsr223() { + void staticPrototypeScriptUsingJsr223() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass()); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); @@ -162,7 +162,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticScriptWithInstance() { + void staticScriptWithInstance() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance"); Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); @@ -176,7 +176,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticScriptWithInstanceUsingJsr223() { + void staticScriptWithInstanceUsingJsr223() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance"); Messenger messenger = (Messenger) ctx.getBean("messengerInstance"); @@ -190,7 +190,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticScriptWithInlineDefinedInstance() { + void staticScriptWithInlineDefinedInstance() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline"); Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline"); @@ -204,7 +204,7 @@ public class GroovyScriptFactoryTests { } @Test - void testStaticScriptWithInlineDefinedInstanceUsingJsr223() { + void staticScriptWithInlineDefinedInstanceUsingJsr223() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline"); Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline"); @@ -218,7 +218,7 @@ public class GroovyScriptFactoryTests { } @Test - void testNonStaticScript() { + void nonStaticScript() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyRefreshableContext.xml", getClass()); Messenger messenger = (Messenger) ctx.getBean("messenger"); @@ -236,7 +236,7 @@ public class GroovyScriptFactoryTests { } @Test - void testNonStaticPrototypeScript() { + void nonStaticPrototypeScript() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyRefreshableContext.xml", getClass()); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); @@ -260,14 +260,14 @@ public class GroovyScriptFactoryTests { } @Test - void testScriptCompilationException() { + void scriptCompilationException() { assertThatExceptionOfType(NestedRuntimeException.class) .isThrownBy(() -> new ClassPathXmlApplicationContext("org/springframework/scripting/groovy/groovyBrokenContext.xml")) .matches(ex -> ex.contains(ScriptCompilationException.class)); } @Test - void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception { + void scriptedClassThatDoesNotHaveANoArgCtor() throws Exception { ScriptSource script = mock(); String badScript = "class Foo { public Foo(String foo) {}}"; given(script.getScriptAsString()).willReturn(badScript); @@ -279,7 +279,7 @@ public class GroovyScriptFactoryTests { } @Test - void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception { + void scriptedClassThatHasNoPublicNoArgCtor() throws Exception { ScriptSource script = mock(); String badScript = "class Foo { protected Foo() {} \n String toString() { 'X' }}"; given(script.getScriptAsString()).willReturn(badScript); @@ -289,7 +289,7 @@ public class GroovyScriptFactoryTests { } @Test - void testWithTwoClassesDefinedInTheOneGroovyFile_CorrectClassFirst() { + void withTwoClassesDefinedInTheOneGroovyFile_CorrectClassFirst() { ApplicationContext ctx = new ClassPathXmlApplicationContext("twoClassesCorrectOneFirst.xml", getClass()); Messenger messenger = (Messenger) ctx.getBean("messenger"); assertThat(messenger).isNotNull(); @@ -301,7 +301,7 @@ public class GroovyScriptFactoryTests { } @Test - void testWithTwoClassesDefinedInTheOneGroovyFile_WrongClassFirst() { + void withTwoClassesDefinedInTheOneGroovyFile_WrongClassFirst() { assertThatException().as("two classes defined in GroovyScriptFactory source, non-Messenger class defined first").isThrownBy(() -> { ApplicationContext ctx = new ClassPathXmlApplicationContext("twoClassesWrongOneFirst.xml", getClass()); ctx.getBean("messenger", Messenger.class); @@ -309,29 +309,29 @@ public class GroovyScriptFactoryTests { } @Test - void testCtorWithNullScriptSourceLocator() { + void ctorWithNullScriptSourceLocator() { assertThatIllegalArgumentException().isThrownBy(() -> new GroovyScriptFactory(null)); } @Test - void testCtorWithEmptyScriptSourceLocator() { + void ctorWithEmptyScriptSourceLocator() { assertThatIllegalArgumentException().isThrownBy(() -> new GroovyScriptFactory("")); } @Test - void testCtorWithWhitespacedScriptSourceLocator() { + void ctorWithWhitespacedScriptSourceLocator() { assertThatIllegalArgumentException().isThrownBy(() -> new GroovyScriptFactory("\n ")); } @Test - void testWithInlineScriptWithLeadingWhitespace() { + void withInlineScriptWithLeadingWhitespace() { assertThatExceptionOfType(BeanCreationException.class).as("'inline:' prefix was preceded by whitespace") .isThrownBy(() -> new ClassPathXmlApplicationContext("lwspBadGroovyContext.xml", getClass())) .matches(ex -> ex.contains(FileNotFoundException.class)); } @Test - void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception { + void getScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception { ScriptSource script = mock(); given(script.getScriptAsString()).willReturn("class Bar {}"); given(script.suggestedClassName()).willReturn("someName"); @@ -342,14 +342,14 @@ public class GroovyScriptFactoryTests { } @Test - void testGetScriptedObjectDoesChokeOnNullScriptSourceBeingPassedIn() { + void getScriptedObjectDoesChokeOnNullScriptSourceBeingPassedIn() { GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)"); assertThatNullPointerException().as("NullPointerException as per contract ('null' ScriptSource supplied)") .isThrownBy(() -> factory.getScriptedObject(null)); } @Test - void testResourceScriptFromTag() { + void resourceScriptFromTag() { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); Messenger messenger = (Messenger) ctx.getBean("messenger"); CallCounter countingAspect = (CallCounter) ctx.getBean("getMessageAspect"); @@ -365,7 +365,7 @@ public class GroovyScriptFactoryTests { } @Test - void testPrototypeScriptFromTag() { + void prototypeScriptFromTag() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype"); @@ -381,7 +381,7 @@ public class GroovyScriptFactoryTests { } @Test - void testInlineScriptFromTag() { + void inlineScriptFromTag() { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); BeanDefinition bd = ctx.getBeanFactory().getBeanDefinition("calculator"); assertThat(ObjectUtils.containsElement(bd.getDependsOn(), "messenger")).isTrue(); @@ -391,7 +391,7 @@ public class GroovyScriptFactoryTests { } @Test - void testRefreshableFromTag() { + void refreshableFromTag() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger"); @@ -408,7 +408,7 @@ public class GroovyScriptFactoryTests { } @Test // SPR-6268 - public void testRefreshableFromTagProxyTargetClass() { + void refreshableFromTagProxyTargetClass() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-proxy-target-class.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger"); @@ -426,7 +426,7 @@ public class GroovyScriptFactoryTests { } @Test // SPR-6268 - public void testProxyTargetClassNotAllowedIfNotGroovy() { + void proxyTargetClassNotAllowedIfNotGroovy() { try { new ClassPathXmlApplicationContext("groovy-with-xsd-proxy-target-class.xml", getClass()); } @@ -436,7 +436,7 @@ public class GroovyScriptFactoryTests { } @Test - void testAnonymousScriptDetected() { + void anonymousScriptDetected() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); Map beans = ctx.getBeansOfType(Messenger.class); assertThat(beans).hasSize(4); @@ -445,7 +445,7 @@ public class GroovyScriptFactoryTests { } @Test - void testJsr223FromTag() { + void jsr223FromTag() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger"); Messenger messenger = (Messenger) ctx.getBean("messenger"); @@ -454,7 +454,7 @@ public class GroovyScriptFactoryTests { } @Test - void testJsr223FromTagWithInterface() { + void jsr223FromTagWithInterface() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithInterface"); Messenger messenger = (Messenger) ctx.getBean("messengerWithInterface"); @@ -462,7 +462,7 @@ public class GroovyScriptFactoryTests { } @Test - void testRefreshableJsr223FromTag() { + void refreshableJsr223FromTag() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger"); Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger"); @@ -472,7 +472,7 @@ public class GroovyScriptFactoryTests { } @Test - void testInlineJsr223FromTag() { + void inlineJsr223FromTag() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessenger"); Messenger messenger = (Messenger) ctx.getBean("inlineMessenger"); @@ -480,7 +480,7 @@ public class GroovyScriptFactoryTests { } @Test - void testInlineJsr223FromTagWithInterface() { + void inlineJsr223FromTagWithInterface() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass()); assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessengerWithInterface"); Messenger messenger = (Messenger) ctx.getBean("inlineMessengerWithInterface"); @@ -492,7 +492,7 @@ public class GroovyScriptFactoryTests { * passed to a scripted bean :( */ @Test - void testCanPassInMoreThanOneProperty() { + void canPassInMoreThanOneProperty() { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-multiple-properties.xml", getClass()); TestBean tb = (TestBean) ctx.getBean("testBean"); @@ -508,12 +508,12 @@ public class GroovyScriptFactoryTests { } @Test - void testMetaClassWithBeans() { + void metaClassWithBeans() { testMetaClass("org/springframework/scripting/groovy/calculators.xml"); } @Test - void testMetaClassWithXsd() { + void metaClassWithXsd() { testMetaClass("org/springframework/scripting/groovy/calculators-with-xsd.xml"); } @@ -527,7 +527,7 @@ public class GroovyScriptFactoryTests { } @Test - void testFactoryBean() { + void factoryBean() { ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); Object factory = context.getBean("&factory"); assertThat(factory instanceof FactoryBean).isTrue(); @@ -536,7 +536,7 @@ public class GroovyScriptFactoryTests { } @Test - void testRefreshableFactoryBean() { + void refreshableFactoryBean() { ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); Object factory = context.getBean("&refreshableFactory"); assertThat(factory instanceof FactoryBean).isTrue(); 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 35bfcb66705..09e30dc23fc 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 @@ -80,18 +80,18 @@ class ScriptFactoryPostProcessorTests { @Test - void testDoesNothingWhenPostProcessingNonScriptFactoryTypeBeforeInstantiation() { + void doesNothingWhenPostProcessingNonScriptFactoryTypeBeforeInstantiation() { assertThat(new ScriptFactoryPostProcessor().postProcessBeforeInstantiation(getClass(), "a.bean")).isNull(); } @Test - void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() { + void throwsExceptionIfGivenNonAbstractBeanFactoryImplementation() { assertThatIllegalStateException().isThrownBy(() -> new ScriptFactoryPostProcessor().setBeanFactory(mock())); } @Test - void testChangeScriptWithRefreshableBeanFunctionality() { + void changeScriptWithRefreshableBeanFunctionality() { BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true); BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean(); @@ -112,7 +112,7 @@ class ScriptFactoryPostProcessorTests { } @Test - void testChangeScriptWithNoRefreshableBeanFunctionality() { + void changeScriptWithNoRefreshableBeanFunctionality() { BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(false); BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean(); @@ -132,7 +132,7 @@ class ScriptFactoryPostProcessorTests { } @Test - void testRefreshedScriptReferencePropagatesToCollaborators() { + void refreshedScriptReferencePropagatesToCollaborators() { BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true); BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean(); BeanDefinitionBuilder collaboratorBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultMessengerService.class); @@ -161,7 +161,7 @@ class ScriptFactoryPostProcessorTests { @Test @SuppressWarnings("resource") - void testReferencesAcrossAContainerHierarchy() { + void referencesAcrossAContainerHierarchy() { GenericApplicationContext businessContext = new GenericApplicationContext(); businessContext.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition()); businessContext.refresh(); @@ -178,13 +178,13 @@ class ScriptFactoryPostProcessorTests { @Test @SuppressWarnings("resource") - void testScriptHavingAReferenceToAnotherBean() { + void scriptHavingAReferenceToAnotherBean() { // just tests that the (singleton) script-backed bean is able to be instantiated with references to its collaborators new ClassPathXmlApplicationContext("org/springframework/scripting/support/groovyReferences.xml"); } @Test - void testForRefreshedScriptHavingErrorPickedUpOnFirstCall() { + void forRefreshedScriptHavingErrorPickedUpOnFirstCall() { BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true); BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean(); BeanDefinitionBuilder collaboratorBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultMessengerService.class); @@ -211,7 +211,7 @@ class ScriptFactoryPostProcessorTests { @Test @SuppressWarnings("resource") - void testPrototypeScriptedBean() { + void prototypeScriptedBean() { GenericApplicationContext ctx = new GenericApplicationContext(); ctx.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition()); diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index f1c9a05cb99..7a2cf6cef24 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class ModelMapTests { @Test - void testNoArgCtorYieldsEmptyModel() { + void noArgCtorYieldsEmptyModel() { assertThat(new ModelMap()).isEmpty(); } @@ -52,7 +52,7 @@ class ModelMapTests { * SPR-2185 - Null model assertion causes backwards compatibility issue */ @Test - void testAddNullObjectWithExplicitKey() { + void addNullObjectWithExplicitKey() { ModelMap model = new ModelMap(); model.addAttribute("foo", null); assertThat(model.containsKey("foo")).isTrue(); @@ -63,14 +63,14 @@ class ModelMapTests { * SPR-2185 - Null model assertion causes backwards compatibility issue */ @Test - void testAddNullObjectViaCtorWithExplicitKey() { + void addNullObjectViaCtorWithExplicitKey() { ModelMap model = new ModelMap("foo", null); assertThat(model.containsKey("foo")).isTrue(); assertThat(model.get("foo")).isNull(); } @Test - void testNamedObjectCtor() { + void namedObjectCtor() { ModelMap model = new ModelMap("foo", "bing"); assertThat(model).hasSize(1); String bing = (String) model.get("foo"); @@ -79,7 +79,7 @@ class ModelMapTests { } @Test - void testUnnamedCtorScalar() { + void unnamedCtorScalar() { ModelMap model = new ModelMap("foo", "bing"); assertThat(model).hasSize(1); String bing = (String) model.get("foo"); @@ -88,7 +88,7 @@ class ModelMapTests { } @Test - void testOneArgCtorWithScalar() { + void oneArgCtorWithScalar() { ModelMap model = new ModelMap("bing"); assertThat(model).hasSize(1); String string = (String) model.get("string"); @@ -97,14 +97,14 @@ class ModelMapTests { } @Test - void testOneArgCtorWithNull() { + void oneArgCtorWithNull() { //Null model arguments added without a name being explicitly supplied are not allowed assertThatIllegalArgumentException().isThrownBy(() -> new ModelMap(null)); } @Test - void testOneArgCtorWithCollection() { + void oneArgCtorWithCollection() { ModelMap model = new ModelMap(new String[]{"foo", "boing"}); assertThat(model).hasSize(1); String[] strings = (String[]) model.get("stringList"); @@ -115,14 +115,14 @@ class ModelMapTests { } @Test - void testOneArgCtorWithEmptyCollection() { + void oneArgCtorWithEmptyCollection() { ModelMap model = new ModelMap(new HashSet<>()); // must not add if collection is empty... assertThat(model).isEmpty(); } @Test - void testAddObjectWithNull() { + void addObjectWithNull() { // Null model arguments added without a name being explicitly supplied are not allowed ModelMap model = new ModelMap(); assertThatIllegalArgumentException().isThrownBy(() -> @@ -130,7 +130,7 @@ class ModelMapTests { } @Test - void testAddObjectWithEmptyArray() { + void addObjectWithEmptyArray() { ModelMap model = new ModelMap(new int[]{}); assertThat(model).hasSize(1); int[] ints = (int[]) model.get("intList"); @@ -139,21 +139,21 @@ class ModelMapTests { } @Test - void testAddAllObjectsWithNullMap() { + void addAllObjectsWithNullMap() { ModelMap model = new ModelMap(); model.addAllAttributes((Map) null); assertThat(model).isEmpty(); } @Test - void testAddAllObjectsWithNullCollection() { + void addAllObjectsWithNullCollection() { ModelMap model = new ModelMap(); model.addAllAttributes((Collection) null); assertThat(model).isEmpty(); } @Test - void testAddAllObjectsWithSparseArrayList() { + void addAllObjectsWithSparseArrayList() { // Null model arguments added without a name being explicitly supplied are not allowed ModelMap model = new ModelMap(); ArrayList list = new ArrayList<>(); @@ -164,7 +164,7 @@ class ModelMapTests { } @Test - void testAddMap() { + void addMap() { Map map = new HashMap<>(); map.put("one", "one-value"); map.put("two", "two-value"); @@ -176,7 +176,7 @@ class ModelMapTests { } @Test - void testAddObjectNoKeyOfSameTypeOverrides() { + void addObjectNoKeyOfSameTypeOverrides() { ModelMap model = new ModelMap(); model.addAttribute("foo"); model.addAttribute("bar"); @@ -186,7 +186,7 @@ class ModelMapTests { } @Test - void testAddListOfTheSameObjects() { + void addListOfTheSameObjects() { List beans = new ArrayList<>(); beans.add(new TestBean("one")); beans.add(new TestBean("two")); @@ -197,7 +197,7 @@ class ModelMapTests { } @Test - void testMergeMapWithOverriding() { + void mergeMapWithOverriding() { Map beans = new HashMap<>(); beans.put("one", new TestBean("one")); beans.put("two", new TestBean("two")); @@ -210,7 +210,7 @@ class ModelMapTests { } @Test - void testInnerClass() { + void innerClass() { ModelMap map = new ModelMap(); SomeInnerClass inner = new SomeInnerClass(); map.addAttribute(inner); @@ -218,7 +218,7 @@ class ModelMapTests { } @Test - void testInnerClassWithTwoUpperCaseLetters() { + void innerClassWithTwoUpperCaseLetters() { ModelMap map = new ModelMap(); UKInnerClass inner = new UKInnerClass(); map.addAttribute(inner); @@ -226,7 +226,7 @@ class ModelMapTests { } @Test - void testAopCglibProxy() { + void aopCglibProxy() { ModelMap map = new ModelMap(); ProxyFactory factory = new ProxyFactory(); SomeInnerClass val = new SomeInnerClass(); @@ -238,7 +238,7 @@ class ModelMapTests { } @Test - void testAopJdkProxy() { + void aopJdkProxy() { ModelMap map = new ModelMap(); ProxyFactory factory = new ProxyFactory(); Map target = new HashMap<>(); @@ -250,7 +250,7 @@ class ModelMapTests { } @Test - void testAopJdkProxyWithMultipleInterfaces() { + void aopJdkProxyWithMultipleInterfaces() { ModelMap map = new ModelMap(); Map target = new HashMap<>(); ProxyFactory factory = new ProxyFactory(); @@ -265,7 +265,7 @@ class ModelMapTests { } @Test - void testAopJdkProxyWithDetectedInterfaces() { + void aopJdkProxyWithDetectedInterfaces() { ModelMap map = new ModelMap(); Map target = new HashMap<>(); ProxyFactory factory = new ProxyFactory(target); @@ -275,7 +275,7 @@ class ModelMapTests { } @Test - void testRawJdkProxy() { + void rawJdkProxy() { ModelMap map = new ModelMap(); Object proxy = Proxy.newProxyInstance( getClass().getClassLoader(), diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java index 294eee4b57a..4a19aa9efff 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java @@ -43,7 +43,7 @@ class ValidationUtilsTests { @Test - void testInvokeValidatorWithNullValidator() { + void invokeValidatorWithNullValidator() { TestBean tb = new TestBean(); Errors errors = new SimpleErrors(tb); assertThatIllegalArgumentException().isThrownBy(() -> @@ -51,14 +51,14 @@ class ValidationUtilsTests { } @Test - void testInvokeValidatorWithNullErrors() { + void invokeValidatorWithNullErrors() { TestBean tb = new TestBean(); assertThatIllegalArgumentException().isThrownBy(() -> ValidationUtils.invokeValidator(emptyValidator, tb, null)); } @Test - void testInvokeValidatorSunnyDay() { + void invokeValidatorSunnyDay() { TestBean tb = new TestBean(); Errors errors = new SimpleErrors(tb); ValidationUtils.invokeValidator(emptyValidator, tb, errors); @@ -67,7 +67,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsSunnyDay() { + void validationUtilsSunnyDay() { TestBean tb = new TestBean(""); tb.setName(" "); @@ -83,7 +83,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsNull() { + void validationUtilsNull() { TestBean tb = new TestBean(); Errors errors = emptyValidator.validateObject(tb); assertThat(errors.hasFieldErrors("name")).isTrue(); @@ -95,7 +95,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsEmpty() { + void validationUtilsEmpty() { TestBean tb = new TestBean(""); Errors errors = emptyValidator.validateObject(tb); assertThat(errors.hasFieldErrors("name")).isTrue(); @@ -107,7 +107,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsEmptyVariants() { + void validationUtilsEmptyVariants() { TestBean tb = new TestBean(); Errors errors = new SimpleErrors(tb); @@ -125,7 +125,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsEmptyOrWhitespace() { + void validationUtilsEmptyOrWhitespace() { TestBean tb = new TestBean(); // Test null @@ -152,7 +152,7 @@ class ValidationUtilsTests { } @Test - void testValidationUtilsEmptyOrWhitespaceVariants() { + void validationUtilsEmptyOrWhitespaceVariants() { TestBean tb = new TestBean(); tb.setName(" "); diff --git a/spring-context/src/test/java/org/springframework/validation/ValidatorTests.java b/spring-context/src/test/java/org/springframework/validation/ValidatorTests.java index 91fd0b0d330..e16025a3b12 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidatorTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidatorTests.java @@ -28,14 +28,14 @@ import static org.assertj.core.api.Assertions.assertThat; class ValidatorTests { @Test - void testSupportsForInstanceOf() { + void supportsForInstanceOf() { Validator validator = Validator.forInstanceOf(TestBean.class, (testBean, errors) -> {}); assertThat(validator.supports(TestBean.class)).isTrue(); assertThat(validator.supports(TestBeanSubclass.class)).isTrue(); } @Test - void testSupportsForType() { + void supportsForType() { Validator validator = Validator.forType(TestBean.class, (testBean, errors) -> {}); assertThat(validator.supports(TestBean.class)).isTrue(); assertThat(validator.supports(TestBeanSubclass.class)).isFalse(); diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java index 16418918aa7..91764a56c6e 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class BeanValidationPostProcessorTests { @Test - void testNotNullConstraint() { + void notNullConstraint() { GenericApplicationContext ac = new GenericApplicationContext(); ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class)); ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class)); @@ -52,7 +52,7 @@ class BeanValidationPostProcessorTests { } @Test - void testNotNullConstraintSatisfied() { + void notNullConstraintSatisfied() { GenericApplicationContext ac = new GenericApplicationContext(); ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class)); ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class)); @@ -64,7 +64,7 @@ class BeanValidationPostProcessorTests { } @Test - void testNotNullConstraintAfterInitialization() { + void notNullConstraintAfterInitialization() { GenericApplicationContext ac = new GenericApplicationContext(); RootBeanDefinition bvpp = new RootBeanDefinition(BeanValidationPostProcessor.class); bvpp.getPropertyValues().add("afterInitialization", true); @@ -76,7 +76,7 @@ class BeanValidationPostProcessorTests { } @Test - void testNotNullConstraintAfterInitializationWithProxy() { + void notNullConstraintAfterInitializationWithProxy() { GenericApplicationContext ac = new GenericApplicationContext(); RootBeanDefinition bvpp = new RootBeanDefinition(BeanValidationPostProcessor.class); bvpp.getPropertyValues().add("afterInitialization", true); @@ -90,7 +90,7 @@ class BeanValidationPostProcessorTests { } @Test - void testSizeConstraint() { + void sizeConstraint() { GenericApplicationContext ac = new GenericApplicationContext(); ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class)); RootBeanDefinition bd = new RootBeanDefinition(NotNullConstrainedBean.class); @@ -105,7 +105,7 @@ class BeanValidationPostProcessorTests { } @Test - void testSizeConstraintSatisfied() { + void sizeConstraintSatisfied() { GenericApplicationContext ac = new GenericApplicationContext(); ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class)); RootBeanDefinition bd = new RootBeanDefinition(NotNullConstrainedBean.class); diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationProxyTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationProxyTests.java index aeccdf272c3..f0118e8c19b 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationProxyTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationProxyTests.java @@ -66,7 +66,7 @@ class MethodValidationProxyTests { @ParameterizedTest @ValueSource(booleans = {true, false}) @SuppressWarnings("unchecked") - void testMethodValidationInterceptor(boolean adaptViolations) { + void methodValidationInterceptor(boolean adaptViolations) { MyValidBean bean = new MyValidBean(); ProxyFactory factory = new ProxyFactory(bean); factory.addAdvice(adaptViolations ? @@ -80,7 +80,7 @@ class MethodValidationProxyTests { @ParameterizedTest @ValueSource(booleans = {true, false}) @SuppressWarnings("unchecked") - void testMethodValidationPostProcessor(boolean adaptViolations) { + void methodValidationPostProcessor(boolean adaptViolations) { StaticApplicationContext context = new StaticApplicationContext(); context.registerBean(MethodValidationPostProcessor.class, adaptViolations ? () -> { @@ -101,7 +101,7 @@ class MethodValidationProxyTests { @Test // gh-29782 @SuppressWarnings("unchecked") - public void testMethodValidationPostProcessorForInterfaceOnlyProxy() { + void methodValidationPostProcessorForInterfaceOnlyProxy() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(MethodValidationPostProcessor.class); context.registerBean(MyValidInterface.class, () -> @@ -125,17 +125,17 @@ class MethodValidationProxyTests { } @Test - void testLazyValidatorForMethodValidation() { + void lazyValidatorForMethodValidation() { doTestLazyValidatorForMethodValidation(LazyMethodValidationConfig.class); } @Test - void testLazyValidatorForMethodValidationWithProxyTargetClass() { + void lazyValidatorForMethodValidationWithProxyTargetClass() { doTestLazyValidatorForMethodValidation(LazyMethodValidationConfigWithProxyTargetClass.class); } @Test - void testLazyValidatorForMethodValidationWithValidatorProvider() { + void lazyValidatorForMethodValidationWithValidatorProvider() { doTestLazyValidatorForMethodValidation(LazyMethodValidationConfigWithValidatorProvider.class); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java index c87ccfc7290..69673345a29 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java @@ -80,13 +80,13 @@ class SpringValidatorAdapterTests { @Test - void testUnwrap() { + void unwrap() { Validator nativeValidator = validatorAdapter.unwrap(Validator.class); assertThat(nativeValidator).isSameAs(this.nativeValidator); } @Test // SPR-13406 - public void testNoStringArgumentValue() throws Exception { + void noStringArgumentValue() throws Exception { TestBean testBean = new TestBean(); testBean.setPassword("pass"); testBean.setConfirmPassword("pass"); @@ -105,7 +105,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-13406 - public void testApplyMessageSourceResolvableToStringArgumentValueWithResolvedLogicalFieldName() throws Exception { + void applyMessageSourceResolvableToStringArgumentValueWithResolvedLogicalFieldName() throws Exception { TestBean testBean = new TestBean(); testBean.setPassword("password"); testBean.setConfirmPassword("PASSWORD"); @@ -124,7 +124,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-13406 - public void testApplyMessageSourceResolvableToStringArgumentValueWithUnresolvedLogicalFieldName() { + void applyMessageSourceResolvableToStringArgumentValueWithUnresolvedLogicalFieldName() { TestBean testBean = new TestBean(); testBean.setEmail("test@example.com"); testBean.setConfirmEmail("TEST@EXAMPLE.IO"); @@ -148,7 +148,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-15123 - public void testApplyMessageSourceResolvableToStringArgumentValueWithAlwaysUseMessageFormat() { + void applyMessageSourceResolvableToStringArgumentValueWithAlwaysUseMessageFormat() { messageSource.setAlwaysUseMessageFormat(true); TestBean testBean = new TestBean(); @@ -174,7 +174,7 @@ class SpringValidatorAdapterTests { } @Test - void testPatternMessage() { + void patternMessage() { TestBean testBean = new TestBean(); testBean.setEmail("X"); testBean.setConfirmEmail("X"); @@ -192,7 +192,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-16177 - public void testWithList() { + void withList() { Parent parent = new Parent(); parent.setName("Parent whit list"); parent.getChildList().addAll(createChildren(parent)); @@ -204,7 +204,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-16177 - public void testWithSet() { + void withSet() { Parent parent = new Parent(); parent.setName("Parent with set"); parent.getChildSet().addAll(createChildren(parent)); @@ -230,7 +230,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-15839 - public void testListElementConstraint() { + void listElementConstraint() { BeanWithListElementConstraint bean = new BeanWithListElementConstraint(); bean.setProperty(Arrays.asList("no", "element", "can", "be", null)); @@ -242,7 +242,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-15839 - public void testMapValueConstraint() { + void mapValueConstraint() { Map property = new HashMap<>(); property.put("no value can be", null); @@ -257,7 +257,7 @@ class SpringValidatorAdapterTests { } @Test // SPR-15839 - public void testMapEntryConstraint() { + void mapEntryConstraint() { Map property = new HashMap<>(); property.put(null, null); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java index 5154ef40581..6ff4b495e01 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java @@ -571,132 +571,132 @@ public abstract class AbstractCacheAnnotationTests { } @Test - protected void testCacheable() { + protected void cacheable() { testCacheable(this.cs); } @Test - protected void testCacheableNull() { + protected void cacheableNull() { testCacheableNull(this.cs); } @Test - protected void testCacheableSync() { + protected void cacheableSync() { testCacheableSync(this.cs); } @Test - protected void testCacheableSyncNull() { + protected void cacheableSyncNull() { testCacheableSyncNull(this.cs); } @Test - protected void testEvict() { + protected void evict() { testEvict(this.cs, true); } @Test - protected void testEvictEarly() { + protected void evictEarly() { testEvictEarly(this.cs); } @Test - protected void testEvictWithException() { + protected void evictWithException() { testEvictException(this.cs); } @Test - protected void testEvictAll() { + protected void evictAll() { testEvictAll(this.cs, true); } @Test - protected void testEvictAllEarly() { + protected void evictAllEarly() { testEvictAllEarly(this.cs); } @Test - protected void testEvictWithKey() { + protected void evictWithKey() { testEvictWithKey(this.cs); } @Test - protected void testEvictWithKeyEarly() { + protected void evictWithKeyEarly() { testEvictWithKeyEarly(this.cs); } @Test - protected void testConditionalExpression() { + protected void conditionalExpression() { testConditionalExpression(this.cs); } @Test - protected void testConditionalExpressionSync() { + protected void conditionalExpressionSync() { testConditionalExpressionSync(this.cs); } @Test - protected void testUnlessExpression() { + protected void unlessExpression() { testUnlessExpression(this.cs); } @Test - protected void testClassCacheUnlessExpression() { + protected void classCacheUnlessExpression() { testUnlessExpression(this.cs); } @Test - protected void testKeyExpression() { + protected void keyExpression() { testKeyExpression(this.cs); } @Test - protected void testVarArgsKey() { + protected void varArgsKey() { testVarArgsKey(this.cs); } @Test - protected void testClassCacheCacheable() { + protected void classCacheCacheable() { testCacheable(this.ccs); } @Test - protected void testClassCacheEvict() { + protected void classCacheEvict() { testEvict(this.ccs, true); } @Test - protected void testClassEvictEarly() { + protected void classEvictEarly() { testEvictEarly(this.ccs); } @Test - protected void testClassEvictAll() { + protected void classEvictAll() { testEvictAll(this.ccs, true); } @Test - protected void testClassEvictWithException() { + protected void classEvictWithException() { testEvictException(this.ccs); } @Test - protected void testClassCacheEvictWithWKey() { + protected void classCacheEvictWithWKey() { testEvictWithKey(this.ccs); } @Test - protected void testClassEvictWithKeyEarly() { + protected void classEvictWithKeyEarly() { testEvictWithKeyEarly(this.ccs); } @Test - protected void testNullValue() { + protected void nullValue() { testNullValue(this.cs); } @Test - protected void testClassNullValue() { + protected void classNullValue() { Object key = new Object(); assertThat(this.ccs.nullValue(key)).isNull(); int nr = this.ccs.nullInvocations().intValue(); @@ -709,27 +709,27 @@ public abstract class AbstractCacheAnnotationTests { } @Test - protected void testMethodName() { + protected void methodName() { testMethodName(this.cs, "name"); } @Test - protected void testClassMethodName() { + protected void classMethodName() { testMethodName(this.ccs, "nametestCache"); } @Test - protected void testRootVars() { + protected void rootVars() { testRootVars(this.cs); } @Test - protected void testClassRootVars() { + protected void classRootVars() { testRootVars(this.ccs); } @Test - protected void testCustomKeyGenerator() { + protected void customKeyGenerator() { Object param = new Object(); Object r1 = this.cs.customKeyGenerator(param); assertThat(this.cs.customKeyGenerator(param)).isSameAs(r1); @@ -740,14 +740,14 @@ public abstract class AbstractCacheAnnotationTests { } @Test - protected void testUnknownCustomKeyGenerator() { + protected void unknownCustomKeyGenerator() { Object param = new Object(); assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> this.cs.unknownCustomKeyGenerator(param)); } @Test - protected void testCustomCacheManager() { + protected void customCacheManager() { CacheManager customCm = this.ctx.getBean("customCacheManager", CacheManager.class); Object key = new Object(); Object r1 = this.cs.customCacheManager(key); @@ -758,159 +758,159 @@ public abstract class AbstractCacheAnnotationTests { } @Test - protected void testUnknownCustomCacheManager() { + protected void unknownCustomCacheManager() { Object param = new Object(); assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> this.cs.unknownCustomCacheManager(param)); } @Test - protected void testNullArg() { + protected void nullArg() { testNullArg(this.cs); } @Test - protected void testClassNullArg() { + protected void classNullArg() { testNullArg(this.ccs); } @Test - protected void testCheckedException() { + protected void checkedException() { testCheckedThrowable(this.cs); } @Test - protected void testClassCheckedException() { + protected void classCheckedException() { testCheckedThrowable(this.ccs); } @Test - protected void testCheckedExceptionSync() { + protected void checkedExceptionSync() { testCheckedThrowableSync(this.cs); } @Test - protected void testClassCheckedExceptionSync() { + protected void classCheckedExceptionSync() { testCheckedThrowableSync(this.ccs); } @Test - protected void testUncheckedException() { + protected void uncheckedException() { testUncheckedThrowable(this.cs); } @Test - protected void testClassUncheckedException() { + protected void classUncheckedException() { testUncheckedThrowable(this.ccs); } @Test - protected void testUncheckedExceptionSync() { + protected void uncheckedExceptionSync() { testUncheckedThrowableSync(this.cs); } @Test - protected void testClassUncheckedExceptionSync() { + protected void classUncheckedExceptionSync() { testUncheckedThrowableSync(this.ccs); } @Test - protected void testUpdate() { + protected void update() { testCacheUpdate(this.cs); } @Test - protected void testClassUpdate() { + protected void classUpdate() { testCacheUpdate(this.ccs); } @Test - protected void testConditionalUpdate() { + protected void conditionalUpdate() { testConditionalCacheUpdate(this.cs); } @Test - protected void testClassConditionalUpdate() { + protected void classConditionalUpdate() { testConditionalCacheUpdate(this.ccs); } @Test - protected void testMultiCache() { + protected void multiCache() { testMultiCache(this.cs); } @Test - protected void testClassMultiCache() { + protected void classMultiCache() { testMultiCache(this.ccs); } @Test - protected void testMultiEvict() { + protected void multiEvict() { testMultiEvict(this.cs); } @Test - protected void testClassMultiEvict() { + protected void classMultiEvict() { testMultiEvict(this.ccs); } @Test - protected void testMultiPut() { + protected void multiPut() { testMultiPut(this.cs); } @Test - protected void testClassMultiPut() { + protected void classMultiPut() { testMultiPut(this.ccs); } @Test - protected void testPutRefersToResult() { + protected void putRefersToResult() { testPutRefersToResult(this.cs); } @Test - protected void testPutRefersToResultWithUnless() { + protected void putRefersToResultWithUnless() { testPutRefersToResultWithUnless(this.cs); } @Test - protected void testPutEvaluatesUnlessBeforeKey() { + protected void putEvaluatesUnlessBeforeKey() { testPutEvaluatesUnlessBeforeKey(this.cs); } @Test - protected void testClassPutRefersToResult() { + protected void classPutRefersToResult() { testPutRefersToResult(this.ccs); } @Test - protected void testClassPutRefersToResultWithUnless(){ + protected void classPutRefersToResultWithUnless(){ testPutRefersToResultWithUnless(this.ccs); } @Test - protected void testClassPutEvaluatesUnlessBeforeKey(){ + protected void classPutEvaluatesUnlessBeforeKey(){ testPutEvaluatesUnlessBeforeKey(this.ccs); } @Test - protected void testMultiCacheAndEvict() { + protected void multiCacheAndEvict() { testMultiCacheAndEvict(this.cs); } @Test - protected void testClassMultiCacheAndEvict() { + protected void classMultiCacheAndEvict() { testMultiCacheAndEvict(this.ccs); } @Test - protected void testMultiConditionalCacheAndEvict() { + protected void multiConditionalCacheAndEvict() { testMultiConditionalCacheAndEvict(this.cs); } @Test - protected void testClassMultiConditionalCacheAndEvict() { + protected void classMultiConditionalCacheAndEvict() { testMultiConditionalCacheAndEvict(this.ccs); } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java index 9333c5a8268..b869d3bec5b 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java @@ -41,17 +41,17 @@ public abstract class AbstractCacheTests { @Test - protected void testCacheName() { + void cacheName() { assertThat(getCache().getName()).isEqualTo(CACHE_NAME); } @Test - protected void testNativeCache() { + void nativeCache() { assertThat(getCache().getNativeCache()).isSameAs(getNativeCache()); } @Test - protected void testCachePut() { + void cachePut() { T cache = getCache(); String key = createRandomKey(); @@ -75,7 +75,7 @@ public abstract class AbstractCacheTests { } @Test - protected void testCachePutIfAbsent() { + void cachePutIfAbsent() { T cache = getCache(); String key = createRandomKey(); @@ -90,7 +90,7 @@ public abstract class AbstractCacheTests { } @Test - protected void testCacheRemove() { + void cacheRemove() { T cache = getCache(); String key = createRandomKey(); @@ -101,7 +101,7 @@ public abstract class AbstractCacheTests { } @Test - protected void testCacheClear() { + void cacheClear() { T cache = getCache(); assertThat(cache.get("enescu")).isNull(); @@ -114,12 +114,12 @@ public abstract class AbstractCacheTests { } @Test - protected void testCacheGetCallable() { + void cacheGetCallable() { doTestCacheGetCallable("test"); } @Test - protected void testCacheGetCallableWithNull() { + void cacheGetCallableWithNull() { doTestCacheGetCallable(null); } @@ -135,12 +135,12 @@ public abstract class AbstractCacheTests { } @Test - protected void testCacheGetCallableNotInvokedWithHit() { + void cacheGetCallableNotInvokedWithHit() { doTestCacheGetCallableNotInvokedWithHit("existing"); } @Test - protected void testCacheGetCallableNotInvokedWithHitNull() { + void cacheGetCallableNotInvokedWithHitNull() { doTestCacheGetCallableNotInvokedWithHit(null); } @@ -157,7 +157,7 @@ public abstract class AbstractCacheTests { } @Test - protected void testCacheGetCallableFail() { + void cacheGetCallableFail() { T cache = getCache(); String key = createRandomKey(); @@ -179,7 +179,7 @@ public abstract class AbstractCacheTests { * invocations. */ @Test - protected void testCacheGetSynchronized() throws InterruptedException { + void cacheGetSynchronized() throws InterruptedException { T cache = getCache(); final AtomicInteger counter = new AtomicInteger(); final List results = new CopyOnWriteArrayList<>(); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java index c33cf38c817..0598560847d 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java @@ -33,7 +33,7 @@ public abstract class AbstractValueAdaptingCacheTests diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 7e147449fd7..94548ece206 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -368,12 +368,12 @@ class BridgeMethodResolverTests { } @Test // SPR-16103 - void testClassHierarchy() throws Exception { + void classHierarchy() throws Exception { doTestHierarchyResolution(FooClass.class); } @Test // SPR-16103 - void testInterfaceHierarchy() throws Exception { + void interfaceHierarchy() throws Exception { doTestHierarchyResolution(FooInterface.class); } diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index 265e1e800d6..705cb59d001 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -85,7 +85,7 @@ class GenericTypeResolverTests { } @Test - void testResolveType() { + void resolveTypeWithMap() { Method intMessageMethod = method(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class); MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0); assertThat(resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap<>())).isEqualTo(MyInterfaceType.class); @@ -108,7 +108,7 @@ class GenericTypeResolverTests { } @Test - void testGetTypeVariableMap() { + void getTypeVariableMapBehavior() { Map map; map = getTypeVariableMap(MySimpleInterfaceType.class); diff --git a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java index 6debe11ef3b..e3a95b390a8 100644 --- a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java +++ b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java @@ -96,7 +96,7 @@ class MethodParameterTests { } @Test - void testHashCode() throws NoSuchMethodException { + void hashCodeBehavior() throws NoSuchMethodException { assertThat(stringParameter.hashCode()).isEqualTo(stringParameter.hashCode()); assertThat(longParameter.hashCode()).isEqualTo(longParameter.hashCode()); assertThat(intReturnType.hashCode()).isEqualTo(intReturnType.hashCode()); @@ -109,7 +109,7 @@ class MethodParameterTests { @Test @SuppressWarnings("deprecation") - void testFactoryMethods() { + void factoryMethods() { assertThat(MethodParameter.forMethodOrConstructor(method, 0)).isEqualTo(stringParameter); assertThat(MethodParameter.forMethodOrConstructor(method, 1)).isEqualTo(longParameter); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java index 919c41effbd..3a5a9e2b17a 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java @@ -78,7 +78,7 @@ class SynthesizingMethodParameterTests { } @Test - void testHashCode() throws NoSuchMethodException { + void hashCodeBehavior() throws NoSuchMethodException { assertThat(stringParameter.hashCode()).isEqualTo(stringParameter.hashCode()); assertThat(longParameter.hashCode()).isEqualTo(longParameter.hashCode()); assertThat(intReturnType.hashCode()).isEqualTo(intReturnType.hashCode()); diff --git a/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java index 8caad861145..e1a52e7fa48 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java @@ -80,7 +80,7 @@ class StringDecoderTests extends AbstractDecoderTests { } @Test // gh-30299 - public void decodeAndCancelWithPendingChunks() { + void decodeAndCancelWithPendingChunks() { Flux input = toDataBuffers("abc", 1, UTF_8).concatWith(Flux.never()); Flux result = this.decoder.decode(input, TYPE, null, null); diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/JettyDataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/JettyDataBufferTests.java index 2b14ba46279..5e1052f14cc 100644 --- a/spring-core/src/test/java/org/springframework/core/io/buffer/JettyDataBufferTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/buffer/JettyDataBufferTests.java @@ -58,7 +58,7 @@ public class JettyDataBufferTests { } @AfterEach - public void tearDown() throws Exception { + void tearDown() throws Exception { this.byteBufferPool.clear(); } } diff --git a/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java index 1c3251c65e9..4d52c7f4494 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AbstractMethodMetadataTests.java @@ -189,7 +189,7 @@ public abstract class AbstractMethodMetadataTests { } @Test // gh-24375 - public void metadataLoadsForNestedAnnotations() { + void metadataLoadsForNestedAnnotations() { AnnotationMetadata annotationMetadata = get(AnnotatedComponent.class); assertThat(annotationMetadata.getAnnotationTypes()).containsExactly(EnclosingAnnotation.class.getName()); } diff --git a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java index d535033d9d4..a144b63bbce 100644 --- a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CompositeSetTests { @Test - void testEquals() { + void equals() { Set first = Set.of("foo", "bar"); Set second = Set.of("baz", "qux"); CompositeSet composite = new CompositeSet<>(first, second); diff --git a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java index 505b24eb104..52a0cf98f10 100644 --- a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; class FilteredSetTests { @Test - void testEquals() { + void equals() { Set set = Set.of("foo", "bar", "baz"); FilteredSet filtered = new FilteredSet<>(set, s -> !s.equals("bar")); diff --git a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java index 820c295e03a..b1998ca0795 100644 --- a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java +++ b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java @@ -176,7 +176,7 @@ class MimeTypeTests { } @Test - void testToString() { + void toStringOutput() { MimeType mimeType = new MimeType("text", "plain"); String result = mimeType.toString(); assertThat(result).as("Invalid toString() returned").isEqualTo("text/plain"); diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/io/buffer/AbstractDataBufferAllocatingTests.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/io/buffer/AbstractDataBufferAllocatingTests.java index 742ada538d8..1462baae0d7 100644 --- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/io/buffer/AbstractDataBufferAllocatingTests.java +++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/io/buffer/AbstractDataBufferAllocatingTests.java @@ -177,7 +177,7 @@ public abstract class AbstractDataBufferAllocatingTests { public @interface ParameterizedDataBufferAllocatingTest { } - public static Stream dataBufferFactories() { + static Stream dataBufferFactories() { return Stream.of( // Netty 4 argumentSet("NettyDataBufferFactory - UnpooledByteBufAllocator - preferDirect = true", diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java index 20052dd7947..d1bb6fbb746 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java @@ -31,17 +31,17 @@ import org.springframework.expression.spel.support.StandardTypeConverter; class BooleanExpressionTests extends AbstractExpressionTests { @Test - void testBooleanTrue() { + void booleanTrue() { evaluate("true", Boolean.TRUE, Boolean.class); } @Test - void testBooleanFalse() { + void booleanFalse() { evaluate("false", Boolean.FALSE, Boolean.class); } @Test - void testOr() { + void or() { evaluate("false or false", Boolean.FALSE, Boolean.class); evaluate("false or true", Boolean.TRUE, Boolean.class); evaluate("true or false", Boolean.TRUE, Boolean.class); @@ -49,7 +49,7 @@ class BooleanExpressionTests extends AbstractExpressionTests { } @Test - void testAnd() { + void and() { evaluate("false and false", Boolean.FALSE, Boolean.class); evaluate("false and true", Boolean.FALSE, Boolean.class); evaluate("true and false", Boolean.FALSE, Boolean.class); @@ -57,7 +57,7 @@ class BooleanExpressionTests extends AbstractExpressionTests { } @Test - void testNot() { + void not() { evaluate("!false", Boolean.TRUE, Boolean.class); evaluate("!true", Boolean.FALSE, Boolean.class); @@ -66,21 +66,21 @@ class BooleanExpressionTests extends AbstractExpressionTests { } @Test - void testCombinations01() { + void combinations01() { evaluate("false and false or true", Boolean.TRUE, Boolean.class); evaluate("true and false or true", Boolean.TRUE, Boolean.class); evaluate("true and false or false", Boolean.FALSE, Boolean.class); } @Test - void testWritability() { + void writability() { evaluate("true and true", Boolean.TRUE, Boolean.class, false); evaluate("true or true", Boolean.TRUE, Boolean.class, false); evaluate("!false", Boolean.TRUE, Boolean.class, false); } @Test - void testBooleanErrors01() { + void booleanErrors01() { evaluateAndCheckError("1.0 or false", SpelMessage.TYPE_CONVERSION_ERROR, 0); evaluateAndCheckError("false or 39.4", SpelMessage.TYPE_CONVERSION_ERROR, 9); evaluateAndCheckError("true and 'hello'", SpelMessage.TYPE_CONVERSION_ERROR, 9); @@ -90,7 +90,7 @@ class BooleanExpressionTests extends AbstractExpressionTests { } @Test - void testConvertAndHandleNull() { // SPR-9445 + void convertAndHandleNull() { // SPR-9445 // without null conversion evaluateAndCheckError("null or true", SpelMessage.TYPE_CONVERSION_ERROR, 0, "null", "boolean"); evaluateAndCheckError("null and true", SpelMessage.TYPE_CONVERSION_ERROR, 0, "null", "boolean"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java index a8b27536052..6e544ea2ea3 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java @@ -39,7 +39,7 @@ class CachedMethodExecutorTests { @Test - void testCachedExecutionForParameters() { + void cachedExecutionForParameters() { Expression expression = this.parser.parseExpression("echo(#var)"); assertMethodExecution(expression, 42, "int: 42"); @@ -49,7 +49,7 @@ class CachedMethodExecutorTests { } @Test - void testCachedExecutionForTarget() { + void cachedExecutionForTarget() { Expression expression = this.parser.parseExpression("#var.echo(42)"); assertMethodExecution(expression, new RootObject(), "int: 42"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java index 76f5d6cd840..628d7b16621 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ComparatorTests { @Test - void testPrimitives() throws EvaluationException { + void primitives() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); // primitive int assertThat(comparator.compare(1, 2)).isLessThan(0); @@ -69,7 +69,7 @@ class ComparatorTests { } @Test - void testNonPrimitiveNumbers() throws EvaluationException { + void nonPrimitiveNumbers() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); BigDecimal bdOne = new BigDecimal("1"); @@ -98,7 +98,7 @@ class ComparatorTests { } @Test - void testNulls() throws EvaluationException { + void nulls() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.compare(null,"abc")).isLessThan(0); assertThat(comparator.compare(null,null)).isEqualTo(0); @@ -106,7 +106,7 @@ class ComparatorTests { } @Test - void testObjects() throws EvaluationException { + void objects() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.compare("a","a")).isEqualTo(0); assertThat(comparator.compare("a","b")).isLessThan(0); @@ -114,7 +114,7 @@ class ComparatorTests { } @Test - void testCanCompare() throws EvaluationException { + void canCompare() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.canCompare(null,1)).isTrue(); assertThat(comparator.canCompare(1,null)).isTrue(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java index 1aa82d54830..deaa9ae3977 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java @@ -60,7 +60,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: using the standard infrastructure and running simple expression evaluation. */ @Test - void testScenario_UsingStandardInfrastructure() { + void usingStandardInfrastructure() { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Parse an expression @@ -78,7 +78,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: using the standard context but adding your own variables */ @Test - void testScenario_DefiningVariablesThatWillBeAccessibleInExpressions() { + void definingVariablesThatWillBeAccessibleInExpressions() { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Use the standard evaluation context @@ -105,7 +105,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: using your own root context object */ @Test - void testScenario_UsingADifferentRootContextObject() { + void usingADifferentRootContextObject() { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Use the standard evaluation context @@ -151,7 +151,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: using your own java methods and calling them from the expression */ @Test - void testScenario_RegisteringJavaMethodsAsFunctionsAndCallingThem() throws Exception { + void registeringJavaMethodsAsFunctionsAndCallingThem() throws Exception { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Use the standard evaluation context @@ -167,7 +167,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: looking up your own MethodHandles and calling them from the expression */ @Test - void testScenario_RegisteringJavaMethodsAsMethodHandlesAndCallingThem() throws Exception { + void registeringJavaMethodsAsMethodHandlesAndCallingThem() throws Exception { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); //this.context is already populated with all relevant MethodHandle examples @@ -201,7 +201,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { * Scenario: add a property resolver that will get called in the resolver chain, this one only supports reading. */ @Test - void testScenario_AddingYourOwnPropertyResolvers_1() { + void addingYourOwnPropertyResolvers_1() { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Use the standard evaluation context @@ -217,7 +217,7 @@ class ExpressionLanguageScenarioTests extends AbstractExpressionTests { } @Test - void testScenario_AddingYourOwnPropertyResolvers_2() { + void addingYourOwnPropertyResolvers_2() { // Create a parser SpelExpressionParser parser = new SpelExpressionParser(); // Use the standard evaluation context diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java index f7d97f075b5..5d9ab0dfc87 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; class ParserErrorMessagesTests extends AbstractExpressionTests { @Test - void testBrokenExpression01() { + void brokenExpression01() { // will not fit into an int, needs L suffix parseAndCheckError("0xCAFEBABE", SpelMessage.NOT_AN_INTEGER); evaluate("0xCAFEBABEL", 0xCAFEBABEL, Long.class); @@ -34,25 +34,25 @@ class ParserErrorMessagesTests extends AbstractExpressionTests { } @Test - void testBrokenExpression02() { + void brokenExpression02() { // rogue 'G' on the end parseAndCheckError("0xB0BG", SpelMessage.MORE_INPUT, 5, "G"); } @Test - void testBrokenExpression04() { + void brokenExpression04() { // missing right operand parseAndCheckError("true or ", SpelMessage.RIGHT_OPERAND_PROBLEM, 5); } @Test - void testBrokenExpression05() { + void brokenExpression05() { // missing right operand parseAndCheckError("1 + ", SpelMessage.RIGHT_OPERAND_PROBLEM, 2); } @Test - void testBrokenExpression07() { + void brokenExpression07() { // T() can only take an identifier (possibly qualified), not a literal // message ought to say identifier rather than ID parseAndCheckError("null instanceof T('a')", SpelMessage.NOT_EXPECTED_TOKEN, 18, diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurityExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurityExpressionTests.java index 3109de49a02..80878286588 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurityExpressionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurityExpressionTests.java @@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests { @Test - void testScenario01_Roles() { + void roles() { SpelExpressionParser parser = new SpelExpressionParser(); StandardEvaluationContext ctx = new StandardEvaluationContext(); Expression expr = parser.parseRaw("hasAnyRole('MANAGER','TELLER')"); @@ -61,7 +61,7 @@ class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests } @Test - void testScenario02_ComparingNames() { + void comparingNames() { SpelExpressionParser parser = new SpelExpressionParser(); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -96,7 +96,7 @@ class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests } @Test - void testScenario03_Arithmetic() { + void arithmetic() { SpelExpressionParser parser = new SpelExpressionParser(); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -119,7 +119,7 @@ class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests // Here i'm going to change which hasRole() executes and make it one of my own Java methods @Test - void testScenario04_ControllingWhichMethodsRun() { + void controllingWhichMethodsRun() { SpelExpressionParser parser = new SpelExpressionParser(); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -128,7 +128,7 @@ class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests ctx.addMethodResolver(new MyMethodResolver()); // NEEDS TO OVERRIDE THE REFLECTION ONE - SHOW REORDERING MECHANISM // Might be better with a as a variable although it would work as a property too... // Variable references using a '#' -// SpelExpression expr = parser.parseExpression("(hasRole('SUPERVISOR') or (#a < 1.042)) and hasIpAddress('10.10.0.0/16')"); + // SpelExpression expr = parser.parseExpression("(hasRole('SUPERVISOR') or (#a < 1.042)) and hasIpAddress('10.10.0.0/16')"); Expression expr = parser.parseRaw("(hasRole(3) or (#a < 1.042)) and hasIpAddress('10.10.0.0/16')"); Boolean value = null; @@ -137,10 +137,10 @@ class ScenariosForSpringSecurityExpressionTests extends AbstractExpressionTests value = expr.getValue(ctx,Boolean.class); assertThat((boolean) value).isTrue(); -// ctx.setRootObject(new Manager("Luke")); -// ctx.setVariable("a",1.043d); -// value = (Boolean)expr.getValue(ctx,Boolean.class); -// assertFalse(value); + // ctx.setRootObject(new Manager("Luke")); + // ctx.setVariable("a",1.043d); + // value = (Boolean)expr.getValue(ctx,Boolean.class); + // assertFalse(value); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index f0ab0fe7eb7..8963bb696b7 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -2158,7 +2158,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test // gh-27421 - public void nullSafeMethodChainingWithNonStaticVoidMethod() { + void nullSafeMethodChainingWithNonStaticVoidMethod() { FooObjectHolder foh = new FooObjectHolder(); StandardEvaluationContext context = new StandardEvaluationContext(foh); SpelExpression expression = (SpelExpression) parser.parseExpression("getFoo()?.doFoo()"); @@ -2437,7 +2437,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { @ParameterizedTest @ValueSource(strings = {"voidMethod", "voidWrapperMethod"}) - public void voidFunctionReference(String method) throws Exception { + void voidFunctionReference(String method) throws Exception { assertVoidFunctionReferenceBehavior(method); } @@ -5348,7 +5348,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test // gh-27421 - public void nullSafeInvocationOfNonStaticVoidMethod() { + void nullSafeInvocationOfNonStaticVoidMethod() { // non-static method, no args, void return expression = parser.parseExpression("new %s()?.one()".formatted(TestClass5.class.getName())); @@ -5365,7 +5365,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test // gh-27421 - public void nullSafeInvocationOfStaticVoidMethod() { + void nullSafeInvocationOfStaticVoidMethod() { // static method, no args, void return expression = parser.parseExpression("T(%s)?.two()".formatted(TestClass5.class.getName())); @@ -5382,7 +5382,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test // gh-27421 - public void nullSafeInvocationOfNonStaticVoidWrapperMethod() { + void nullSafeInvocationOfNonStaticVoidWrapperMethod() { // non-static method, no args, Void return expression = parser.parseExpression("new %s()?.oneVoidWrapper()".formatted(TestClass5.class.getName())); @@ -5399,7 +5399,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test // gh-27421 - public void nullSafeInvocationOfStaticVoidWrapperMethod() { + void nullSafeInvocationOfStaticVoidWrapperMethod() { // static method, no args, Void return expression = parser.parseExpression("T(%s)?.twoVoidWrapper()".formatted(TestClass5.class.getName())); @@ -6191,7 +6191,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } @Test - void testNullComparison_SPR22358() { + void nullComparison_SPR22358() { SpelParserConfiguration configuration = new SpelParserConfiguration(SpelCompilerMode.OFF, null); SpelExpressionParser parser = new SpelExpressionParser(configuration); StandardEvaluationContext ctx = new StandardEvaluationContext(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelExceptionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelExceptionTests.java index 51dfc48b4fe..0c24c72d43f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelExceptionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelExceptionTests.java @@ -55,7 +55,7 @@ class SpelExceptionTests { @Test @SuppressWarnings("serial") - public void spelExpressionMapWithVariables() { + void spelExpressionMapWithVariables() { ExpressionParser parser = new SpelExpressionParser(); Expression spelExpression = parser.parseExpression("#aMap['one'] eq 1"); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -94,7 +94,7 @@ class SpelExceptionTests { @Test @SuppressWarnings("serial") - public void spelExpressionListWithVariables() { + void spelExpressionListWithVariables() { ExpressionParser parser = new SpelExpressionParser(); Expression spelExpression = parser.parseExpression("#aList.contains('one')"); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -116,7 +116,7 @@ class SpelExceptionTests { @Test @SuppressWarnings("serial") - public void spelExpressionListIndexAccessWithVariables() { + void spelExpressionListIndexAccessWithVariables() { ExpressionParser parser = new SpelExpressionParser(); Expression spelExpression = parser.parseExpression("#aList[0] eq 'one'"); StandardEvaluationContext ctx = new StandardEvaluationContext(); @@ -146,7 +146,7 @@ class SpelExceptionTests { @Test @SuppressWarnings("serial") - public void spelExpressionArrayWithVariables() { + void spelExpressionArrayWithVariables() { ExpressionParser parser = new SpelExpressionParser(); Expression spelExpression = parser.parseExpression("#anArray[0] eq 1"); StandardEvaluationContext ctx = new StandardEvaluationContext(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index a4f29260533..c38aa665f6b 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -688,7 +688,7 @@ class SpelReproTests extends AbstractExpressionTests { } @Test - void testCompiledExpressionForProxy_SPR16191() { + void compiledExpressionForProxy_SPR16191() { SpelExpressionParser expressionParser = new SpelExpressionParser(new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null)); Expression expression = expressionParser.parseExpression("#target.process(#root)"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java index 47be295c2b2..ff563fd3034 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; class StandardTypeComparatorTests { @Test - void testPrimitives() throws EvaluationException { + void primitives() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); // primitive int assertThat(comparator.compare(1, 2)).isNegative(); @@ -64,7 +64,7 @@ class StandardTypeComparatorTests { } @Test - void testNonPrimitiveNumbers() throws EvaluationException { + void nonPrimitiveNumbers() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); BigDecimal bdOne = new BigDecimal("1"); @@ -93,7 +93,7 @@ class StandardTypeComparatorTests { } @Test - void testNulls() throws EvaluationException { + void nulls() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.compare(null, "abc")).isNegative(); assertThat(comparator.compare(null, null)).isZero(); @@ -101,7 +101,7 @@ class StandardTypeComparatorTests { } @Test - void testObjects() throws EvaluationException { + void objects() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.compare("a", "a")).isZero(); assertThat(comparator.compare("a", "b")).isNegative(); @@ -109,7 +109,7 @@ class StandardTypeComparatorTests { } @Test - void testCanCompare() throws EvaluationException { + void canCompare() throws EvaluationException { TypeComparator comparator = new StandardTypeComparator(); assertThat(comparator.canCompare(null, 1)).isTrue(); assertThat(comparator.canCompare(1, null)).isTrue(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java index 54975c15587..230eb390e45 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java @@ -244,7 +244,7 @@ class SpelParserTests { } @Test - void testStringLiterals_DoubleQuotes_spr9620() { + void stringLiterals_DoubleQuotes_spr9620() { SpelExpression expr = parser.parseRaw("\"double quote: \"\".\""); assertThat(expr.getValue()).isEqualTo("double quote: \"."); expr = parser.parseRaw("\"hello \"\" world\""); @@ -252,7 +252,7 @@ class SpelParserTests { } @Test - void testStringLiterals_DoubleQuotes_spr9620_2() { + void stringLiterals_DoubleQuotes_spr9620_2() { assertParseExceptionThrownBy(() -> parser.parseRaw("\"double quote: \\\"\\\".\"")) .satisfies(ex -> { assertThat(ex.getPosition()).isEqualTo(17); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java index e7f0b28803b..d2dda3ad1f0 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java @@ -63,13 +63,13 @@ class InitializeDatabaseIntegrationTests { @Test - void testCreateEmbeddedDatabase() { + void createEmbeddedDatabase() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-config.xml"); assertCorrectSetup(context.getBean("dataSource", DataSource.class)); } @Test - void testDisableCreateEmbeddedDatabase() { + void disableCreateEmbeddedDatabase() { System.setProperty("ENABLED", "false"); context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-config.xml"); assertThatExceptionOfType(BadSqlGrammarException.class).isThrownBy(() -> @@ -77,13 +77,13 @@ class InitializeDatabaseIntegrationTests { } @Test - void testIgnoreFailedDrops() { + void ignoreFailedDrops() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-fail-config.xml"); assertCorrectSetup(context.getBean("dataSource", DataSource.class)); } @Test - void testScriptNameWithPattern() { + void scriptNameWithPattern() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-pattern-config.xml"); DataSource dataSource = context.getBean("dataSource", DataSource.class); assertCorrectSetup(dataSource); @@ -92,21 +92,21 @@ class InitializeDatabaseIntegrationTests { } @Test - void testScriptNameWithPlaceholder() { + void scriptNameWithPlaceholder() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml"); DataSource dataSource = context.getBean("dataSource", DataSource.class); assertCorrectSetup(dataSource); } @Test - void testScriptNameWithExpressions() { + void scriptNameWithExpressions() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-expression-config.xml"); DataSource dataSource = context.getBean("dataSource", DataSource.class); assertCorrectSetup(dataSource); } @Test - void testCacheInitialization() { + void cacheInitialization() { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-cache-config.xml"); assertCorrectSetup(context.getBean("dataSource", DataSource.class)); CacheData cache = context.getBean(CacheData.class); 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 cfeb1faa5c2..0467f7be166 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 @@ -81,7 +81,7 @@ class JdbcTemplateQueryTests { @Test - void testQueryForList() throws Exception { + void queryForList() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(true, true, false); given(this.resultSet.getObject(1)).willReturn(11, 12); @@ -95,7 +95,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithEmptyResult() throws Exception { + void queryForListWithEmptyResult() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(false); List> li = this.template.queryForList(sql); @@ -106,7 +106,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithSingleRowAndColumn() throws Exception { + void queryForListWithSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); @@ -119,7 +119,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithIntegerElement() throws Exception { + void queryForListWithIntegerElement() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(11); @@ -131,7 +131,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForMapWithSingleRowAndColumn() throws Exception { + void queryForMapWithSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); @@ -143,7 +143,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectThrowsIncorrectResultSizeForMoreThanOneRow() throws Exception { + void queryForObjectThrowsIncorrectResultSizeForMoreThanOneRow() throws Exception { String sql = "select pass from t_account where first_name='Alef'"; given(this.resultSet.next()).willReturn(true, true, false); given(this.resultSet.getString(1)).willReturn("pass"); @@ -155,7 +155,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithRowMapper() throws Exception { + void queryForObjectWithRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -167,7 +167,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForStreamWithRowMapper() throws Exception { + void queryForStreamWithRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -185,7 +185,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithString() throws Exception { + void queryForObjectWithString() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getString(1)).willReturn("myvalue"); @@ -196,7 +196,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithBigInteger() throws Exception { + void queryForObjectWithBigInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1, BigInteger.class)).willReturn(new BigInteger("22")); @@ -207,7 +207,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithBigDecimal() throws Exception { + void queryForObjectWithBigDecimal() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getBigDecimal(1)).willReturn(new BigDecimal("22.5")); @@ -218,7 +218,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithInteger() throws Exception { + void queryForObjectWithInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -229,7 +229,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithIntegerAndNull() throws Exception { + void queryForObjectWithIntegerAndNull() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(0); @@ -241,7 +241,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForInt() throws Exception { + void queryForInt() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -253,7 +253,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForIntPrimitive() throws Exception { + void queryForIntPrimitive() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -265,7 +265,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForLong() throws Exception { + void queryForLong() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getLong(1)).willReturn(87L); @@ -277,7 +277,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForLongPrimitive() throws Exception { + void queryForLongPrimitive() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getLong(1)).willReturn(87L); @@ -289,12 +289,12 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithArgs() throws Exception { + void queryForListWithArgs() throws Exception { doTestQueryForListWithArgs("SELECT AGE FROM CUSTMR WHERE ID < ?"); } @Test - void testQueryForListIsNotConfusedByNamedParameterPrefix() throws Exception { + void queryForListIsNotConfusedByNamedParameterPrefix() throws Exception { doTestQueryForListWithArgs("SELECT AGE FROM PREFIX:CUSTMR WHERE ID < ?"); } @@ -312,7 +312,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithArgsAndEmptyResult() throws Exception { + void queryForListWithArgsAndEmptyResult() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; given(this.resultSet.next()).willReturn(false); List> li = this.template.queryForList(sql, 3); @@ -324,7 +324,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithArgsAndSingleRowAndColumn() throws Exception { + void queryForListWithArgsAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); @@ -338,7 +338,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForListWithArgsAndIntegerElementAndSingleRowAndColumn() throws Exception { + void queryForListWithArgsAndIntegerElementAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(11); @@ -351,7 +351,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForMapWithArgsAndSingleRowAndColumn() throws Exception { + void queryForMapWithArgsAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); @@ -364,7 +364,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithArgsAndRowMapper() throws Exception { + void queryForObjectWithArgsAndRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -377,7 +377,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForStreamWithArgsAndRowMapper() throws Exception { + void queryForStreamWithArgsAndRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -396,7 +396,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForObjectWithArgsAndInteger() throws Exception { + void queryForObjectWithArgsAndInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -409,7 +409,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForIntWithArgs() throws Exception { + void queryForIntWithArgs() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getInt(1)).willReturn(22); @@ -422,7 +422,7 @@ class JdbcTemplateQueryTests { } @Test - void testQueryForLongWithArgs() throws Exception { + void queryForLongWithArgs() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getLong(1)).willReturn(87L); 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 a019470cbdf..06506a18dd3 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 @@ -113,7 +113,7 @@ class JdbcTemplateTests { @Test - void testBeanProperties() { + void beanProperties() { assertThat(this.template.getDataSource()).as("datasource ok").isSameAs(this.dataSource); assertThat(this.template.isIgnoreWarnings()).as("ignores warnings by default").isTrue(); this.template.setIgnoreWarnings(false); @@ -122,7 +122,7 @@ class JdbcTemplateTests { } @Test - void testUpdateCount() throws Exception { + void updateCount() throws Exception { final String sql = "UPDATE INVOICE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; int idParam = 11111; given(this.preparedStatement.executeUpdate()).willReturn(1); @@ -135,7 +135,7 @@ class JdbcTemplateTests { } @Test - void testBogusUpdate() throws Exception { + void bogusUpdate() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int idParam = 6666; @@ -153,23 +153,23 @@ class JdbcTemplateTests { } @Test - void testStringsWithStaticSql() throws Exception { + void stringsWithStaticSql() throws Exception { doTestStrings(null, null, null, null, JdbcTemplate::query); } @Test - void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception { + void stringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception { doTestStrings(10, 20, 30, null, JdbcTemplate::query); } @Test - void testStringsWithEmptyPreparedStatementSetter() throws Exception { + void stringsWithEmptyPreparedStatementSetter() throws Exception { doTestStrings(null, null, null, null, (template, sql, rch) -> template.query(sql, (PreparedStatementSetter) null, rch)); } @Test - void testStringsWithPreparedStatementSetter() throws Exception { + void stringsWithPreparedStatementSetter() throws Exception { final Integer argument = 99; doTestStrings(null, null, null, argument, (template, sql, rch) -> template.query(sql, ps -> ps.setObject(1, argument), rch)); @@ -177,14 +177,14 @@ class JdbcTemplateTests { @Test @SuppressWarnings("deprecation") - public void testStringsWithEmptyPreparedStatementArgs() throws Exception { + void stringsWithEmptyPreparedStatementArgs() throws Exception { doTestStrings(null, null, null, null, (template, sql, rch) -> template.query(sql, (Object[]) null, rch)); } @Test @SuppressWarnings("deprecation") - public void testStringsWithPreparedStatementArgs() throws Exception { + void stringsWithPreparedStatementArgs() throws Exception { final Integer argument = 99; doTestStrings(null, null, null, argument, (template, sql, rch) -> template.query(sql, new Object[] {argument}, rch)); @@ -250,7 +250,7 @@ class JdbcTemplateTests { } @Test - void testLeaveConnectionOpenOnRequest() throws Exception { + void leaveConnectionOpenOnRequest() throws Exception { String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(false); @@ -269,7 +269,7 @@ class JdbcTemplateTests { } @Test - void testConnectionCallback() { + void connectionCallback() { String result = this.template.execute((ConnectionCallback) con -> { assertThat(con).isInstanceOf(ConnectionProxy.class); assertThat(((ConnectionProxy) con).getTargetConnection()).isSameAs(JdbcTemplateTests.this.connection); @@ -279,7 +279,7 @@ class JdbcTemplateTests { } @Test - void testConnectionCallbackWithStatementSettings() throws Exception { + void connectionCallbackWithStatementSettings() throws Exception { String result = this.template.execute((ConnectionCallback) con -> { PreparedStatement ps = con.prepareStatement("some SQL"); ps.setFetchSize(10); @@ -296,7 +296,7 @@ class JdbcTemplateTests { } @Test - void testCloseConnectionOnRequest() throws Exception { + void closeConnectionOnRequest() throws Exception { String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3"; given(this.resultSet.next()).willReturn(false); @@ -314,7 +314,7 @@ class JdbcTemplateTests { * Test that we see a runtime exception come back. */ @Test - void testExceptionComesBack() throws Exception { + void exceptionComesBack() throws Exception { final String sql = "SELECT ID FROM CUSTMR"; final RuntimeException runtimeException = new RuntimeException("Expected"); @@ -340,7 +340,7 @@ class JdbcTemplateTests { * Test update with static SQL. */ @Test - void testSqlUpdate() throws Exception { + void sqlUpdate() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; int rowsAffected = 33; @@ -357,7 +357,7 @@ class JdbcTemplateTests { * Test update with dynamic SQL. */ @Test - void testSqlUpdateWithArguments() throws Exception { + void sqlUpdateWithArguments() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ? and PR = ?"; int rowsAffected = 33; given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected); @@ -372,7 +372,7 @@ class JdbcTemplateTests { } @Test - void testSqlUpdateEncountersSqlException() throws Exception { + void sqlUpdateEncountersSqlException() throws Exception { SQLException sqlException = new SQLException("bad update"); final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; @@ -387,7 +387,7 @@ class JdbcTemplateTests { } @Test - void testSqlUpdateWithThreadConnection() throws Exception { + void sqlUpdateWithThreadConnection() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; int rowsAffected = 33; @@ -402,7 +402,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdate() throws Exception { + void batchUpdate() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"}; @@ -422,7 +422,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithBatchFailure() throws Exception { + void batchUpdateWithBatchFailure() throws Exception { final String[] sql = {"A", "B", "C", "D"}; given(this.statement.executeBatch()).willThrow( new BatchUpdateException(new int[] {1, Statement.EXECUTE_FAILED, 1, Statement.EXECUTE_FAILED})); @@ -439,7 +439,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithNoBatchSupport() throws Exception { + void batchUpdateWithNoBatchSupport() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"}; @@ -461,7 +461,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithNoBatchSupportAndSelect() throws Exception { + void batchUpdateWithNoBatchSupportAndSelect() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "SELECT * FROM NOSUCHTABLE"}; @@ -480,7 +480,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithPreparedStatement() throws Exception { + void batchUpdateWithPreparedStatement() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; final int[] rowsAffected = new int[] {1, 2}; @@ -514,7 +514,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithPreparedStatementWithEmptyData() throws Exception { + void batchUpdateWithPreparedStatementWithEmptyData() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {}; final int[] rowsAffected = new int[] {}; @@ -542,7 +542,7 @@ class JdbcTemplateTests { } @Test - void testInterruptibleBatchUpdate() throws Exception { + void interruptibleBatchUpdate() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; final int[] rowsAffected = new int[] {1, 2}; @@ -583,7 +583,7 @@ class JdbcTemplateTests { } @Test - void testInterruptibleBatchUpdateWithBaseClass() throws Exception { + void interruptibleBatchUpdateWithBaseClass() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; final int[] rowsAffected = new int[] {1, 2}; @@ -620,7 +620,7 @@ class JdbcTemplateTests { } @Test - void testInterruptibleBatchUpdateWithBaseClassAndNoBatchSupport() throws Exception { + void interruptibleBatchUpdateWithBaseClassAndNoBatchSupport() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; final int[] rowsAffected = new int[] {1, 2}; @@ -657,7 +657,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithPreparedStatementAndNoBatchSupport() throws Exception { + void batchUpdateWithPreparedStatementAndNoBatchSupport() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; final int[] rowsAffected = new int[] {1, 2}; @@ -688,7 +688,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateFails() throws Exception { + void batchUpdateFails() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] {100, 200}; SQLException sqlException = new SQLException(); @@ -722,7 +722,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithEmptyList() { + void batchUpdateWithEmptyList() { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; JdbcTemplate template = new JdbcTemplate(this.dataSource, false); @@ -731,7 +731,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithListOfObjectArrays() throws Exception { + void batchUpdateWithListOfObjectArrays() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final List ids = new ArrayList<>(2); ids.add(new Object[] {100}); @@ -755,7 +755,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception { + void batchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final List ids = new ArrayList<>(2); ids.add(new Object[] {100}); @@ -779,7 +779,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithCollectionOfObjects() throws Exception { + void batchUpdateWithCollectionOfObjects() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final List ids = Arrays.asList(100, 200, 300); final int[] rowsAffected1 = new int[] {1, 2}; @@ -806,7 +806,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithBatchFailingHasUpdateCounts() throws Exception { + void batchUpdateWithBatchFailingHasUpdateCounts() throws Exception { test3BatchesOf2ItemsFailing(exception -> assertThat(exception).cause() .isInstanceOfSatisfying(AggregatedBatchUpdateException.class, ex -> { assertThat(ex.getSuccessfulUpdateCounts()).hasDimensions(1, 2) @@ -816,7 +816,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateWithBatchFailingMatchesOriginalException() throws Exception { + void batchUpdateWithBatchFailingMatchesOriginalException() throws Exception { test3BatchesOf2ItemsFailing(exception -> assertThat(exception).cause() .isInstanceOfSatisfying(AggregatedBatchUpdateException.class, ex -> { BatchUpdateException originalException = ex.getOriginalException(); @@ -855,7 +855,7 @@ class JdbcTemplateTests { } @Test - void testCouldNotGetConnectionForOperationOrExceptionTranslator() throws SQLException { + void couldNotGetConnectionForOperationOrExceptionTranslator() throws SQLException { SQLException sqlException = new SQLException("foo", "07xxx"); given(this.dataSource.getConnection()).willThrow(sqlException); JdbcTemplate template = new JdbcTemplate(this.dataSource, false); @@ -867,7 +867,7 @@ class JdbcTemplateTests { } @Test - void testCouldNotGetConnectionForOperationWithLazyExceptionTranslator() throws SQLException { + void couldNotGetConnectionForOperationWithLazyExceptionTranslator() throws SQLException { SQLException sqlException = new SQLException("foo", "07xxx"); given(this.dataSource.getConnection()).willThrow(sqlException); this.template = new JdbcTemplate(); @@ -881,14 +881,14 @@ class JdbcTemplateTests { } @Test - void testCouldNotGetConnectionInOperationWithExceptionTranslatorInitializedViaBeanProperty() + void couldNotGetConnectionInOperationWithExceptionTranslatorInitializedViaBeanProperty() throws SQLException { doTestCouldNotGetConnectionInOperationWithExceptionTranslatorInitialized(true); } @Test - void testCouldNotGetConnectionInOperationWithExceptionTranslatorInitializedInAfterPropertiesSet() + void couldNotGetConnectionInOperationWithExceptionTranslatorInitializedInAfterPropertiesSet() throws SQLException { doTestCouldNotGetConnectionInOperationWithExceptionTranslatorInitialized(false); @@ -921,7 +921,7 @@ class JdbcTemplateTests { } @Test - void testPreparedStatementSetterSucceeds() throws Exception { + void preparedStatementSetterSucceeds() throws Exception { final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1"; final String name = "Gary"; int expectedRowsUpdated = 1; @@ -937,7 +937,7 @@ class JdbcTemplateTests { } @Test - void testPreparedStatementSetterFails() throws Exception { + void preparedStatementSetterFails() throws Exception { final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1"; final String name = "Gary"; SQLException sqlException = new SQLException(); @@ -953,7 +953,7 @@ class JdbcTemplateTests { } @Test - void testCouldNotClose() throws Exception { + void couldNotClose() throws Exception { SQLException sqlException = new SQLException("bar"); given(this.connection.createStatement()).willReturn(this.statement); given(this.resultSet.next()).willReturn(false); @@ -970,7 +970,7 @@ class JdbcTemplateTests { * Mock objects allow us to produce warnings at will */ @Test - void testFatalWarning() throws Exception { + void fatalWarning() throws Exception { String sql = "SELECT forename from custmr"; SQLWarning warnings = new SQLWarning("My warning"); @@ -991,7 +991,7 @@ class JdbcTemplateTests { } @Test - void testIgnoredWarning() throws Exception { + void ignoredWarning() throws Exception { String sql = "SELECT forename from custmr"; SQLWarning warnings = new SQLWarning("My warning"); @@ -1011,7 +1011,7 @@ class JdbcTemplateTests { } @Test - void testSQLErrorCodeTranslation() throws Exception { + void sqlErrorCodeTranslation() throws Exception { final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054); final String sql = "SELECT ID FROM CUSTOMER"; @@ -1032,7 +1032,7 @@ class JdbcTemplateTests { } @Test - void testSQLErrorCodeTranslationWithSpecifiedDatabaseName() throws Exception { + void sqlErrorCodeTranslationWithSpecifiedDatabaseName() throws Exception { final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054); final String sql = "SELECT ID FROM CUSTOMER"; @@ -1057,7 +1057,7 @@ class JdbcTemplateTests { * to get the metadata */ @Test - void testUseCustomExceptionTranslator() throws Exception { + void useCustomExceptionTranslator() throws Exception { // Bad SQL state final SQLException sqlException = new SQLException("I have a known problem", "07000", 1054); final String sql = "SELECT ID FROM CUSTOMER"; @@ -1082,7 +1082,7 @@ class JdbcTemplateTests { } @Test - void testStaticResultSetClosed() throws Exception { + void staticResultSetClosed() throws Exception { ResultSet resultSet2 = mock(); reset(this.preparedStatement); given(this.preparedStatement.executeQuery()).willReturn(resultSet2); @@ -1104,7 +1104,7 @@ class JdbcTemplateTests { } @Test - void testExecuteClosed() throws Exception { + void executeClosed() throws Exception { given(this.resultSet.next()).willReturn(true); given(this.callableStatement.execute()).willReturn(true); given(this.callableStatement.getUpdateCount()).willReturn(-1); @@ -1121,7 +1121,7 @@ class JdbcTemplateTests { } @Test - void testCaseInsensitiveResultsMap() throws Exception { + void caseInsensitiveResultsMap() throws Exception { given(this.callableStatement.execute()).willReturn(false); given(this.callableStatement.getUpdateCount()).willReturn(-1); given(this.callableStatement.getObject(1)).willReturn("X"); @@ -1143,7 +1143,7 @@ class JdbcTemplateTests { } @Test // SPR-16578 - public void testEquallyNamedColumn() throws SQLException { + void equallyNamedColumn() throws SQLException { given(this.connection.createStatement()).willReturn(this.statement); ResultSetMetaData metaData = mock(); @@ -1162,7 +1162,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateReturnsGeneratedKeys_whenDatabaseSupportsBatchUpdates() throws SQLException { + void batchUpdateReturnsGeneratedKeys_whenDatabaseSupportsBatchUpdates() throws SQLException { final int[] rowsAffected = new int[] {1, 2}; given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); @@ -1199,7 +1199,7 @@ class JdbcTemplateTests { } @Test - void testBatchUpdateReturnsGeneratedKeys_whenDatabaseDoesNotSupportBatchUpdates() throws SQLException { + void batchUpdateReturnsGeneratedKeys_whenDatabaseDoesNotSupportBatchUpdates() throws SQLException { final int[] rowsAffected = new int[] {1, 2}; given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); @@ -1240,13 +1240,13 @@ class JdbcTemplateTests { } @Test - void testSkipFurtherRowsOnceMaxRowsHasBeenReachedForRowMapper() throws Exception { + void skipFurtherRowsOnceMaxRowsHasBeenReachedForRowMapper() throws Exception { testDiscardFurtherRowsOnceMaxRowsHasBeenReached((template, sql) -> template.query(sql, (rs, rowNum) -> rs.getString(1))); } @Test - void testDiscardFurtherRowsOnceMaxRowsHasBeenReachedForRowCallbackHandler() throws Exception { + void discardFurtherRowsOnceMaxRowsHasBeenReachedForRowCallbackHandler() throws Exception { testDiscardFurtherRowsOnceMaxRowsHasBeenReached((template, sql) -> { List list = new ArrayList<>(); template.query(sql, (RowCallbackHandler) rs -> list.add(rs.getString(1))); @@ -1255,7 +1255,7 @@ class JdbcTemplateTests { } @Test - void testDiscardFurtherRowsOnceMaxRowsHasBeenReachedForStream() throws Exception { + void discardFurtherRowsOnceMaxRowsHasBeenReachedForStream() throws Exception { testDiscardFurtherRowsOnceMaxRowsHasBeenReached((template, sql) -> { try (Stream stream = template.queryForStream(sql, (rs, rowNum) -> rs.getString(1))) { return stream.toList(); 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 f92eebdd96f..ad32b15c4eb 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 @@ -113,7 +113,7 @@ class RowMapperTests { @Test @SuppressWarnings("deprecation") - public void queryWithArgsAndRowMapper() throws SQLException { + void queryWithArgsAndRowMapper() throws SQLException { result = template.query("some SQL", new Object[] { "test1", "test2" }, testRowMapper); preparedStatement.setString(1, "test1"); preparedStatement.setString(2, "test2"); 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 3851771c390..3f8693fcf68 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 @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; class SingleColumnRowMapperTests { @Test // SPR-16483 - public void useDefaultConversionService() throws SQLException { + void useDefaultConversionService() throws SQLException { Timestamp timestamp = new Timestamp(0); SingleColumnRowMapper rowMapper = SingleColumnRowMapper.newInstance(LocalDateTime.class); @@ -61,7 +61,7 @@ class SingleColumnRowMapperTests { } @Test // SPR-16483 - public void useCustomConversionService() throws SQLException { + void useCustomConversionService() throws SQLException { Timestamp timestamp = new Timestamp(0); DefaultConversionService myConversionService = new DefaultConversionService(); @@ -85,7 +85,7 @@ class SingleColumnRowMapperTests { } @Test // SPR-16483 - public void doesNotUseConversionService() throws SQLException { + void doesNotUseConversionService() throws SQLException { SingleColumnRowMapper rowMapper = SingleColumnRowMapper.newInstance(LocalDateTime.class, null); 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 589d6cd700f..0033a8caf63 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 @@ -56,19 +56,19 @@ class StatementCreatorUtilsTests { @Test - void testSetParameterValueWithNullAndType() throws SQLException { + void setParameterValueWithNullAndType() throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null); verify(preparedStatement).setNull(1, Types.VARCHAR); } @Test - void testSetParameterValueWithNullAndTypeName() throws SQLException { + void setParameterValueWithNullAndTypeName() throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, "mytype", null); verify(preparedStatement).setNull(1, Types.VARCHAR, "mytype"); } @Test - void testSetParameterValueWithNullAndUnknownType() throws SQLException { + void setParameterValueWithNullAndUnknownType() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; Connection con = mock(); DatabaseMetaData dbmd = mock(); @@ -82,7 +82,7 @@ class StatementCreatorUtilsTests { } @Test - void testSetParameterValueWithNullAndUnknownTypeOnInformix() throws SQLException { + void setParameterValueWithNullAndUnknownTypeOnInformix() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; Connection con = mock(); DatabaseMetaData dbmd = mock(); @@ -98,7 +98,7 @@ class StatementCreatorUtilsTests { } @Test - void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException { + void setParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; Connection con = mock(); DatabaseMetaData dbmd = mock(); @@ -114,7 +114,7 @@ class StatementCreatorUtilsTests { } @Test - void testSetParameterValueWithNullAndGetParameterTypeWorking() throws SQLException { + void setParameterValueWithNullAndGetParameterTypeWorking() throws SQLException { ParameterMetaData pmd = mock(); given(preparedStatement.getParameterMetaData()).willReturn(pmd); given(pmd.getParameterType(1)).willReturn(Types.SMALLINT); @@ -125,94 +125,95 @@ class StatementCreatorUtilsTests { } @Test - void testSetParameterValueWithString() throws SQLException { + void setParameterValueWithString() throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, "test"); verify(preparedStatement).setString(1, "test"); } @Test - void testSetParameterValueWithStringAndSpecialType() throws SQLException { + void setParameterValueWithStringAndSpecialType() throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.CHAR, "test"); verify(preparedStatement).setObject(1, "test", Types.CHAR); } - @Test public void testSetParameterValueWithStringAndUnknownType() throws SQLException { + @Test + void setParameterValueWithStringAndUnknownType() throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, "test"); verify(preparedStatement).setString(1, "test"); } @Test - void testSetParameterValueWithSqlDate() throws SQLException { + void setParameterValueWithSqlDate() throws SQLException { java.sql.Date date = new java.sql.Date(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, date); verify(preparedStatement).setDate(1, date); } @Test - void testSetParameterValueWithDateAndUtilDate() throws SQLException { + void setParameterValueWithDateAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, date); verify(preparedStatement).setDate(1, new java.sql.Date(1000)); } @Test - void testSetParameterValueWithDateAndCalendar() throws SQLException { + void setParameterValueWithDateAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, cal); verify(preparedStatement).setDate(1, new java.sql.Date(cal.getTime().getTime()), cal); } @Test - void testSetParameterValueWithSqlTime() throws SQLException { + void setParameterValueWithSqlTime() throws SQLException { java.sql.Time time = new java.sql.Time(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, time); verify(preparedStatement).setTime(1, time); } @Test - void testSetParameterValueWithTimeAndUtilDate() throws SQLException { + void setParameterValueWithTimeAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, date); verify(preparedStatement).setTime(1, new java.sql.Time(1000)); } @Test - void testSetParameterValueWithTimeAndCalendar() throws SQLException { + void setParameterValueWithTimeAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, cal); verify(preparedStatement).setTime(1, new java.sql.Time(cal.getTime().getTime()), cal); } @Test - void testSetParameterValueWithSqlTimestamp() throws SQLException { + void setParameterValueWithSqlTimestamp() throws SQLException { java.sql.Timestamp timestamp = new java.sql.Timestamp(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, timestamp); verify(preparedStatement).setTimestamp(1, timestamp); } @Test - void testSetParameterValueWithTimestampAndUtilDate() throws SQLException { + void setParameterValueWithTimestampAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, date); verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000)); } @Test - void testSetParameterValueWithTimestampAndCalendar() throws SQLException { + void setParameterValueWithTimestampAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, cal); verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); } @Test - void testSetParameterValueWithDateAndUnknownType() throws SQLException { + void setParameterValueWithDateAndUnknownType() throws SQLException { java.util.Date date = new java.util.Date(1000); StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, date); verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000)); } @Test - void testSetParameterValueWithCalendarAndUnknownType() throws SQLException { + void setParameterValueWithCalendarAndUnknownType() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, cal); verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); @@ -220,7 +221,7 @@ class StatementCreatorUtilsTests { @ParameterizedTest(name = "{0} -> {1}") @MethodSource("javaTimeTypes") - public void testSetParameterValueWithJavaTimeTypes(Object o, int sqlType) throws SQLException { + void setParameterValueWithJavaTimeTypes(Object o, int sqlType) throws SQLException { StatementCreatorUtils.setParameterValue(preparedStatement, 1, sqlType, o); verify(preparedStatement).setObject(1, o, sqlType); } @@ -247,7 +248,7 @@ class StatementCreatorUtilsTests { } @Test // gh-30556 - public void testSetParameterValueWithOffsetDateTimeAndNotSupported() throws SQLException { + void setParameterValueWithOffsetDateTimeAndNotSupported() throws SQLException { OffsetDateTime time = OffsetDateTime.now(); doThrow(new SQLFeatureNotSupportedException()).when(preparedStatement).setObject(1, time, Types.TIMESTAMP_WITH_TIMEZONE); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP_WITH_TIMEZONE, time); @@ -256,7 +257,7 @@ class StatementCreatorUtilsTests { } @Test // gh-30556 - public void testSetParameterValueWithNullAndNotSupported() throws SQLException { + void setParameterValueWithNullAndNotSupported() throws SQLException { doThrow(new SQLFeatureNotSupportedException()).when(preparedStatement).setNull(1, Types.TIMESTAMP_WITH_TIMEZONE); StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP_WITH_TIMEZONE, null); verify(preparedStatement).setNull(1, Types.TIMESTAMP_WITH_TIMEZONE); @@ -264,7 +265,7 @@ class StatementCreatorUtilsTests { } @Test // SPR-8571 - public void testSetParameterValueWithStringAndVendorSpecificType() throws SQLException { + void setParameterValueWithStringAndVendorSpecificType() throws SQLException { Connection con = mock(); DatabaseMetaData dbmd = mock(); given(preparedStatement.getConnection()).willReturn(con); @@ -275,7 +276,7 @@ class StatementCreatorUtilsTests { } @Test // SPR-8571 - public void testSetParameterValueWithNullAndVendorSpecificType() throws SQLException { + void setParameterValueWithNullAndVendorSpecificType() throws SQLException { StatementCreatorUtils.shouldIgnoreGetParameterType = true; Connection con = mock(); DatabaseMetaData dbmd = mock(); 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 71eb1aa026e..e2f6387965e 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 @@ -110,24 +110,24 @@ class NamedParameterJdbcTemplateTests { @Test - void testNullDataSourceProvidedToCtor() { + void nullDataSourceProvidedToCtor() { assertThatIllegalArgumentException().isThrownBy(() -> new NamedParameterJdbcTemplate((DataSource) null)); } @Test - void testNullJdbcTemplateProvidedToCtor() { + void nullJdbcTemplateProvidedToCtor() { assertThatIllegalArgumentException().isThrownBy(() -> new NamedParameterJdbcTemplate((JdbcOperations) null)); } @Test - void testTemplateConfiguration() { + void templateConfiguration() { assertThat(namedParameterTemplate.getJdbcTemplate().getDataSource()).isSameAs(dataSource); } @Test - void testExecute() throws SQLException { + void execute() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); params.put("perfId", 1); @@ -149,7 +149,7 @@ class NamedParameterJdbcTemplateTests { @Disabled("SPR-16340") @Test - void testExecuteArray() throws SQLException { + void executeArray() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); List typeIds = Arrays.asList(1, 2, 3); @@ -174,7 +174,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testExecuteWithTypedParameters() throws SQLException { + void executeWithTypedParameters() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1)); @@ -195,7 +195,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testExecuteNoParameters() throws SQLException { + void executeNoParameters() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); Object result = namedParameterTemplate.execute(SELECT_NO_PARAMETERS, @@ -212,7 +212,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithResultSetExtractor() throws SQLException { + void queryWithResultSetExtractor() throws SQLException { given(resultSet.next()).willReturn(true); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -239,7 +239,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithResultSetExtractorNoParameters() throws SQLException { + void queryWithResultSetExtractorNoParameters() throws SQLException { given(resultSet.next()).willReturn(true); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -262,7 +262,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithRowCallbackHandler() throws SQLException { + void queryWithRowCallbackHandler() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -289,7 +289,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithRowCallbackHandlerNoParameters() throws SQLException { + void queryWithRowCallbackHandlerNoParameters() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -312,7 +312,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithRowMapper() throws SQLException { + void queryWithRowMapper() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -339,7 +339,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryWithRowMapperNoParameters() throws SQLException { + void queryWithRowMapperNoParameters() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -362,7 +362,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryForObjectWithRowMapper() throws SQLException { + void queryForObjectWithRowMapper() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -389,7 +389,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testQueryForStreamWithRowMapper() throws SQLException { + void queryForStreamWithRowMapper() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -422,7 +422,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testUpdate() throws SQLException { + void update() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); params.put("perfId", 1); @@ -438,7 +438,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testUpdateWithTypedParameters() throws SQLException { + void updateWithTypedParameters() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1)); @@ -454,7 +454,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testBatchUpdateWithPlainMap() throws Exception { + void batchUpdateWithPlainMap() throws Exception { @SuppressWarnings("unchecked") final Map[] ids = new Map[2]; ids[0] = Collections.singletonMap("id", 100); @@ -479,7 +479,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testBatchUpdateWithEmptyMap() { + void batchUpdateWithEmptyMap() { @SuppressWarnings("unchecked") final Map[] ids = new Map[0]; namedParameterTemplate = new NamedParameterJdbcTemplate(new JdbcTemplate(dataSource, false)); @@ -490,7 +490,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testBatchUpdateWithSqlParameterSource() throws Exception { + void batchUpdateWithSqlParameterSource() throws Exception { SqlParameterSource[] ids = new SqlParameterSource[2]; ids[0] = new MapSqlParameterSource("id", 100); ids[1] = new MapSqlParameterSource("id", 200); @@ -514,7 +514,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testBatchUpdateWithInClause() throws Exception { + void batchUpdateWithInClause() throws Exception { @SuppressWarnings("unchecked") Map[] parameters = new Map[3]; parameters[0] = Collections.singletonMap("ids", Arrays.asList(1, 2)); @@ -554,7 +554,7 @@ class NamedParameterJdbcTemplateTests { } @Test - void testBatchUpdateWithSqlParameterSourcePlusTypeInfo() throws Exception { + void batchUpdateWithSqlParameterSourcePlusTypeInfo() throws Exception { SqlParameterSource[] ids = new SqlParameterSource[3]; ids[0] = new MapSqlParameterSource().addValue("id", null, Types.NULL); ids[1] = new MapSqlParameterSource().addValue("id", 100, Types.NUMERIC); 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 3d58bc14c16..398d891a8c8 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 @@ -77,7 +77,7 @@ class NamedParameterQueryTests { @Test - void testQueryForListWithParamMap() throws Exception { + void queryForListWithParamMap() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getObject(1)).willReturn(11, 12); @@ -96,7 +96,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForListWithParamMapAndEmptyResult() throws Exception { + void queryForListWithParamMapAndEmptyResult() throws Exception { given(resultSet.next()).willReturn(false); MapSqlParameterSource params = new MapSqlParameterSource(); @@ -110,7 +110,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForListWithParamMapAndSingleRowAndColumn() throws Exception { + void queryForListWithParamMapAndSingleRowAndColumn() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getObject(1)).willReturn(11); @@ -127,7 +127,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForListWithParamMapAndIntegerElementAndSingleRowAndColumn() throws Exception { + void queryForListWithParamMapAndIntegerElementAndSingleRowAndColumn() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(11); @@ -143,7 +143,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForMapWithParamMapAndSingleRowAndColumn() throws Exception { + void queryForMapWithParamMapAndSingleRowAndColumn() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getObject(1)).willReturn(11); @@ -158,7 +158,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForObjectWithParamMapAndRowMapper() throws Exception { + void queryForObjectWithParamMapAndRowMapper() throws Exception { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -173,7 +173,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForObjectWithMapAndInteger() throws Exception { + void queryForObjectWithMapAndInteger() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -189,7 +189,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForObjectWithParamMapAndInteger() throws Exception { + void queryForObjectWithParamMapAndInteger() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -205,7 +205,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForObjectWithParamMapAndList() throws Exception { + void queryForObjectWithParamMapAndList() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -220,7 +220,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForObjectWithParamMapAndListOfExpressionLists() throws Exception { + void queryForObjectWithParamMapAndListOfExpressionLists() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -239,7 +239,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForIntWithParamMap() throws Exception { + void queryForIntWithParamMap() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(22); @@ -254,7 +254,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForLongWithParamBean() throws Exception { + void queryForLongWithParamBean() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getLong(1)).willReturn(87L); @@ -268,7 +268,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForLongWithParamBeanWithCollection() throws Exception { + void queryForLongWithParamBeanWithCollection() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getLong(1)).willReturn(87L); @@ -283,7 +283,7 @@ class NamedParameterQueryTests { } @Test - void testQueryForLongWithParamRecord() throws Exception { + void queryForLongWithParamRecord() throws Exception { given(resultSet.getMetaData()).willReturn(resultSetMetaData); given(resultSet.next()).willReturn(true, false); given(resultSet.getLong(1)).willReturn(87L); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java index 4c6811301d3..8a2a942367a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java @@ -145,7 +145,7 @@ class NamedParameterUtilsTests { } @Test - void testParseSqlStatementWithStringContainingQuotes() { + void parseSqlStatementWithStringContainingQuotes() { String expectedSql = "select 'first name' from artists where id = ? and quote = 'exsqueeze me?'"; String sql = "select 'first name' from artists where id = :id and quote = 'exsqueeze me?'"; ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); 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 7532b680c33..cb2cb8ae545 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 @@ -69,7 +69,7 @@ class CallMetaDataContextTests { @Test - void testMatchParameterValuesAndSqlInOutParameters() throws Exception { + void matchParameterValuesAndSqlInOutParameters() throws Exception { final String TABLE = "customers"; final String USER = "me"; given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); 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 b3b07324e84..2e7660b6560 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 @@ -63,7 +63,7 @@ class TableMetaDataContextTests { @Test - void testMatchInParametersAndSqlTypeInfoWrapping() throws Exception { + void matchInParametersAndSqlTypeInfoWrapping() throws Exception { final String TABLE = "customers"; final String USER = "me"; @@ -119,7 +119,7 @@ class TableMetaDataContextTests { } @Test - void testTableWithSingleColumnGeneratedKey() throws Exception { + void tableWithSingleColumnGeneratedKey() throws Exception { final String TABLE = "customers"; final String USER = "me"; 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 debb567875e..628913dcb6c 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 @@ import static org.mockito.Mockito.mock; class JdbcDaoSupportTests { @Test - void testJdbcDaoSupportWithDataSource() { + void jdbcDaoSupportWithDataSource() { DataSource ds = mock(); final List test = new ArrayList<>(); JdbcDaoSupport dao = new JdbcDaoSupport() { @@ -53,7 +53,7 @@ class JdbcDaoSupportTests { } @Test - void testJdbcDaoSupportWithJdbcTemplate() { + void jdbcDaoSupportWithJdbcTemplate() { JdbcTemplate template = new JdbcTemplate(); final List test = new ArrayList<>(); JdbcDaoSupport dao = new JdbcDaoSupport() { 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 59ecbe443b7..78553e64de7 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 @@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify; class LobSupportTests { @Test - void testCreatingPreparedStatementCallback() throws SQLException { + void creatingPreparedStatementCallback() throws SQLException { LobHandler handler = mock(); LobCreator creator = mock(); PreparedStatement ps = mock(); @@ -70,7 +70,7 @@ class LobSupportTests { } @Test - void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException { + void abstractLobStreamingResultSetExtractorNoRows() throws SQLException { ResultSet rs = mock(); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class) @@ -79,7 +79,7 @@ class LobSupportTests { } @Test - void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException { + void abstractLobStreamingResultSetExtractorOneRow() throws SQLException { ResultSet rs = mock(); given(rs.next()).willReturn(true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); @@ -88,7 +88,7 @@ class LobSupportTests { } @Test - void testAbstractLobStreamingResultSetExtractorMultipleRows() throws SQLException { + void abstractLobStreamingResultSetExtractorMultipleRows() throws SQLException { ResultSet rs = mock(); given(rs.next()).willReturn(true, true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); @@ -98,7 +98,7 @@ class LobSupportTests { } @Test - void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException { + void abstractLobStreamingResultSetExtractorCorrectException() throws SQLException { ResultSet rs = mock(); given(rs.next()).willReturn(true); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(true); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index d3943090ced..278c07460d9 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -140,7 +140,7 @@ class SqlLobValueTests { } @Test - void testOtherConstructors() throws SQLException { + void otherConstructors() throws SQLException { // a bit BS, but we need to test them, as long as they don't throw exceptions SqlLobValue lob = new SqlLobValue("bla"); @@ -174,7 +174,7 @@ class SqlLobValueTests { } @Test - void testCorrectCleanup() throws SQLException { + void correctCleanup() throws SQLException { SqlLobValue lob = new SqlLobValue("Bla", handler); lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); lob.cleanup(); @@ -183,7 +183,7 @@ class SqlLobValueTests { } @Test - void testOtherSqlType() { + void otherSqlType() { SqlLobValue lob = new SqlLobValue("Bla", handler); assertThatIllegalArgumentException().isThrownBy(() -> lob.setTypeValue(preparedStatement, 1, Types.SMALLINT, "test")); 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 8c5b3b7c7bb..d2689ca030f 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 @@ -98,35 +98,35 @@ public class DataSourceTransactionManagerTests { @Test void transactionCommitWithAutoCommitTrue() throws Exception { - testTransactionCommitRestoringAutoCommit(true, false, false); + assertTransactionCommitRestoringAutoCommit(true, false, false); } @Test void transactionCommitWithAutoCommitFalse() throws Exception { - testTransactionCommitRestoringAutoCommit(false, false, false); + assertTransactionCommitRestoringAutoCommit(false, false, false); } @Test void transactionCommitWithAutoCommitTrueAndLazyConnection() throws Exception { - testTransactionCommitRestoringAutoCommit(true, true, false); + assertTransactionCommitRestoringAutoCommit(true, true, false); } @Test void transactionCommitWithAutoCommitFalseAndLazyConnection() throws Exception { - testTransactionCommitRestoringAutoCommit(false, true, false); + assertTransactionCommitRestoringAutoCommit(false, true, false); } @Test void transactionCommitWithAutoCommitTrueAndLazyConnectionAndStatementCreated() throws Exception { - testTransactionCommitRestoringAutoCommit(true, true, true); + assertTransactionCommitRestoringAutoCommit(true, true, true); } @Test void transactionCommitWithAutoCommitFalseAndLazyConnectionAndStatementCreated() throws Exception { - testTransactionCommitRestoringAutoCommit(false, true, true); + assertTransactionCommitRestoringAutoCommit(false, true, true); } - private void testTransactionCommitRestoringAutoCommit( + private void assertTransactionCommitRestoringAutoCommit( boolean autoCommit, boolean lazyConnection, boolean createStatement) throws Exception { given(con.getAutoCommit()).willReturn(autoCommit); @@ -182,35 +182,35 @@ public class DataSourceTransactionManagerTests { @Test void transactionRollbackWithAutoCommitTrue() throws Exception { - testTransactionRollbackRestoringAutoCommit(true, false, false); + assertTransactionRollbackRestoringAutoCommit(true, false, false); } @Test void transactionRollbackWithAutoCommitFalse() throws Exception { - testTransactionRollbackRestoringAutoCommit(false, false, false); + assertTransactionRollbackRestoringAutoCommit(false, false, false); } @Test void transactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { - testTransactionRollbackRestoringAutoCommit(true, true, false); + assertTransactionRollbackRestoringAutoCommit(true, true, false); } @Test void transactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { - testTransactionRollbackRestoringAutoCommit(false, true, false); + assertTransactionRollbackRestoringAutoCommit(false, true, false); } @Test void transactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { - testTransactionRollbackRestoringAutoCommit(true, true, true); + assertTransactionRollbackRestoringAutoCommit(true, true, true); } @Test void transactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { - testTransactionRollbackRestoringAutoCommit(false, true, true); + assertTransactionRollbackRestoringAutoCommit(false, true, true); } - private void testTransactionRollbackRestoringAutoCommit( + private void assertTransactionRollbackRestoringAutoCommit( boolean autoCommit, boolean lazyConnection, boolean createStatement) throws Exception { given(con.getAutoCommit()).willReturn(autoCommit); @@ -294,15 +294,15 @@ public class DataSourceTransactionManagerTests { @Test void participatingTransactionWithRollbackOnly() throws Exception { - testParticipatingTransactionWithRollbackOnly(false); + assertParticipatingTransactionWithRollbackOnly(false); } @Test void participatingTransactionWithRollbackOnlyAndFailEarly() throws Exception { - testParticipatingTransactionWithRollbackOnly(true); + assertParticipatingTransactionWithRollbackOnly(true); } - private void testParticipatingTransactionWithRollbackOnly(boolean failEarly) throws Exception { + private void assertParticipatingTransactionWithRollbackOnly(boolean failEarly) throws Exception { given(con.isReadOnly()).willReturn(false); if (failEarly) { tm.setFailEarlyOnGlobalRollbackOnly(true); @@ -761,7 +761,7 @@ public class DataSourceTransactionManagerTests { given(con.getAutoCommit()).willReturn(true); given(con.isReadOnly()).willReturn(false); - testTransactionReadOnly(TransactionDefinition.ISOLATION_REPEATABLE_READ, false); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_REPEATABLE_READ, false); InOrder ordered = inOrder(con); ordered.verify(con).isReadOnly(); @@ -783,7 +783,7 @@ public class DataSourceTransactionManagerTests { given(con.getAutoCommit()).willReturn(true); given(con.isReadOnly()).willReturn(true); - testTransactionReadOnly(TransactionDefinition.ISOLATION_DEFAULT, false); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_DEFAULT, false); InOrder ordered = inOrder(con); ordered.verify(con).isReadOnly(); @@ -804,7 +804,7 @@ public class DataSourceTransactionManagerTests { Statement stmt = mock(); given(con.createStatement()).willReturn(stmt); - testTransactionReadOnly(TransactionDefinition.ISOLATION_DEFAULT, false); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_DEFAULT, false); InOrder ordered = inOrder(con, stmt); ordered.verify(con).isReadOnly(); @@ -833,7 +833,7 @@ public class DataSourceTransactionManagerTests { try (Connection con = dsProxy.getConnection()) { assertThat(con.isReadOnly()).isFalse(); } - testTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, true); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, true); InOrder ordered = inOrder(con); ordered.verify(con).setReadOnly(true); @@ -860,7 +860,7 @@ public class DataSourceTransactionManagerTests { try (Connection con = dsProxy.getConnection()) { assertThat(con.isReadOnly()).isFalse(); } - testTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, false); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, false); verifyNoMoreInteractions(con); } @@ -877,7 +877,7 @@ public class DataSourceTransactionManagerTests { try (Connection con = dsProxy.getConnection()) { assertThat(con.isReadOnly()).isTrue(); } - testTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, true); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, true); InOrder ordered = inOrder(con); ordered.verify(con).setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); @@ -900,12 +900,12 @@ public class DataSourceTransactionManagerTests { try (Connection con = dsProxy.getConnection()) { assertThat(con.isReadOnly()).isTrue(); } - testTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, false); + assertTransactionReadOnly(TransactionDefinition.ISOLATION_SERIALIZABLE, false); verifyNoMoreInteractions(con); } - private void testTransactionReadOnly(int isolationLevel, boolean withStatement) { + private void assertTransactionReadOnly(int isolationLevel, boolean withStatement) { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt.setIsolationLevel(isolationLevel); @@ -942,7 +942,7 @@ public class DataSourceTransactionManagerTests { @ParameterizedTest(name = "transaction with {0} second timeout") @ValueSource(ints = {1, 10}) @EnabledForTestGroups(LONG_RUNNING) - public void transactionWithTimeout(int timeout) throws Exception { + protected void transactionWithTimeout(int timeout) throws Exception { PreparedStatement ps = mock(); given(con.getAutoCommit()).willReturn(true); given(con.prepareStatement("some SQL statement")).willReturn(ps); @@ -1318,15 +1318,15 @@ public class DataSourceTransactionManagerTests { @Test void existingTransactionWithPropagationNested() throws Exception { - testExistingTransactionWithPropagationNested(1); + assertExistingTransactionWithPropagationNested(1); } @Test void existingTransactionWithPropagationNestedTwice() throws Exception { - testExistingTransactionWithPropagationNested(2); + assertExistingTransactionWithPropagationNested(2); } - private void testExistingTransactionWithPropagationNested(int count) throws Exception { + private void assertExistingTransactionWithPropagationNested(int count) throws Exception { DatabaseMetaData md = mock(); Savepoint sp = mock(); 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 d2d93704bf2..16a1a3490f3 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 @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; class DataSourceUtilsTests { @Test - void testConnectionNotAcquiredExceptionIsPropagated() throws SQLException { + void connectionNotAcquiredExceptionIsPropagated() throws SQLException { DataSource dataSource = mock(); when(dataSource.getConnection()).thenReturn(null); assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) @@ -47,7 +47,7 @@ class DataSourceUtilsTests { } @Test - void testConnectionSQLExceptionIsPropagated() throws SQLException { + void connectionSQLExceptionIsPropagated() throws SQLException { DataSource dataSource = mock(); when(dataSource.getConnection()).thenThrow(new SQLException("my dummy exception")); assertThatThrownBy(() -> DataSourceUtils.getConnection(dataSource)) 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 3e1054e799b..b6db237bc77 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 @@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; class UserCredentialsDataSourceAdapterTests { @Test - void testStaticCredentials() throws SQLException { + void staticCredentials() throws SQLException { DataSource dataSource = mock(); Connection connection = mock(); given(dataSource.getConnection("user", "pw")).willReturn(connection); @@ -47,7 +47,7 @@ class UserCredentialsDataSourceAdapterTests { } @Test - void testNoCredentials() throws SQLException { + void noCredentials() throws SQLException { DataSource dataSource = mock(); Connection connection = mock(); given(dataSource.getConnection()).willReturn(connection); @@ -57,7 +57,7 @@ class UserCredentialsDataSourceAdapterTests { } @Test - void testThreadBoundCredentials() throws SQLException { + void threadBoundCredentials() throws SQLException { DataSource dataSource = mock(); Connection connection = mock(); given(dataSource.getConnection("user", "pw")).willReturn(connection); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java index 77715158d6a..a4d614cf942 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java @@ -40,7 +40,7 @@ class EmbeddedDatabaseFactoryBeanTests { } @Test - void testFactoryBeanLifecycle() { + void factoryBeanLifecycle() { EmbeddedDatabaseFactoryBean bean = new EmbeddedDatabaseFactoryBean(); ResourceDatabasePopulator populator = new ResourceDatabasePopulator(resource("db-schema.sql"), resource("db-test-data.sql")); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java index e658a47b43b..f62315fd6f3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java @@ -37,7 +37,7 @@ class EmbeddedDatabaseFactoryTests { @Test - void testGetDataSource() { + void getDataSource() { StubDatabasePopulator populator = new StubDatabasePopulator(); factory.setDatabasePopulator(populator); EmbeddedDatabase db = factory.getDatabase(); 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 aae8a2a62ab..6a4983b01d5 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 @@ -40,7 +40,7 @@ class BeanFactoryDataSourceLookupTests { @Test - void testLookupSunnyDay() { + void lookupSunnyDay() { BeanFactory beanFactory = mock(); StubDataSource expectedDataSource = new StubDataSource(); @@ -55,7 +55,7 @@ class BeanFactoryDataSourceLookupTests { } @Test - void testLookupWhereBeanFactoryYieldsNonDataSourceType() { + void lookupWhereBeanFactoryYieldsNonDataSourceType() { final BeanFactory beanFactory = mock(); given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willThrow( @@ -68,7 +68,7 @@ class BeanFactoryDataSourceLookupTests { } @Test - void testLookupWhereBeanFactoryHasNotBeenSupplied() { + void lookupWhereBeanFactoryHasNotBeenSupplied() { BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(); assertThatIllegalStateException().isThrownBy(() -> lookup.getDataSource(DATASOURCE_BEAN_NAME)); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java index 156288156e7..8f2b9b0bf03 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java @@ -33,7 +33,7 @@ class JndiDataSourceLookupTests { private static final String DATA_SOURCE_NAME = "Love is like a stove, burns you when it's hot"; @Test - void testSunnyDay() { + void sunnyDay() { final DataSource expectedDataSource = new StubDataSource(); JndiDataSourceLookup lookup = new JndiDataSourceLookup() { @Override @@ -48,7 +48,7 @@ class JndiDataSourceLookupTests { } @Test - void testNoDataSourceAtJndiLocation() { + void noDataSourceAtJndiLocation() { JndiDataSourceLookup lookup = new JndiDataSourceLookup() { @Override protected T lookup(String jndiName, Class requiredType) throws NamingException { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java index e2e8cd2b932..f31d1e74b8f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java @@ -37,7 +37,7 @@ class MapDataSourceLookupTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void getDataSourcesReturnsUnmodifiableMap() { + void getDataSourcesReturnsUnmodifiableMap() { MapDataSourceLookup lookup = new MapDataSourceLookup(); Map dataSources = lookup.getDataSources(); @@ -86,7 +86,7 @@ class MapDataSourceLookupTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void getDataSourceWhereSuppliedMapHasNonDataSourceTypeUnderSpecifiedKey() { + void getDataSourceWhereSuppliedMapHasNonDataSourceTypeUnderSpecifiedKey() { Map dataSources = new HashMap(); dataSources.put(DATA_SOURCE_NAME, new Object()); MapDataSourceLookup lookup = new MapDataSourceLookup(dataSources); 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 a93a51a415d..f6231491e99 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 @@ -40,12 +40,12 @@ import static org.mockito.Mockito.verify; class BatchSqlUpdateTests { @Test - void testBatchUpdateWithExplicitFlush() throws Exception { + void batchUpdateWithExplicitFlush() throws Exception { doTestBatchUpdate(false); } @Test - void testBatchUpdateWithFlushThroughBatchSize() throws Exception { + void batchUpdateWithFlushThroughBatchSize() throws Exception { doTestBatchUpdate(true); } 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 ce8a9602f3e..8c24fa2af93 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 @@ -71,19 +71,19 @@ class GenericSqlQueryTests { } @Test - void testCustomerQueryWithPlaceholders() throws SQLException { + void customerQueryWithPlaceholders() throws SQLException { SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithPlaceholders"); doTestCustomerQuery(query, false); } @Test - void testCustomerQueryWithNamedParameters() throws SQLException { + void customerQueryWithNamedParameters() throws SQLException { SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithNamedParameters"); doTestCustomerQuery(query, true); } @Test - void testCustomerQueryWithRowMapperInstance() throws SQLException { + void customerQueryWithRowMapperInstance() throws SQLException { SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithRowMapperBean"); doTestCustomerQuery(query, true); } 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 086e8a7aa56..5d9bd616216 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 @@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify; class GenericStoredProcedureTests { @Test - void testAddInvoices() throws Exception { + void addInvoices() throws Exception { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(bf).loadBeanDefinitions( new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml")); 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 86d6982e720..5aa21475e10 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 @@ -103,7 +103,7 @@ class SqlQueryTests { } @Test - void testQueryWithoutParams() throws SQLException { + void queryWithoutParams() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(1); @@ -128,7 +128,7 @@ class SqlQueryTests { } @Test - void testStreamWithoutParams() throws SQLException { + void streamWithoutParams() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt(1)).willReturn(1); @@ -154,7 +154,7 @@ class SqlQueryTests { } @Test - void testStreamByNamedParam() throws SQLException { + void streamByNamedParam() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -194,7 +194,7 @@ class SqlQueryTests { } @Test - void testQueryWithoutEnoughParams() { + void queryWithoutEnoughParams() { MappingSqlQuery query = new MappingSqlQuery<>() { @Override protected Integer mapRow(ResultSet rs, int rownum) throws SQLException { @@ -212,7 +212,7 @@ class SqlQueryTests { } @Test - void testQueryWithMissingMapParams() { + void queryWithMissingMapParams() { MappingSqlQuery query = new MappingSqlQuery<>() { @Override protected Integer mapRow(ResultSet rs, int rownum) throws SQLException { @@ -230,7 +230,7 @@ class SqlQueryTests { } @Test - void testStringQueryWithResults() throws Exception { + void stringQueryWithResults() throws Exception { String[] dbResults = new String[] { "alpha", "beta", "charlie" }; given(resultSet.next()).willReturn(true, true, true, false); given(resultSet.getString(1)).willReturn(dbResults[0], dbResults[1], dbResults[2]); @@ -244,7 +244,7 @@ class SqlQueryTests { } @Test - void testStringQueryWithoutResults() throws SQLException { + void stringQueryWithoutResults() throws SQLException { given(resultSet.next()).willReturn(false); StringQuery query = new StringQuery(dataSource, SELECT_FORENAME_EMPTY); String[] results = query.run(); @@ -256,7 +256,7 @@ class SqlQueryTests { } @Test - void testFindCustomerIntInt() throws SQLException { + void findCustomerIntInt() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -297,7 +297,7 @@ class SqlQueryTests { } @Test - void testFindCustomerString() throws SQLException { + void findCustomerString() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -336,7 +336,7 @@ class SqlQueryTests { } @Test - void testFindCustomerMixed() throws SQLException { + void findCustomerMixed() throws SQLException { reset(connection); PreparedStatement preparedStatement2 = mock(); ResultSet resultSet2 = mock(); @@ -390,7 +390,7 @@ class SqlQueryTests { } @Test - void testFindTooManyCustomers() throws SQLException { + void findTooManyCustomers() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(resultSet.getString("forename")).willReturn("rod", "rod"); @@ -427,7 +427,7 @@ class SqlQueryTests { } @Test - void testListCustomersIntInt() throws SQLException { + void listCustomersIntInt() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(resultSet.getString("forename")).willReturn("rod", "dave"); @@ -464,7 +464,7 @@ class SqlQueryTests { } @Test - void testListCustomersString() throws SQLException { + void listCustomersString() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(resultSet.getString("forename")).willReturn("rod", "dave"); @@ -499,7 +499,7 @@ class SqlQueryTests { } @Test - void testFancyCustomerQuery() throws SQLException { + void fancyCustomerQuery() throws SQLException { given(resultSet.next()).willReturn(true, false); given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); @@ -541,7 +541,7 @@ class SqlQueryTests { } @Test - void testUnnamedParameterDeclarationWithNamedParameterQuery() { + void unnamedParameterDeclarationWithNamedParameterQuery() { class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { @@ -573,13 +573,13 @@ class SqlQueryTests { } @Test - void testNamedParameterCustomerQueryWithUnnamedDeclarations() + void namedParameterCustomerQueryWithUnnamedDeclarations() throws SQLException { doTestNamedParameterCustomerQuery(false); } @Test - void testNamedParameterCustomerQueryWithNamedDeclarations() + void namedParameterCustomerQueryWithNamedDeclarations() throws SQLException { doTestNamedParameterCustomerQuery(true); } @@ -637,7 +637,7 @@ class SqlQueryTests { } @Test - void testNamedParameterInListQuery() throws SQLException { + void namedParameterInListQuery() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(resultSet.getString("forename")).willReturn("rod", "juergen"); @@ -690,7 +690,7 @@ class SqlQueryTests { } @Test - void testNamedParameterQueryReusingParameter() throws SQLException { + void namedParameterQueryReusingParameter() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(resultSet.getString("forename")).willReturn("rod", "juergen"); @@ -741,7 +741,7 @@ class SqlQueryTests { } @Test - void testNamedParameterUsingInvalidQuestionMarkPlaceHolders() + void namedParameterUsingInvalidQuestionMarkPlaceHolders() throws SQLException { given( connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_REUSED_1, @@ -777,7 +777,7 @@ class SqlQueryTests { } @Test - void testUpdateCustomers() throws SQLException { + void updateCustomers() throws SQLException { given(resultSet.next()).willReturn(true, true, false); given(resultSet.getInt("id")).willReturn(1, 2); given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID, 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 178957cf7c7..7afc4f5abe3 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 @@ -95,7 +95,7 @@ class SqlUpdateTests { @Test - void testUpdate() throws SQLException { + void update() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); @@ -106,7 +106,7 @@ class SqlUpdateTests { } @Test - void testUpdateInt() throws SQLException { + void updateInt() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE_INT)).willReturn(preparedStatement); @@ -118,7 +118,7 @@ class SqlUpdateTests { } @Test - void testUpdateIntInt() throws SQLException { + void updateIntInt() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE_INT_INT)).willReturn(preparedStatement); @@ -131,12 +131,12 @@ class SqlUpdateTests { } @Test - void testNamedParameterUpdateWithUnnamedDeclarations() throws SQLException { + void namedParameterUpdateWithUnnamedDeclarations() throws SQLException { doTestNamedParameterUpdate(false); } @Test - void testNamedParameterUpdateWithNamedDeclarations() throws SQLException { + void namedParameterUpdateWithNamedDeclarations() throws SQLException { doTestNamedParameterUpdate(true); } @@ -176,7 +176,7 @@ class SqlUpdateTests { } @Test - void testUpdateString() throws SQLException { + void updateString() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE_STRING)).willReturn(preparedStatement); @@ -188,7 +188,7 @@ class SqlUpdateTests { } @Test - void testUpdateMixed() throws SQLException { + void updateMixed() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement); @@ -203,7 +203,7 @@ class SqlUpdateTests { } @Test - void testUpdateAndGeneratedKeys() throws SQLException { + void updateAndGeneratedKeys() throws SQLException { given(resultSetMetaData.getColumnCount()).willReturn(1); given(resultSetMetaData.getColumnLabel(1)).willReturn("1"); given(resultSet.getMetaData()).willReturn(resultSetMetaData); @@ -226,7 +226,7 @@ class SqlUpdateTests { } @Test - void testUpdateConstructor() throws SQLException { + void updateConstructor() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1); given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement); ConstructorUpdater pc = new ConstructorUpdater(); @@ -241,7 +241,7 @@ class SqlUpdateTests { } @Test - void testUnderMaxRows() throws SQLException { + void underMaxRows() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(3); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); @@ -252,7 +252,7 @@ class SqlUpdateTests { } @Test - void testMaxRows() throws SQLException { + void maxRows() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(5); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); @@ -263,7 +263,7 @@ class SqlUpdateTests { } @Test - void testOverMaxRows() throws SQLException { + void overMaxRows() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(8); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); @@ -274,7 +274,7 @@ class SqlUpdateTests { } @Test - void testRequiredRows() throws SQLException { + void requiredRows() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(3); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); @@ -285,7 +285,7 @@ class SqlUpdateTests { } @Test - void testNotRequiredRows() throws SQLException { + void notRequiredRows() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(2); given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); RequiredRowsUpdater pc = new RequiredRowsUpdater(); 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 bb516eec552..ab61eb71c26 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 @@ -90,7 +90,7 @@ class StoredProcedureTests { } @Test - void testNoSuchStoredProcedure() throws Exception { + void noSuchStoredProcedure() throws Exception { SQLException sqlException = new SQLException( "Syntax error or access violation exception", "42000"); given(callableStatement.execute()).willThrow(sqlException); @@ -115,7 +115,7 @@ class StoredProcedureTests { } @Test - void testAddInvoices() throws Exception { + void addInvoices() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(3)).willReturn(4); @@ -128,7 +128,7 @@ class StoredProcedureTests { } @Test - void testAddInvoicesUsingObjectArray() throws Exception { + void addInvoicesUsingObjectArray() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(3)).willReturn(5); @@ -141,7 +141,7 @@ class StoredProcedureTests { } @Test - void testAddInvoicesWithinTransaction() throws Exception { + void addInvoicesWithinTransaction() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(3)).willReturn(4); @@ -165,7 +165,7 @@ class StoredProcedureTests { * mechanism. */ @Test - void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() + void storedProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); @@ -201,7 +201,7 @@ class StoredProcedureTests { * Confirm our JdbcTemplate is used */ @Test - void testStoredProcedureConfiguredViaJdbcTemplate() throws Exception { + void storedProcedureConfiguredViaJdbcTemplate() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(2)).willReturn(4); @@ -215,7 +215,7 @@ class StoredProcedureTests { } @Test - void testNullArg() throws Exception { + void nullArg() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(connection.prepareCall("{call " + NullArg.SQL + "(?)}")).willReturn(callableStatement); @@ -225,7 +225,7 @@ class StoredProcedureTests { } @Test - void testUnnamedParameter() { + void unnamedParameter() { this.verifyClosedAfter = false; // Shouldn't succeed in creating stored procedure with unnamed parameter assertThatExceptionOfType(InvalidDataAccessApiUsageException.class) @@ -233,14 +233,14 @@ class StoredProcedureTests { } @Test - void testMissingParameter() { + void missingParameter() { this.verifyClosedAfter = false; MissingParameterStoredProcedure mp = new MissingParameterStoredProcedure(dataSource); assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(mp::execute); } @Test - void testStoredProcedureExceptionTranslator() throws Exception { + void storedProcedureExceptionTranslator() throws Exception { SQLException sqlException = new SQLException("Syntax error or access violation exception", "42000"); given(callableStatement.execute()).willThrow(sqlException); given(connection.prepareCall("{call " + StoredProcedureExceptionTranslator.SQL + "()}")).willReturn(callableStatement); @@ -249,7 +249,7 @@ class StoredProcedureTests { } @Test - void testStoredProcedureWithResultSet() throws Exception { + void storedProcedureWithResultSet() throws Exception { ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(callableStatement.execute()).willReturn(true); @@ -265,7 +265,7 @@ class StoredProcedureTests { @Test @SuppressWarnings("unchecked") - public void testStoredProcedureWithResultSetMapped() throws Exception { + void storedProcedureWithResultSetMapped() throws Exception { ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getString(2)).willReturn("Foo", "Bar"); @@ -284,7 +284,7 @@ class StoredProcedureTests { @Test @SuppressWarnings("unchecked") - public void testStoredProcedureWithUndeclaredResults() throws Exception { + void storedProcedureWithUndeclaredResults() throws Exception { ResultSet resultSet1 = mock(); given(resultSet1.next()).willReturn(true, true, false); given(resultSet1.getString(2)).willReturn("Foo", "Bar"); @@ -330,7 +330,7 @@ class StoredProcedureTests { } @Test - void testStoredProcedureSkippingResultsProcessing() throws Exception { + void storedProcedureSkippingResultsProcessing() throws Exception { given(callableStatement.execute()).willReturn(true); given(callableStatement.getUpdateCount()).willReturn(-1); given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")).willReturn(callableStatement); @@ -343,7 +343,7 @@ class StoredProcedureTests { @Test @SuppressWarnings("unchecked") - public void testStoredProcedureSkippingUndeclaredResults() throws Exception { + void storedProcedureSkippingUndeclaredResults() throws Exception { ResultSet resultSet = mock(); given(resultSet.next()).willReturn(true, true, false); given(resultSet.getString(2)).willReturn("Foo", "Bar"); @@ -366,7 +366,7 @@ class StoredProcedureTests { } @Test - void testParameterMapper() throws Exception { + void parameterMapper() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(2)).willReturn("OK"); @@ -381,7 +381,7 @@ class StoredProcedureTests { } @Test - void testSqlTypeValue() throws Exception { + void sqlTypeValue() throws Exception { int[] testVal = new int[] { 1, 2 }; given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); @@ -396,7 +396,7 @@ class StoredProcedureTests { } @Test - void testNumericWithScale() throws Exception { + void numericWithScale() throws Exception { given(callableStatement.execute()).willReturn(false); given(callableStatement.getUpdateCount()).willReturn(-1); given(callableStatement.getObject(1)).willReturn(new BigDecimal("12345.6789")); @@ -409,7 +409,7 @@ class StoredProcedureTests { private static class StoredProcedureConfiguredViaJdbcTemplate extends StoredProcedure { - public static final String SQL = "configured_via_jt"; + static final String SQL = "configured_via_jt"; public StoredProcedureConfiguredViaJdbcTemplate(JdbcTemplate t) { setJdbcTemplate(t); 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 406b288cf4b..c6edf40586a 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 @@ -50,86 +50,86 @@ class DefaultLobHandlerTests { @Test - void testGetBlobAsBytes() throws SQLException { + void getBlobAsBytes() throws SQLException { lobHandler.getBlobAsBytes(rs, 1); verify(rs).getBytes(1); } @Test - void testGetBlobAsBinaryStream() throws SQLException { + void getBlobAsBinaryStream() throws SQLException { lobHandler.getBlobAsBinaryStream(rs, 1); verify(rs).getBinaryStream(1); } @Test - void testGetClobAsString() throws SQLException { + void getClobAsString() throws SQLException { lobHandler.getClobAsString(rs, 1); verify(rs).getString(1); } @Test - void testGetClobAsAsciiStream() throws SQLException { + void getClobAsAsciiStream() throws SQLException { lobHandler.getClobAsAsciiStream(rs, 1); verify(rs).getAsciiStream(1); } @Test - void testGetClobAsCharacterStream() throws SQLException { + void getClobAsCharacterStream() throws SQLException { lobHandler.getClobAsCharacterStream(rs, 1); verify(rs).getCharacterStream(1); } @Test - void testSetBlobAsBytes() throws SQLException { + void setBlobAsBytes() throws SQLException { byte[] content = "testContent".getBytes(); lobCreator.setBlobAsBytes(ps, 1, content); verify(ps).setBytes(1, content); } @Test - void testSetBlobAsBinaryStream() throws SQLException { + void setBlobAsBinaryStream() throws SQLException { InputStream bis = new ByteArrayInputStream("testContent".getBytes()); lobCreator.setBlobAsBinaryStream(ps, 1, bis, 11); verify(ps).setBinaryStream(1, bis, 11); } @Test - void testSetBlobAsBinaryStreamWithoutLength() throws SQLException { + void setBlobAsBinaryStreamWithoutLength() throws SQLException { InputStream bis = new ByteArrayInputStream("testContent".getBytes()); lobCreator.setBlobAsBinaryStream(ps, 1, bis, -1); verify(ps).setBinaryStream(1, bis); } @Test - void testSetClobAsString() throws SQLException { + void setClobAsString() throws SQLException { String content = "testContent"; lobCreator.setClobAsString(ps, 1, content); verify(ps).setString(1, content); } @Test - void testSetClobAsAsciiStream() throws SQLException { + void setClobAsAsciiStream() throws SQLException { InputStream bis = new ByteArrayInputStream("testContent".getBytes()); lobCreator.setClobAsAsciiStream(ps, 1, bis, 11); verify(ps).setAsciiStream(1, bis, 11); } @Test - void testSetClobAsAsciiStreamWithoutLength() throws SQLException { + void setClobAsAsciiStreamWithoutLength() throws SQLException { InputStream bis = new ByteArrayInputStream("testContent".getBytes()); lobCreator.setClobAsAsciiStream(ps, 1, bis, -1); verify(ps).setAsciiStream(1, bis); } @Test - void testSetClobAsCharacterStream() throws SQLException { + void setClobAsCharacterStream() throws SQLException { Reader str = new StringReader("testContent"); lobCreator.setClobAsCharacterStream(ps, 1, str, 11); verify(ps).setCharacterStream(1, str, 11); } @Test - void testSetClobAsCharacterStreamWithoutLength() throws SQLException { + void setClobAsCharacterStreamWithoutLength() throws SQLException { Reader str = new StringReader("testContent"); lobCreator.setClobAsCharacterStream(ps, 1, str, -1); verify(ps).setCharacterStream(1, str); 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 b75ad9f543c..43f4a3d82ae 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 @@ -45,154 +45,154 @@ class ResultSetWrappingRowSetTests { @Test - void testGetBigDecimalInt() throws Exception { + void getBigDecimalInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", int.class); doTest(rset, rowset, 1, BigDecimal.ONE); } @Test - void testGetBigDecimalString() throws Exception { + void getBigDecimalString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", String.class); doTest(rset, rowset, "test", BigDecimal.ONE); } @Test - void testGetStringInt() throws Exception { + void getStringInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getString", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", int.class); doTest(rset, rowset, 1, "test"); } @Test - void testGetStringString() throws Exception { + void getStringString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getString", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", String.class); doTest(rset, rowset, "test", "test"); } @Test - void testGetTimestampInt() throws Exception { + void getTimestampInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", int.class); doTest(rset, rowset, 1, new Timestamp(1234L)); } @Test - void testGetTimestampString() throws Exception { + void getTimestampString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", String.class); doTest(rset, rowset, "test", new Timestamp(1234L)); } @Test - void testGetDateInt() throws Exception { + void getDateInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDate", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", int.class); doTest(rset, rowset, 1, new Date(1234L)); } @Test - void testGetDateString() throws Exception { + void getDateString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDate", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", String.class); doTest(rset, rowset, "test", new Date(1234L)); } @Test - void testGetTimeInt() throws Exception { + void getTimeInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTime", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", int.class); doTest(rset, rowset, 1, new Time(1234L)); } @Test - void testGetTimeString() throws Exception { + void getTimeString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTime", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", String.class); doTest(rset, rowset, "test", new Time(1234L)); } @Test - void testGetObjectInt() throws Exception { + void getObjectInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getObject", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", int.class); doTest(rset, rowset, 1, new Object()); } @Test - void testGetObjectString() throws Exception { + void getObjectString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getObject", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", String.class); doTest(rset, rowset, "test", new Object()); } @Test - void testGetIntInt() throws Exception { + void getIntInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getInt", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", int.class); doTest(rset, rowset, 1, 1); } @Test - void testGetIntString() throws Exception { + void getIntString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getInt", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", String.class); doTest(rset, rowset, "test", 1); } @Test - void testGetFloatInt() throws Exception { + void getFloatInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getFloat", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", int.class); doTest(rset, rowset, 1, 1.0f); } @Test - void testGetFloatString() throws Exception { + void getFloatString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getFloat", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", String.class); doTest(rset, rowset, "test", 1.0f); } @Test - void testGetDoubleInt() throws Exception { + void getDoubleInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDouble", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", int.class); doTest(rset, rowset, 1, 1.0d); } @Test - void testGetDoubleString() throws Exception { + void getDoubleString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDouble", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", String.class); doTest(rset, rowset, "test", 1.0d); } @Test - void testGetLongInt() throws Exception { + void getLongInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getLong", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", int.class); doTest(rset, rowset, 1, 1L); } @Test - void testGetLongString() throws Exception { + void getLongString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getLong", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", String.class); doTest(rset, rowset, "test", 1L); } @Test - void testGetBooleanInt() throws Exception { + void getBooleanInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBoolean", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", int.class); doTest(rset, rowset, 1, true); } @Test - void testGetBooleanString() throws Exception { + void getBooleanString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBoolean", int.class); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", String.class); doTest(rset, rowset, "test", true); 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 6d32f3bbd6c..fd254a20efd 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 @@ -68,8 +68,9 @@ class JmsListenerAnnotationBeanPostProcessorTests { assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(MethodJmsListenerEndpoint.class); MethodJmsListenerEndpoint methodEndpoint = (MethodJmsListenerEndpoint) endpoint; assertThat(methodEndpoint.getBean().getClass()).isEqualTo(SimpleMessageListenerTestBean.class); - assertThat(methodEndpoint.getMethod()).isEqualTo(SimpleMessageListenerTestBean.class.getMethod("handleIt", String.class)); - assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(SimpleMessageListenerTestBean.class.getMethod("handleIt", String.class)); + Method method = SimpleMessageListenerTestBean.class.getMethod("handleIt", String.class); + assertThat(methodEndpoint.getMethod()).isEqualTo(method); + assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(method); SimpleMessageListenerContainer listenerContainer = new SimpleMessageListenerContainer(); methodEndpoint.setupListenerContainer(listenerContainer); 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 1f95bce80b8..12e8c830280 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 @@ -79,7 +79,7 @@ class JmsNamespaceHandlerTests { @Test - void testBeansCreated() { + void beansCreated() { Map containers = context.getBeansOfType(DefaultMessageListenerContainer.class); assertThat(containers).as("Context should contain 3 JMS listener containers").hasSize(3); @@ -91,7 +91,7 @@ class JmsNamespaceHandlerTests { } @Test - void testContainerConfiguration() { + void containerConfiguration() { Map containers = context.getBeansOfType(DefaultMessageListenerContainer.class); ConnectionFactory defaultConnectionFactory = context.getBean(DEFAULT_CONNECTION_FACTORY, ConnectionFactory.class); ConnectionFactory explicitConnectionFactory = context.getBean(EXPLICIT_CONNECTION_FACTORY, ConnectionFactory.class); @@ -113,7 +113,7 @@ class JmsNamespaceHandlerTests { } @Test - void testJcaContainerConfiguration() { + void jcaContainerConfiguration() { Map containers = context.getBeansOfType(JmsMessageEndpointManager.class); assertThat(containers.containsKey("listener3")).as("listener3 not found").isTrue(); @@ -133,7 +133,7 @@ class JmsNamespaceHandlerTests { } @Test - void testJmsContainerFactoryConfiguration() { + void jmsContainerFactoryConfiguration() { Map containers = context.getBeansOfType(DefaultJmsListenerContainerFactory.class); DefaultJmsListenerContainerFactory factory = containers.get("testJmsFactory"); @@ -155,7 +155,7 @@ class JmsNamespaceHandlerTests { } @Test - void testJcaContainerFactoryConfiguration() { + void jcaContainerFactoryConfiguration() { Map containers = context.getBeansOfType(DefaultJcaListenerContainerFactory.class); DefaultJcaListenerContainerFactory factory = containers.get("testJcaFactory"); @@ -172,7 +172,7 @@ class JmsNamespaceHandlerTests { } @Test - void testListeners() throws Exception { + void listeners() throws Exception { TestBean testBean1 = context.getBean("testBean1", TestBean.class); TestBean testBean2 = context.getBean("testBean2", TestBean.class); TestMessageListener testBean3 = context.getBean("testBean3", TestMessageListener.class); @@ -203,7 +203,7 @@ class JmsNamespaceHandlerTests { } @Test - void testRecoveryInterval() { + void recoveryInterval() { Object testBackOff = context.getBean("testBackOff"); BackOff backOff1 = getBackOff("listener1"); BackOff backOff2 = getBackOff("listener2"); @@ -215,7 +215,7 @@ class JmsNamespaceHandlerTests { } @Test - void testConcurrency() { + void concurrency() { // JMS DefaultMessageListenerContainer listener0 = this.context .getBean(DefaultMessageListenerContainer.class.getName() + "#0", DefaultMessageListenerContainer.class); @@ -241,7 +241,7 @@ class JmsNamespaceHandlerTests { } @Test - void testResponseDestination() { + void responseDestination() { // JMS DefaultMessageListenerContainer listener1 = this.context .getBean("listener1", DefaultMessageListenerContainer.class); @@ -264,7 +264,7 @@ class JmsNamespaceHandlerTests { } @Test - void testErrorHandlers() { + void errorHandlers() { ErrorHandler expected = this.context.getBean("testErrorHandler", ErrorHandler.class); ErrorHandler errorHandler1 = getErrorHandler("listener1"); ErrorHandler errorHandler2 = getErrorHandler("listener2"); @@ -275,7 +275,7 @@ class JmsNamespaceHandlerTests { } @Test - void testPhases() { + void phases() { int phase1 = getPhase("listener1"); int phase2 = getPhase("listener2"); int phase3 = getPhase("listener3"); @@ -289,7 +289,7 @@ class JmsNamespaceHandlerTests { } @Test - void testComponentRegistration() { + void componentRegistration() { assertThat(context.containsComponentDefinition("listener1")).as("Parser should have registered a component named 'listener1'").isTrue(); assertThat(context.containsComponentDefinition("listener2")).as("Parser should have registered a component named 'listener2'").isTrue(); assertThat(context.containsComponentDefinition("listener3")).as("Parser should have registered a component named 'listener3'").isTrue(); @@ -303,7 +303,7 @@ class JmsNamespaceHandlerTests { } @Test - void testSourceExtraction() { + void sourceExtraction() { Iterator iterator = context.getRegisteredComponents(); while (iterator.hasNext()) { ComponentDefinition compDef = iterator.next(); 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 e717a332583..fba4bf9fc34 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 @@ -57,7 +57,7 @@ class JmsTransactionManagerTests { @Test - void testTransactionCommit() throws JMSException { + void transactionCommit() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -80,7 +80,7 @@ class JmsTransactionManagerTests { } @Test - void testTransactionRollback() throws JMSException { + void transactionRollback() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -103,7 +103,7 @@ class JmsTransactionManagerTests { } @Test - void testParticipatingTransactionWithCommit() throws JMSException { + void participatingTransactionWithCommit() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -132,7 +132,7 @@ class JmsTransactionManagerTests { } @Test - void testParticipatingTransactionWithRollbackOnly() throws JMSException { + void participatingTransactionWithRollbackOnly() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -164,7 +164,7 @@ class JmsTransactionManagerTests { } @Test - void testSuspendedTransaction() throws JMSException { + void suspendedTransaction() throws JMSException { final ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -201,7 +201,7 @@ class JmsTransactionManagerTests { } @Test - void testTransactionSuspension() throws JMSException { + void transactionSuspension() throws JMSException { final ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -238,7 +238,7 @@ class JmsTransactionManagerTests { } @Test - void testTransactionCommitWithMessageProducer() throws JMSException { + void transactionCommitWithMessageProducer() throws JMSException { Destination dest = new StubQueue(); ConnectionFactory cf = mock(); @@ -266,7 +266,7 @@ class JmsTransactionManagerTests { } @Test - void testLazyTransactionalSession() throws JMSException { + void lazyTransactionalSession() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); final Session session = mock(); @@ -291,7 +291,7 @@ class JmsTransactionManagerTests { } @Test - void testLazyWithoutSessionAccess() { + void lazyWithoutSessionAccess() { ConnectionFactory cf = mock(); JmsTransactionManager tm = new JmsTransactionManager(cf); 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 1d8a416e6f1..a8a30a25261 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 @@ -49,7 +49,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; class SingleConnectionFactoryTests { @Test - void testWithConnection() throws JMSException { + void withConnection() throws JMSException { Connection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); @@ -70,7 +70,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithQueueConnection() throws JMSException { + void withQueueConnection() throws JMSException { QueueConnection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); @@ -91,7 +91,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithTopicConnection() throws JMSException { + void withTopicConnection() throws JMSException { TopicConnection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); @@ -112,7 +112,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactory() throws JMSException { + void withConnectionFactory() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); @@ -134,7 +134,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithQueueConnectionFactoryAndJms11Usage() throws JMSException { + void withQueueConnectionFactoryAndJms11Usage() throws JMSException { QueueConnectionFactory cf = mock(); QueueConnection con = mock(); @@ -156,7 +156,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithQueueConnectionFactoryAndJms102Usage() throws JMSException { + void withQueueConnectionFactoryAndJms102Usage() throws JMSException { QueueConnectionFactory cf = mock(); QueueConnection con = mock(); @@ -178,7 +178,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithTopicConnectionFactoryAndJms11Usage() throws JMSException { + void withTopicConnectionFactoryAndJms11Usage() throws JMSException { TopicConnectionFactory cf = mock(); TopicConnection con = mock(); @@ -200,7 +200,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithTopicConnectionFactoryAndJms102Usage() throws JMSException { + void withTopicConnectionFactoryAndJms102Usage() throws JMSException { TopicConnectionFactory cf = mock(); TopicConnection con = mock(); @@ -222,7 +222,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionAggregatedStartStop() throws JMSException { + void withConnectionAggregatedStartStop() throws JMSException { Connection con = mock(); SingleConnectionFactory scf = new SingleConnectionFactory(con); @@ -254,7 +254,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndClientId() throws JMSException { + void withConnectionFactoryAndClientId() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); given(cf.createConnection()).willReturn(con); @@ -277,7 +277,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndExceptionListener() throws JMSException { + void withConnectionFactoryAndExceptionListener() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); @@ -305,7 +305,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndReconnectOnException() throws JMSException { + void withConnectionFactoryAndReconnectOnException() throws JMSException { ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -325,7 +325,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndExceptionListenerAndReconnectOnException() throws JMSException { + void withConnectionFactoryAndExceptionListenerAndReconnectOnException() throws JMSException { ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -348,7 +348,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndExceptionListenerAndReconnectOnExceptionWithJMSException() throws Exception { + void withConnectionFactoryAndExceptionListenerAndReconnectOnExceptionWithJMSException() throws Exception { // Throws JMSException on setExceptionListener() method, but only at the first time class FailingTestConnection extends TestConnection { private int setExceptionListenerInvocationCounter; @@ -447,7 +447,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndLocalExceptionListenerWithCleanup() throws JMSException { + void withConnectionFactoryAndLocalExceptionListenerWithCleanup() throws JMSException { ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -485,7 +485,7 @@ class SingleConnectionFactoryTests { } @Test - void testWithConnectionFactoryAndLocalExceptionListenerWithReconnect() throws JMSException { + void withConnectionFactoryAndLocalExceptionListenerWithReconnect() throws JMSException { ConnectionFactory cf = mock(); TestConnection con = new TestConnection(); given(cf.createConnection()).willReturn(con); @@ -519,7 +519,7 @@ class SingleConnectionFactoryTests { } @Test - void testCachingConnectionFactory() throws JMSException { + void cachingConnectionFactory() throws JMSException { ConnectionFactory cf = mock(); Connection con = mock(); Session txSession = mock(); @@ -559,7 +559,7 @@ class SingleConnectionFactoryTests { } @Test - void testCachingConnectionFactoryWithQueueConnectionFactoryAndJms102Usage() throws JMSException { + void cachingConnectionFactoryWithQueueConnectionFactoryAndJms102Usage() throws JMSException { QueueConnectionFactory cf = mock(); QueueConnection con = mock(); QueueSession txSession = mock(); @@ -599,7 +599,7 @@ class SingleConnectionFactoryTests { } @Test - void testCachingConnectionFactoryWithTopicConnectionFactoryAndJms102Usage() throws JMSException { + void cachingConnectionFactoryWithTopicConnectionFactoryAndJms102Usage() throws JMSException { TopicConnectionFactory cf = mock(); TopicConnection con = mock(); TopicSession txSession = mock(); 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 017642674b3..dabcd8b0344 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 @@ -129,7 +129,7 @@ class JmsTemplateTests { @Test - void testExceptionStackTrace() { + void exceptionStackTrace() { JMSException jmsEx = new JMSException("could not connect"); Exception innerEx = new Exception("host not found"); jmsEx.setLinkedException(innerEx); @@ -142,7 +142,7 @@ class JmsTemplateTests { } @Test - void testProducerCallback() throws Exception { + void producerCallback() throws Exception { JmsTemplate template = createTemplate(); template.setConnectionFactory(this.connectionFactory); @@ -162,7 +162,7 @@ class JmsTemplateTests { } @Test - void testProducerCallbackWithIdAndTimestampDisabled() throws Exception { + void producerCallbackWithIdAndTimestampDisabled() throws Exception { JmsTemplate template = createTemplate(); template.setConnectionFactory(this.connectionFactory); template.setMessageIdEnabled(false); @@ -189,7 +189,7 @@ class JmsTemplateTests { * Test the method execute(SessionCallback action). */ @Test - void testSessionCallback() throws Exception { + void sessionCallback() throws Exception { JmsTemplate template = createTemplate(); template.setConnectionFactory(this.connectionFactory); @@ -203,7 +203,7 @@ class JmsTemplateTests { } @Test - void testSessionCallbackWithinSynchronizedTransaction() throws Exception { + void sessionCallbackWithinSynchronizedTransaction() throws Exception { SingleConnectionFactory scf = new SingleConnectionFactory(this.connectionFactory); JmsTemplate template = createTemplate(); template.setConnectionFactory(scf); @@ -257,7 +257,7 @@ class JmsTemplateTests { * {@code send(Destination d, MessageCreator messageCreator)} */ @Test - void testSendDestination() throws Exception { + void sendDestination() throws Exception { doTestSendDestination(true, false, true, false); } @@ -266,7 +266,7 @@ class JmsTemplateTests { * {@code send(String d, MessageCreator messageCreator)} */ @Test - void testSendDestinationName() throws Exception { + void sendDestinationName() throws Exception { doTestSendDestination(false, false, true, false); } @@ -275,7 +275,7 @@ class JmsTemplateTests { * {@code send(Destination d, MessageCreator messageCreator)} using QOS parameters. */ @Test - void testSendDestinationWithQOS() throws Exception { + void sendDestinationWithQOS() throws Exception { doTestSendDestination(true, false, false, true); } @@ -284,7 +284,7 @@ class JmsTemplateTests { * {@code send(String d, MessageCreator messageCreator)} using QOS parameters. */ @Test - void testSendDestinationNameWithQOS() throws Exception { + void sendDestinationNameWithQOS() throws Exception { doTestSendDestination(false, false, false, true); } @@ -292,7 +292,7 @@ class JmsTemplateTests { * Test sending to the default destination. */ @Test - void testSendDefaultDestination() throws Exception { + void sendDefaultDestination() throws Exception { doTestSendDestination(true, true, true, true); } @@ -300,7 +300,7 @@ class JmsTemplateTests { * Test sending to the default destination name. */ @Test - void testSendDefaultDestinationName() throws Exception { + void sendDefaultDestinationName() throws Exception { doTestSendDestination(false, true, true, true); } @@ -308,7 +308,7 @@ class JmsTemplateTests { * Test sending to the default destination using explicit QOS parameters. */ @Test - void testSendDefaultDestinationWithQOS() throws Exception { + void sendDefaultDestinationWithQOS() throws Exception { doTestSendDestination(true, true, false, false); } @@ -316,7 +316,7 @@ class JmsTemplateTests { * Test sending to the default destination name using explicit QOS parameters. */ @Test - void testSendDefaultDestinationNameWithQOS() throws Exception { + void sendDefaultDestinationNameWithQOS() throws Exception { doTestSendDestination(false, true, false, false); } @@ -391,7 +391,7 @@ class JmsTemplateTests { } @Test - void testConverter() throws Exception { + void converter() throws Exception { JmsTemplate template = createTemplate(); template.setConnectionFactory(this.connectionFactory); template.setMessageConverter(new SimpleMessageConverter()); @@ -415,87 +415,87 @@ class JmsTemplateTests { } @Test - void testReceiveDefaultDestination() throws Exception { + void receiveDefaultDestination() throws Exception { doTestReceive(true, true, false, false, false, false, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveDefaultDestinationName() throws Exception { + void receiveDefaultDestinationName() throws Exception { doTestReceive(false, true, false, false, false, false, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveDestination() throws Exception { + void receiveDestination() throws Exception { doTestReceive(true, false, false, false, false, true, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveDestinationWithClientAcknowledge() throws Exception { + void receiveDestinationWithClientAcknowledge() throws Exception { doTestReceive(true, false, false, true, false, false, 1000); } @Test - void testReceiveDestinationName() throws Exception { + void receiveDestinationName() throws Exception { doTestReceive(false, false, false, false, false, true, 1000); } @Test - void testReceiveDefaultDestinationWithSelector() throws Exception { + void receiveDefaultDestinationWithSelector() throws Exception { doTestReceive(true, true, false, false, true, true, 1000); } @Test - void testReceiveDefaultDestinationNameWithSelector() throws Exception { + void receiveDefaultDestinationNameWithSelector() throws Exception { doTestReceive(false, true, false, false, true, true, JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT); } @Test - void testReceiveDestinationWithSelector() throws Exception { + void receiveDestinationWithSelector() throws Exception { doTestReceive(true, false, false, false, true, false, 1000); } @Test - void testReceiveDestinationWithClientAcknowledgeWithSelector() throws Exception { + void receiveDestinationWithClientAcknowledgeWithSelector() throws Exception { doTestReceive(true, false, false, true, true, true, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveDestinationNameWithSelector() throws Exception { + void receiveDestinationNameWithSelector() throws Exception { doTestReceive(false, false, false, false, true, false, JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT); } @Test - void testReceiveAndConvertDefaultDestination() throws Exception { + void receiveAndConvertDefaultDestination() throws Exception { doTestReceive(true, true, true, false, false, false, 1000); } @Test - void testReceiveAndConvertDefaultDestinationName() throws Exception { + void receiveAndConvertDefaultDestinationName() throws Exception { doTestReceive(false, true, true, false, false, false, 1000); } @Test - void testReceiveAndConvertDestinationName() throws Exception { + void receiveAndConvertDestinationName() throws Exception { doTestReceive(false, false, true, false, false, true, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveAndConvertDestination() throws Exception { + void receiveAndConvertDestination() throws Exception { doTestReceive(true, false, true, false, false, true, 1000); } @Test - void testReceiveAndConvertDefaultDestinationWithSelector() throws Exception { + void receiveAndConvertDefaultDestinationWithSelector() throws Exception { doTestReceive(true, true, true, false, true, true, JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT); } @Test - void testReceiveAndConvertDestinationNameWithSelector() throws Exception { + void receiveAndConvertDestinationNameWithSelector() throws Exception { doTestReceive(false, false, true, false, true, true, JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT); } @Test - void testReceiveAndConvertDestinationWithSelector() throws Exception { + void receiveAndConvertDestinationWithSelector() throws Exception { doTestReceive(true, false, true, false, true, false, 1000); } @@ -605,22 +605,22 @@ class JmsTemplateTests { } @Test - void testSendAndReceiveDefaultDestination() throws Exception { + void sendAndReceiveDefaultDestination() throws Exception { doTestSendAndReceive(true, true, 1000L); } @Test - void testSendAndReceiveDefaultDestinationName() throws Exception { + void sendAndReceiveDefaultDestinationName() throws Exception { doTestSendAndReceive(false, true, 1000L); } @Test - void testSendAndReceiveDestination() throws Exception { + void sendAndReceiveDestination() throws Exception { doTestSendAndReceive(true, false, 1000L); } @Test - void testSendAndReceiveDestinationName() throws Exception { + void sendAndReceiveDestinationName() throws Exception { doTestSendAndReceive(false, false, 1000L); } @@ -687,12 +687,12 @@ class JmsTemplateTests { } @Test - void testSendAndReceiveDestinationWithResponseQueue() throws Exception { + void sendAndReceiveDestinationWithResponseQueue() throws Exception { doTestSendAndReceiveWithResponseQueue(true, 1000L); } @Test - void testSendAndReceiveDestinationNameWithResponseQueueName() throws Exception { + void sendAndReceiveDestinationNameWithResponseQueueName() throws Exception { doTestSendAndReceiveWithResponseQueue(false, 1000L); } @@ -751,12 +751,12 @@ class JmsTemplateTests { } @Test - void testSendAndReceiveDestinationWithResponseQueueAndCorrelationIdSelector() throws Exception { + void sendAndReceiveDestinationWithResponseQueueAndCorrelationIdSelector() throws Exception { doTestSendAndReceiveWithResponseQueueAndCorrelationId(true, 1000L); } @Test - void testSendAndReceiveDestinationNameWithResponseQueueNameAndCorrelationIdSelector() throws Exception { + void sendAndReceiveDestinationNameWithResponseQueueNameAndCorrelationIdSelector() throws Exception { doTestSendAndReceiveWithResponseQueueAndCorrelationId(false, 1000L); } @@ -814,67 +814,67 @@ class JmsTemplateTests { } @Test - void testIllegalStateException() throws Exception { + void illegalStateException() throws Exception { doTestJmsException(new jakarta.jms.IllegalStateException(""), org.springframework.jms.IllegalStateException.class); } @Test - void testInvalidClientIDException() throws Exception { + void invalidClientIDException() throws Exception { doTestJmsException(new jakarta.jms.InvalidClientIDException(""), InvalidClientIDException.class); } @Test - void testInvalidDestinationException() throws Exception { + void invalidDestinationException() throws Exception { doTestJmsException(new jakarta.jms.InvalidDestinationException(""), InvalidDestinationException.class); } @Test - void testInvalidSelectorException() throws Exception { + void invalidSelectorException() throws Exception { doTestJmsException(new jakarta.jms.InvalidSelectorException(""), InvalidSelectorException.class); } @Test - void testJmsSecurityException() throws Exception { + void jmsSecurityException() throws Exception { doTestJmsException(new jakarta.jms.JMSSecurityException(""), JmsSecurityException.class); } @Test - void testMessageEOFException() throws Exception { + void messageEOFException() throws Exception { doTestJmsException(new jakarta.jms.MessageEOFException(""), MessageEOFException.class); } @Test - void testMessageFormatException() throws Exception { + void messageFormatException() throws Exception { doTestJmsException(new jakarta.jms.MessageFormatException(""), MessageFormatException.class); } @Test - void testMessageNotReadableException() throws Exception { + void messageNotReadableException() throws Exception { doTestJmsException(new jakarta.jms.MessageNotReadableException(""), MessageNotReadableException.class); } @Test - void testMessageNotWriteableException() throws Exception { + void messageNotWriteableException() throws Exception { doTestJmsException(new jakarta.jms.MessageNotWriteableException(""), MessageNotWriteableException.class); } @Test - void testResourceAllocationException() throws Exception { + void resourceAllocationException() throws Exception { doTestJmsException(new jakarta.jms.ResourceAllocationException(""), ResourceAllocationException.class); } @Test - void testTransactionInProgressException() throws Exception { + void transactionInProgressException() throws Exception { doTestJmsException(new jakarta.jms.TransactionInProgressException(""), TransactionInProgressException.class); } @Test - void testTransactionRolledBackException() throws Exception { + void transactionRolledBackException() throws Exception { doTestJmsException(new jakarta.jms.TransactionRolledBackException(""), TransactionRolledBackException.class); } @Test - void testUncategorizedJmsException() throws Exception { + void uncategorizedJmsException() throws Exception { doTestJmsException(new jakarta.jms.JMSException(""), UncategorizedJmsException.class); } 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 9a78e8e6d51..724f09de780 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 @@ import static org.mockito.Mockito.mock; class JmsGatewaySupportTests { @Test - void testJmsGatewaySupportWithConnectionFactory() { + void jmsGatewaySupportWithConnectionFactory() { ConnectionFactory mockConnectionFactory = mock(); final List test = new ArrayList<>(1); JmsGatewaySupport gateway = new JmsGatewaySupport() { @@ -52,7 +52,7 @@ class JmsGatewaySupportTests { } @Test - void testJmsGatewaySupportWithJmsTemplate() { + void jmsGatewaySupportWithJmsTemplate() { JmsTemplate template = new JmsTemplate(); final List test = new ArrayList<>(1); JmsGatewaySupport gateway = new JmsGatewaySupport() { 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 f19fe0ddcd4..379df9555b6 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 @@ -59,25 +59,25 @@ class SimpleMessageListenerContainerTests { @Test - void testSettingMessageListenerToANullType() { + void settingMessageListenerToANullType() { this.container.setMessageListener(null); assertThat(this.container.getMessageListener()).isNull(); } @Test - void testSettingMessageListenerToAnUnsupportedType() { + void settingMessageListenerToAnUnsupportedType() { assertThatIllegalArgumentException().isThrownBy(() -> this.container.setMessageListener("Bingo")); } @Test - void testSessionTransactedModeReallyDoesDefaultToFalse() { + void sessionTransactedModeReallyDoesDefaultToFalse() { assertThat(this.container.isPubSubNoLocal()).as("The [pubSubLocal] property of SimpleMessageListenerContainer " + "must default to false. Change this test (and the attendant javadoc) if you have changed the default.").isFalse(); } @Test - void testSettingConcurrentConsumersToZeroIsNotAllowed() { + void settingConcurrentConsumersToZeroIsNotAllowed() { assertThatIllegalArgumentException().isThrownBy(() -> { this.container.setConcurrentConsumers(0); this.container.afterPropertiesSet(); @@ -85,7 +85,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testSettingConcurrentConsumersToANegativeValueIsNotAllowed() { + void settingConcurrentConsumersToANegativeValueIsNotAllowed() { assertThatIllegalArgumentException().isThrownBy(() -> { this.container.setConcurrentConsumers(-198); this.container.afterPropertiesSet(); @@ -93,7 +93,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testContextRefreshedEventDoesNotStartTheConnectionIfAutoStartIsSetToFalse() throws Exception { + void contextRefreshedEventDoesNotStartTheConnectionIfAutoStartIsSetToFalse() throws Exception { MessageConsumer messageConsumer = mock(); Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... @@ -124,7 +124,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testContextRefreshedEventStartsTheConnectionByDefault() throws Exception { + void contextRefreshedEventStartsTheConnectionByDefault() throws Exception { MessageConsumer messageConsumer = mock(); Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... @@ -156,7 +156,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testCorrectSessionExposedForSessionAwareMessageListenerInvocation() throws Exception { + void correctSessionExposedForSessionAwareMessageListenerInvocation() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); final Session session = mock(); @@ -206,7 +206,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testTaskExecutorCorrectlyInvokedWhenSpecified() throws Exception { + void taskExecutorCorrectlyInvokedWhenSpecified() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); final Session session = mock(); @@ -247,7 +247,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testRegisteredExceptionListenerIsInvokedOnException() throws Exception { + void registeredExceptionListenerIsInvokedOnException() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); Session session = mock(); @@ -294,7 +294,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testRegisteredErrorHandlerIsInvokedOnException() throws Exception { + void registeredErrorHandlerIsInvokedOnException() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); Session session = mock(); @@ -339,7 +339,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testNoRollbackOccursIfSessionIsNotTransactedAndThatExceptionsDo_NOT_Propagate() throws Exception { + void noRollbackOccursIfSessionIsNotTransactedAndThatExceptionsDo_NOT_Propagate() throws Exception { final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); Session session = mock(); @@ -378,7 +378,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testTransactedSessionsGetRollbackLogicAppliedAndThatExceptionsStillDo_NOT_Propagate() throws Exception { + void transactedSessionsGetRollbackLogicAppliedAndThatExceptionsStillDo_NOT_Propagate() throws Exception { this.container.setSessionTransacted(true); final SimpleMessageConsumer messageConsumer = new SimpleMessageConsumer(); @@ -421,7 +421,7 @@ class SimpleMessageListenerContainerTests { } @Test - void testDestroyClosesConsumersSessionsAndConnectionInThatOrder() throws Exception { + void destroyClosesConsumersSessionsAndConnectionInThatOrder() throws Exception { MessageConsumer messageConsumer = mock(); Session session = mock(); // Queue gets created in order to create MessageConsumer for that Destination... 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 370dbe7822b..f511021c748 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 @@ -63,7 +63,7 @@ class MessageListenerAdapterTests { @Test - void testWithMessageContentsDelegateForTextMessage() throws Exception { + void withMessageContentsDelegateForTextMessage() throws Exception { TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); @@ -77,7 +77,7 @@ class MessageListenerAdapterTests { } @Test - void testWithMessageContentsDelegateForBytesMessage() throws Exception { + void withMessageContentsDelegateForBytesMessage() throws Exception { BytesMessage bytesMessage = mock(); // BytesMessage contents must be unwrapped... given(bytesMessage.getBodyLength()).willReturn(Long.valueOf(TEXT.getBytes().length)); @@ -96,7 +96,7 @@ class MessageListenerAdapterTests { } @Test - void testWithMessageContentsDelegateForObjectMessage() throws Exception { + void withMessageContentsDelegateForObjectMessage() throws Exception { ObjectMessage objectMessage = mock(); given(objectMessage.getObject()).willReturn(NUMBER); @@ -109,7 +109,7 @@ class MessageListenerAdapterTests { } @Test - void testWithMessageContentsDelegateForObjectMessageWithPlainObject() throws Exception { + void withMessageContentsDelegateForObjectMessageWithPlainObject() throws Exception { ObjectMessage objectMessage = mock(); given(objectMessage.getObject()).willReturn(OBJECT); @@ -122,7 +122,7 @@ class MessageListenerAdapterTests { } @Test - void testWithMessageDelegate() { + void withMessageDelegate() { TextMessage textMessage = mock(); MessageDelegate delegate = mock(); @@ -136,7 +136,7 @@ class MessageListenerAdapterTests { } @Test - void testWhenTheAdapterItselfIsTheDelegate() throws Exception { + void whenTheAdapterItselfIsTheDelegate() throws Exception { TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); @@ -147,7 +147,7 @@ class MessageListenerAdapterTests { } @Test - void testRainyDayWithNoApplicableHandlingMethods() throws Exception { + void rainyDayWithNoApplicableHandlingMethods() throws Exception { TextMessage textMessage = mock(); // TextMessage contents must be unwrapped... given(textMessage.getText()).willReturn(TEXT); @@ -159,7 +159,7 @@ class MessageListenerAdapterTests { } @Test - void testThatAnExceptionThrownFromTheHandlingMethodIsSimplySwallowedByDefault() { + void thatAnExceptionThrownFromTheHandlingMethodIsSimplySwallowedByDefault() { final IllegalArgumentException exception = new IllegalArgumentException(); TextMessage textMessage = mock(); @@ -184,7 +184,7 @@ class MessageListenerAdapterTests { } @Test - void testThatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() { + void thatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() { MessageListenerAdapter adapter = new MessageListenerAdapter(); assertThat(adapter.getMessageConverter()).as("The default [MessageConverter] must never be null.").isNotNull(); boolean condition = adapter.getMessageConverter() instanceof SimpleMessageConverter; @@ -192,19 +192,19 @@ class MessageListenerAdapterTests { } @Test - void testThatWhenNoDelegateIsSuppliedTheDelegateIsAssumedToBeTheMessageListenerAdapterItself() { + void thatWhenNoDelegateIsSuppliedTheDelegateIsAssumedToBeTheMessageListenerAdapterItself() { MessageListenerAdapter adapter = new MessageListenerAdapter(); assertThat(adapter.getDelegate()).isSameAs(adapter); } @Test - void testThatTheDefaultMessageHandlingMethodNameIsTheConstantDefault() { + void thatTheDefaultMessageHandlingMethodNameIsTheConstantDefault() { MessageListenerAdapter adapter = new MessageListenerAdapter(); assertThat(adapter.getDefaultListenerMethod()).isEqualTo(MessageListenerAdapter.ORIGINAL_DEFAULT_LISTENER_METHOD); } @Test - void testWithResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSessionSupplied() { + void withResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSessionSupplied() { TextMessage textMessage = mock(); ResponsiveMessageDelegate delegate = mock(); given(delegate.handleMessage(textMessage)).willReturn(TEXT); @@ -216,7 +216,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateWithDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { + void withResponsiveMessageDelegateWithDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { Queue destination = mock(); TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... @@ -251,7 +251,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { + void withResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { Queue destination = mock(); TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... @@ -284,7 +284,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateNoDefaultDestinationAndNoReplyToDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { + void withResponsiveMessageDelegateNoDefaultDestinationAndNoReplyToDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception { final TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... given(sentTextMessage.getJMSCorrelationID()).willReturn(CORRELATION_ID); @@ -313,7 +313,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied_AndSendingThrowsJMSException() throws Exception { + void withResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied_AndSendingThrowsJMSException() throws Exception { Queue destination = mock(); final TextMessage sentTextMessage = mock(); @@ -349,7 +349,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateDoesNotSendReturnTextMessageWhenSessionSupplied_AndListenerMethodThrowsException() { + void withResponsiveMessageDelegateDoesNotSendReturnTextMessageWhenSessionSupplied_AndListenerMethodThrowsException() { final TextMessage message = mock(); final QueueSession session = mock(); @@ -367,7 +367,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateWhenReturnTypeIsNotAJMSMessageAndNoMessageConverterIsSupplied() { + void withResponsiveMessageDelegateWhenReturnTypeIsNotAJMSMessageAndNoMessageConverterIsSupplied() { final TextMessage sentTextMessage = mock(); final Session session = mock(); ResponsiveMessageDelegate delegate = mock(); @@ -386,7 +386,7 @@ class MessageListenerAdapterTests { } @Test - void testWithResponsiveMessageDelegateWhenReturnTypeIsAJMSMessageAndNoMessageConverterIsSupplied() throws Exception { + void withResponsiveMessageDelegateWhenReturnTypeIsAJMSMessageAndNoMessageConverterIsSupplied() throws Exception { Queue destination = mock(); final TextMessage sentTextMessage = mock(); // correlation ID is queried when response is being created... 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 e84f0a12903..184e5e7f07b 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 @@ -50,7 +50,7 @@ import static org.mockito.Mockito.verify; class SimpleMessageConverterTests { @Test - void testStringConversion() throws JMSException { + void stringConversion() throws JMSException { Session session = mock(); TextMessage message = mock(); @@ -65,7 +65,7 @@ class SimpleMessageConverterTests { } @Test - void testByteArrayConversion() throws JMSException { + void byteArrayConversion() throws JMSException { Session session = mock(); BytesMessage message = mock(); @@ -84,7 +84,7 @@ class SimpleMessageConverterTests { } @Test - void testMapConversion() throws JMSException { + void mapConversion() throws JMSException { Session session = mock(); MapMessage message = mock(); @@ -107,7 +107,7 @@ class SimpleMessageConverterTests { } @Test - void testSerializableConversion() throws JMSException { + void serializableConversion() throws JMSException { Session session = mock(); ObjectMessage message = mock(); @@ -122,19 +122,19 @@ class SimpleMessageConverterTests { } @Test - void testToMessageThrowsExceptionIfGivenNullObjectToConvert() { + void toMessageThrowsExceptionIfGivenNullObjectToConvert() { assertThatExceptionOfType(MessageConversionException.class).isThrownBy(() -> new SimpleMessageConverter().toMessage(null, null)); } @Test - void testToMessageThrowsExceptionIfGivenIncompatibleObjectToConvert() { + void toMessageThrowsExceptionIfGivenIncompatibleObjectToConvert() { assertThatExceptionOfType(MessageConversionException.class).isThrownBy(() -> new SimpleMessageConverter().toMessage(new Object(), null)); } @Test - void testToMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { + void toMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { Session session = mock(); ObjectMessage message = mock(); @@ -144,7 +144,7 @@ class SimpleMessageConverterTests { } @Test - void testFromMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { + void fromMessageSimplyReturnsMessageAsIsIfSuppliedWithMessage() throws JMSException { Message message = mock(); SimpleMessageConverter converter = new SimpleMessageConverter(); @@ -153,7 +153,7 @@ class SimpleMessageConverterTests { } @Test - void testMapConversionWhereMapHasNonStringTypesForKeys() throws JMSException { + void mapConversionWhereMapHasNonStringTypesForKeys() throws JMSException { MapMessage message = mock(); Session session = mock(); given(session.createMapMessage()).willReturn(message); @@ -167,7 +167,7 @@ class SimpleMessageConverterTests { } @Test - void testMapConversionWhereMapHasNNullForKey() throws JMSException { + void mapConversionWhereMapHasNNullForKey() throws JMSException { MapMessage message = mock(); Session session = mock(); given(session.createMapMessage()).willReturn(message); 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 07c29cdda0c..5d40e4bd18b 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 @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; class JmsDestinationAccessorTests { @Test - void testChokesIfDestinationResolverIsetToNullExplicitly() { + void chokesIfDestinationResolverIsetToNullExplicitly() { ConnectionFactory connectionFactory = mock(); JmsDestinationAccessor accessor = new StubJmsDestinationAccessor(); @@ -40,7 +40,7 @@ class JmsDestinationAccessorTests { } @Test - void testSessionTransactedModeReallyDoesDefaultToFalse() { + void sessionTransactedModeReallyDoesDefaultToFalse() { JmsDestinationAccessor accessor = new StubJmsDestinationAccessor(); assertThat(accessor.isPubSubDomain()).as("The [pubSubDomain] property of JmsDestinationAccessor must default to " + "false (i.e. Queues are used by default). Change this test (and the " + 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 9e9abf3078d..b0c06a9f1b5 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 @@ -41,7 +41,7 @@ class JndiDestinationResolverTests { @Test - void testHitsCacheSecondTimeThrough() throws Exception { + void hitsCacheSecondTimeThrough() throws Exception { Session session = mock(); @@ -52,7 +52,7 @@ class JndiDestinationResolverTests { } @Test - void testDoesNotUseCacheIfCachingIsTurnedOff() throws Exception { + void doesNotUseCacheIfCachingIsTurnedOff() throws Exception { Session session = mock(); @@ -71,7 +71,7 @@ class JndiDestinationResolverTests { } @Test - void testDelegatesToFallbackIfNotResolvedInJndi() throws Exception { + void delegatesToFallbackIfNotResolvedInJndi() throws Exception { Session session = mock(); DestinationResolver dynamicResolver = mock(); @@ -93,7 +93,7 @@ class JndiDestinationResolverTests { } @Test - void testDoesNotDelegateToFallbackIfNotResolvedInJndi() { + void doesNotDelegateToFallbackIfNotResolvedInJndi() { final Session session = mock(); DestinationResolver dynamicResolver = mock(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java index 2bcc3d428ab..00d25d9086c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java @@ -39,13 +39,13 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException class MessageHeadersTests { @Test - void testTimestamp() { + void timestamp() { MessageHeaders headers = new MessageHeaders(null); assertThat(headers.getTimestamp()).isNotNull(); } @Test - void testTimestampOverwritten() throws Exception { + void timestampOverwritten() throws Exception { MessageHeaders headers1 = new MessageHeaders(null); Thread.sleep(50L); MessageHeaders headers2 = new MessageHeaders(headers1); @@ -53,59 +53,59 @@ class MessageHeadersTests { } @Test - void testTimestampProvided() { + void timestampProvided() { MessageHeaders headers = new MessageHeaders(null, null, 10L); assertThat(headers.getTimestamp()).isEqualTo(10L); } @Test - void testTimestampProvidedNullValue() { + void timestampProvidedNullValue() { Map input = Collections.singletonMap(MessageHeaders.TIMESTAMP, 1L); MessageHeaders headers = new MessageHeaders(input, null, null); assertThat(headers.getTimestamp()).isNotNull(); } @Test - void testTimestampNone() { + void timestampNone() { MessageHeaders headers = new MessageHeaders(null, null, -1L); assertThat(headers.getTimestamp()).isNull(); } @Test - void testIdOverwritten() { + void idOverwritten() { MessageHeaders headers1 = new MessageHeaders(null); MessageHeaders headers2 = new MessageHeaders(headers1); assertThat(headers2.getId()).isNotSameAs(headers1.getId()); } @Test - void testId() { + void id() { MessageHeaders headers = new MessageHeaders(null); assertThat(headers.getId()).isNotNull(); } @Test - void testIdProvided() { + void idProvided() { UUID id = new UUID(0L, 25L); MessageHeaders headers = new MessageHeaders(null, id, null); assertThat(headers.getId()).isEqualTo(id); } @Test - void testIdProvidedNullValue() { + void idProvidedNullValue() { Map input = Collections.singletonMap(MessageHeaders.ID, new UUID(0L, 25L)); MessageHeaders headers = new MessageHeaders(input, null, null); assertThat(headers.getId()).isNotNull(); } @Test - void testIdNone() { + void idNone() { MessageHeaders headers = new MessageHeaders(null, MessageHeaders.ID_VALUE_NONE, null); assertThat(headers.getId()).isNull(); } @Test - void testNonTypedAccessOfHeaderValue() { + void nonTypedAccessOfHeaderValue() { Integer value = 123; Map map = new HashMap<>(); map.put("test", value); @@ -114,7 +114,7 @@ class MessageHeadersTests { } @Test - void testTypedAccessOfHeaderValue() { + void typedAccessOfHeaderValue() { Integer value = 123; Map map = new HashMap<>(); map.put("test", value); @@ -123,7 +123,7 @@ class MessageHeadersTests { } @Test - void testHeaderValueAccessWithIncorrectType() { + void headerValueAccessWithIncorrectType() { Integer value = 123; Map map = new HashMap<>(); map.put("test", value); @@ -133,21 +133,21 @@ class MessageHeadersTests { } @Test - void testNullHeaderValue() { + void nullHeaderValue() { Map map = new HashMap<>(); MessageHeaders headers = new MessageHeaders(map); assertThat(headers.get("nosuchattribute")).isNull(); } @Test - void testNullHeaderValueWithTypedAccess() { + void nullHeaderValueWithTypedAccess() { Map map = new HashMap<>(); MessageHeaders headers = new MessageHeaders(map); assertThat(headers.get("nosuchattribute", String.class)).isNull(); } @Test - void testHeaderKeys() { + void headerKeys() { Map map = new HashMap<>(); map.put("key1", "val1"); map.put("key2", 123); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/JacksonJsonMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/JacksonJsonMessageConverterTests.java index de42d6144c1..8d073d397bf 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/JacksonJsonMessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/JacksonJsonMessageConverterTests.java @@ -123,7 +123,7 @@ class JacksonJsonMessageConverterTests { } @Test // gh-22386 - public void fromMessageMatchingInstance() { + void fromMessageMatchingInstance() { MyBean myBean = new MyBean(); JacksonJsonMessageConverter converter = new JacksonJsonMessageConverter(); Message message = MessageBuilder.withPayload(myBean).build(); @@ -149,7 +149,7 @@ class JacksonJsonMessageConverterTests { } @Test // SPR-16252 - public void fromMessageToList() throws Exception { + void fromMessageToList() throws Exception { JacksonJsonMessageConverter converter = new JacksonJsonMessageConverter(); String payload = "[1, 2, 3, 4, 5, 6, 7, 8, 9]"; Message message = MessageBuilder.withPayload(payload.getBytes(StandardCharsets.UTF_8)).build(); @@ -163,7 +163,7 @@ class JacksonJsonMessageConverterTests { } @Test // SPR-16486 - public void fromMessageToMessageWithPojo() throws Exception { + void fromMessageToMessageWithPojo() throws Exception { JacksonJsonMessageConverter converter = new JacksonJsonMessageConverter(); String payload = "{\"string\":\"foo\"}"; Message message = MessageBuilder.withPayload(payload.getBytes(StandardCharsets.UTF_8)).build(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java index 1325e958f4b..0e5ad643549 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java @@ -123,7 +123,7 @@ class MappingJackson2MessageConverterTests { } @Test // gh-22386 - public void fromMessageMatchingInstance() { + void fromMessageMatchingInstance() { MyBean myBean = new MyBean(); MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(); Message message = MessageBuilder.withPayload(myBean).build(); @@ -149,7 +149,7 @@ class MappingJackson2MessageConverterTests { } @Test // SPR-16252 - public void fromMessageToList() throws Exception { + void fromMessageToList() throws Exception { MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(); String payload = "[1, 2, 3, 4, 5, 6, 7, 8, 9]"; Message message = MessageBuilder.withPayload(payload.getBytes(StandardCharsets.UTF_8)).build(); @@ -163,7 +163,7 @@ class MappingJackson2MessageConverterTests { } @Test // SPR-16486 - public void fromMessageToMessageWithPojo() throws Exception { + void fromMessageToMessageWithPojo() throws Exception { MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(); String payload = "{\"string\":\"foo\"}"; Message message = MessageBuilder.withPayload(payload.getBytes(StandardCharsets.UTF_8)).build(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java index e6acbe1c1c6..c0b3aea0245 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java @@ -139,7 +139,7 @@ class MessageConverterTests { } @Test // gh-29768 - public void toMessageDefaultContentType() { + void toMessageDefaultContentType() { DefaultContentTypeResolver resolver = new DefaultContentTypeResolver(); resolver.setDefaultMimeType(MimeTypeUtils.TEXT_PLAIN); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java index 7e3ee119d2e..c029cb05a5f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java @@ -74,7 +74,7 @@ class HeaderMethodArgumentResolverTests { } @Test // SPR-11326 - public void resolveArgumentNativeHeader() { + void resolveArgumentNativeHeader() { TestMessageHeaderAccessor headers = new TestMessageHeaderAccessor(); headers.setNativeHeader("param1", "foo"); Message message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java index c039af7c9d2..85011c76797 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java @@ -75,7 +75,7 @@ class HeaderMethodArgumentResolverTests { } @Test // SPR-11326 - public void resolveArgumentNativeHeader() throws Exception { + void resolveArgumentNativeHeader() throws Exception { TestMessageHeaderAccessor headers = new TestMessageHeaderAccessor(); headers.setNativeHeader("param1", "foo"); Message message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); 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 c4d0daf07dd..7e2b2fc2c13 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 @@ -219,7 +219,7 @@ class MessageMethodArgumentResolverTests { @Test // SPR-16486 @SuppressWarnings("removal") - public void resolveWithJacksonConverter() throws Exception { + void resolveWithJacksonConverter() throws Exception { Message inMessage = MessageBuilder.withPayload("{\"foo\":\"bar\"}").build(); MethodParameter parameter = new MethodParameter(this.method, 5); 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 a44f1910c57..ee21fc2c4ab 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 @@ -146,7 +146,7 @@ class InvocableHandlerMethodTests { } @Test // Based on SPR-13917 (spring-web) - public void invocationErrorMessage() { + void invocationErrorMessage() { this.resolvers.addResolver(new StubArgumentResolver(double.class)); Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0.0)).method(); assertThatIllegalStateException().isThrownBy(() -> diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java index 2f24deec29d..19f6dd8fcf6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java @@ -74,7 +74,7 @@ class MethodMessageHandlerTests { @Test @SuppressWarnings("unchecked") - public void bestMatch() throws NoSuchMethodException { + void bestMatch() throws NoSuchMethodException { TestMethodMessageHandler handler = new TestMethodMessageHandler(); TestController controller = new TestController(); handler.registerHandlerMethod(controller, @@ -96,7 +96,7 @@ class MethodMessageHandlerTests { @Test @SuppressWarnings("unchecked") - public void argumentResolution() { + void argumentResolution() { ArgumentResolverConfigurer configurer = new ArgumentResolverConfigurer(); configurer.addCustomResolver(new StubArgumentResolver(String.class, "foo")); @@ -118,7 +118,7 @@ class MethodMessageHandlerTests { @Test @SuppressWarnings("unchecked") - public void handleException() { + void handleException() { TestMethodMessageHandler handler = initMethodMessageHandler(TestController.class); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java index a06c6c56013..aad34a307e8 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java @@ -29,7 +29,6 @@ import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Single; import io.rsocket.Payload; import io.rsocket.metadata.WellKnownMimeType; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -56,23 +55,15 @@ class DefaultRSocketRequesterTests { private static final Duration MILLIS_10 = Duration.ofMillis(10); - private TestRSocket rsocket; - - private RSocketRequester requester; - private final RSocketStrategies strategies = RSocketStrategies.create(); + private final TestRSocket rsocket = new TestRSocket(); - @BeforeEach - void setUp() { - this.rsocket = new TestRSocket(); - this.requester = RSocketRequester.wrap(this.rsocket, TEXT_PLAIN, TEXT_PLAIN, this.strategies); - } + private final RSocketRequester requester = RSocketRequester.wrap(this.rsocket, TEXT_PLAIN, TEXT_PLAIN, this.strategies); @Test void sendMono() { - // data(Object) testSendMono(spec -> spec.data("bodyA"), "bodyA"); testSendMono(spec -> spec.data(Mono.delay(MILLIS_10).map(l -> "bodyA")), "bodyA"); @@ -141,8 +132,7 @@ class DefaultRSocketRequesterTests { } @Test - void testSendWithAsyncMetadata() { - + void sendWithAsyncMetadata() { MimeType compositeMimeType = MimeTypeUtils.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_COMPOSITE_METADATA.getString()); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java index 9e9934087cb..c4c68689de0 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java @@ -167,7 +167,7 @@ class RSocketClientToServerIntegrationTests { } @Test // gh-26344 - public void echoChannelWithEmptyInput() { + void echoChannelWithEmptyInput() { Flux result = requester.route("echo-channel-empty").data(Flux.empty()).retrieveFlux(String.class); StepVerifier.create(result).verifyComplete(); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java index 2788b922550..e5c1fa771b2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java @@ -87,7 +87,7 @@ class SimpMessagingTemplateTests { } @Test // gh-23836 - public void convertAndSendToUserWithInvalidSequence() { + void convertAndSendToUserWithInvalidSequence() { assertThatIllegalArgumentException().isThrownBy(() -> this.messagingTemplate.convertAndSendToUser("joe%2F", "/queue/foo", "data")); } 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 9a921e3fed2..058be016622 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 @@ -261,7 +261,7 @@ public class SendToMethodReturnValueHandlerTests { } @Test // SPR-14238 - public void sendToUserWithSendToDefaultOverride() throws Exception { + void sendToUserWithSendToDefaultOverride() throws Exception { given(this.messageChannel.send(any(Message.class))).willReturn(true); Class clazz = SendToUserWithSendToOverrideTestBean.class; @@ -277,7 +277,7 @@ public class SendToMethodReturnValueHandlerTests { } @Test // SPR-14238 - public void sendToUserWithSendToOverride() throws Exception { + void sendToUserWithSendToOverride() throws Exception { given(this.messageChannel.send(any(Message.class))).willReturn(true); Class clazz = SendToUserWithSendToOverrideTestBean.class; @@ -377,7 +377,7 @@ public class SendToMethodReturnValueHandlerTests { } @Test - void testHeadersToSend() throws Exception { + void headersToSend() throws Exception { Message message = createMessage("sess1", "sub1", "/app", "/dest", null); SimpMessageSendingOperations messagingTemplate = mock(); @@ -453,7 +453,7 @@ public class SendToMethodReturnValueHandlerTests { } @Test // SPR-12170 - public void sendToWithDestinationPlaceholders() throws Exception { + void sendToWithDestinationPlaceholders() throws Exception { given(this.messageChannel.send(any(Message.class))).willReturn(true); Map vars = new LinkedHashMap<>(1); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java index 484824e0ed2..da56d5593cf 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java @@ -112,7 +112,7 @@ public class SimpAnnotationMethodMessageHandlerTests { @Test @SuppressWarnings("unchecked") - public void headerArgumentResolution() { + void headerArgumentResolution() { Map headers = Collections.singletonMap("foo", "bar"); Message message = createMessage("/pre/headers", headers); this.messageHandler.registerHandler(this.testController); @@ -275,7 +275,7 @@ public class SimpAnnotationMethodMessageHandlerTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void completableFutureSuccess() { + void completableFutureSuccess() { Message emptyMessage = MessageBuilder.withPayload(new byte[0]).build(); given(this.channel.send(any(Message.class))).willReturn(true); given(this.converter.toMessage(any(), any(MessageHeaders.class))).willReturn(emptyMessage); @@ -308,7 +308,7 @@ public class SimpAnnotationMethodMessageHandlerTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void monoSuccess() { + void monoSuccess() { Message emptyMessage = MessageBuilder.withPayload(new byte[0]).build(); given(this.channel.send(any(Message.class))).willReturn(true); given(this.converter.toMessage(any(), any(MessageHeaders.class))).willReturn(emptyMessage); 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 e2148c66f27..5bf66bc25c9 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 @@ -117,7 +117,7 @@ class SubscriptionMethodReturnValueHandlerTests { } @Test - void testMessageSentToChannel() throws Exception { + void messageSentToChannel() throws Exception { given(this.messageChannel.send(any(Message.class))).willReturn(true); String sessionId = "sess1"; @@ -144,7 +144,7 @@ class SubscriptionMethodReturnValueHandlerTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - void testHeadersPassedToMessagingTemplate() throws Exception { + void headersPassedToMessagingTemplate() throws Exception { String sessionId = "sess1"; String subscriptionId = "subs1"; String destination = "/dest"; @@ -169,7 +169,7 @@ class SubscriptionMethodReturnValueHandlerTests { } @Test - void testJsonView() throws Exception { + void jsonView() throws Exception { given(this.messageChannel.send(any(Message.class))).willReturn(true); String sessionId = "sess1"; @@ -188,7 +188,7 @@ class SubscriptionMethodReturnValueHandlerTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - void testHeaderFilterSinglePredicate() throws Exception { + void headerFilterSinglePredicate() throws Exception { String sessionId = "sess1"; String subscriptionId = "subs1"; String destination = "/dest"; @@ -218,7 +218,7 @@ class SubscriptionMethodReturnValueHandlerTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - void testHeaderFilterMultiplePredicates() throws Exception { + void headerFilterMultiplePredicates() throws Exception { String sessionId = "sess1"; String subscriptionId = "subs1"; String destination = "/dest"; 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 588e461aa52..28fa521ade3 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 @@ -183,7 +183,7 @@ public class SimpleBrokerMessageHandlerTests { @Test @SuppressWarnings("rawtypes") - public void startAndStopWithHeartbeatValue() { + void startAndStopWithHeartbeatValue() { ScheduledFuture future = mock(); given(this.taskScheduler.scheduleWithFixedDelay(any(Runnable.class), eq(Duration.ofMillis(15000)))).willReturn(future); 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 a2e6b9b0837..57d18583821 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 @@ -483,13 +483,13 @@ class MessageBrokerConfigurationTests { } @Test // SPR-16275 - public void dotSeparatorWithBrokerSlashConvention() { + void dotSeparatorWithBrokerSlashConvention() { ApplicationContext context = loadConfig(DotSeparatorWithSlashBrokerConventionConfig.class); testDotSeparator(context, true); } @Test // SPR-16275 - public void dotSeparatorWithBrokerDotConvention() { + void dotSeparatorWithBrokerDotConvention() { ApplicationContext context = loadConfig(DotSeparatorWithDotBrokerConventionConfig.class); testDotSeparator(context, false); } 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 fea9dc4496e..88b9ce56a6e 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 @@ -115,7 +115,7 @@ public class DefaultStompSessionTests { } @Test // SPR-16844 - public void afterConnectedWithSpecificVersion() { + void afterConnectedWithSpecificVersion() { assertThat(this.session.isConnected()).isFalse(); this.connectHeaders.setAcceptVersion("1.1"); @@ -397,7 +397,7 @@ public class DefaultStompSessionTests { } @Test // gh-23358 - public void sendByteArray() { + void sendByteArray() { this.session.afterConnected(this.connection); assertThat(this.session.isConnected()).isTrue(); @@ -509,7 +509,7 @@ public class DefaultStompSessionTests { } @Test // SPR-15131 - public void unsubscribeWithCustomHeader() { + void unsubscribeWithCustomHeader() { this.session.afterConnected(this.connection); assertThat(this.session.isConnected()).isTrue(); @@ -633,7 +633,7 @@ public class DefaultStompSessionTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void receiptNotReceived() { + void receiptNotReceived() { TaskScheduler taskScheduler = mock(); this.session.afterConnected(this.connection); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/SplittingStompEncoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/SplittingStompEncoderTests.java index 0acf8b73124..45056e2db4a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/SplittingStompEncoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/SplittingStompEncoderTests.java @@ -40,7 +40,7 @@ public class SplittingStompEncoderTests { @Test - public void encodeFrameWithNoHeadersAndNoBody() { + void encodeFrameWithNoHeadersAndNoBody() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); List actual = splittingEncoder(null).encode(headers.getMessageHeaders(), EMPTY_PAYLOAD); @@ -49,7 +49,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithNoHeadersAndNoBodySplitTwoFrames() { + void encodeFrameWithNoHeadersAndNoBodySplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); List actual = splittingEncoder(7).encode(headers.getMessageHeaders(), EMPTY_PAYLOAD); @@ -58,7 +58,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithNoHeadersAndNoBodySplitMultipleFrames() { + void encodeFrameWithNoHeadersAndNoBodySplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); List actual = splittingEncoder(3).encode(headers.getMessageHeaders(), EMPTY_PAYLOAD); @@ -67,7 +67,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeaders() { + void encodeFrameWithHeaders() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT); headers.setAcceptVersion("1.2"); headers.setHost("github.org"); @@ -84,7 +84,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersSplitTwoFrames() { + void encodeFrameWithHeadersSplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT); headers.setAcceptVersion("1.2"); headers.setHost("github.org"); @@ -98,7 +98,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersSplitMultipleFrames() { + void encodeFrameWithHeadersSplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT); headers.setAcceptVersion("1.2"); headers.setHost("github.org"); @@ -115,7 +115,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersThatShouldBeEscaped() { + void encodeFrameWithHeadersThatShouldBeEscaped() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\"); @@ -127,7 +127,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersThatShouldBeEscapedSplitTwoFrames() { + void encodeFrameWithHeadersThatShouldBeEscapedSplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\"); @@ -140,7 +140,7 @@ public class SplittingStompEncoderTests { @Test - public void encodeFrameWithHeadersThatShouldBeEscapedSplitMultipleFrames() { + void encodeFrameWithHeadersThatShouldBeEscapedSplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\"); @@ -153,7 +153,7 @@ public class SplittingStompEncoderTests { @Test - public void encodeFrameWithHeadersBody() { + void encodeFrameWithHeadersBody() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "alpha"); @@ -165,7 +165,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersBodySplitTwoFrames() { + void encodeFrameWithHeadersBodySplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "alpha"); @@ -177,7 +177,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithHeadersBodySplitMultipleFrames() { + void encodeFrameWithHeadersBodySplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "alpha"); @@ -189,7 +189,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithContentLengthPresent() { + void encodeFrameWithContentLengthPresent() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.setContentLength(12); @@ -201,7 +201,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithContentLengthPresentSplitTwoFrames() { + void encodeFrameWithContentLengthPresentSplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.setContentLength(12); @@ -213,7 +213,7 @@ public class SplittingStompEncoderTests { } @Test - public void encodeFrameWithContentLengthPresentSplitMultipleFrames() { + void encodeFrameWithContentLengthPresentSplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.setContentLength(12); @@ -225,7 +225,7 @@ public class SplittingStompEncoderTests { } @Test - public void sameLengthAndBufferSizeLimit() { + void sameLengthAndBufferSizeLimit() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "1234"); @@ -237,7 +237,7 @@ public class SplittingStompEncoderTests { } @Test - public void lengthAndBufferSizeLimitExactlySplitTwoFrames() { + void lengthAndBufferSizeLimitExactlySplitTwoFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "1234"); @@ -249,7 +249,7 @@ public class SplittingStompEncoderTests { } @Test - public void lengthAndBufferSizeLimitExactlySplitMultipleFrames() { + void lengthAndBufferSizeLimitExactlySplitMultipleFrames() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND); headers.addNativeHeader("a", "1234"); @@ -261,7 +261,7 @@ public class SplittingStompEncoderTests { } @Test - public void bufferSizeLimitShouldBePositive() { + void bufferSizeLimitShouldBePositive() { assertThatThrownBy(() -> splittingEncoder(0)).isInstanceOf(IllegalArgumentException.class); assertThatThrownBy(() -> splittingEncoder(-1)).isInstanceOf(IllegalArgumentException.class); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java index 7d71e42a355..34aaf4d46d5 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java @@ -160,7 +160,7 @@ class StompDecoderTests { } @Test // gh-27722 - public void decodeFrameWithHeaderWithBackslashValue() { + void decodeFrameWithHeaderWithBackslashValue() { String accept = "accept-version:1.1\n"; String keyAndValueWithBackslash = "key:\\value\n"; @@ -183,7 +183,7 @@ class StompDecoderTests { } @Test // gh-23713 - public void decodeFramesWithExtraNewLines() { + void decodeFramesWithExtraNewLines() { String frame1 = "SEND\ndestination:test\n\nbody\0\n\n\n"; ByteBuffer buffer = ByteBuffer.wrap((frame1).getBytes()); @@ -207,7 +207,7 @@ class StompDecoderTests { } @Test // SPR-13111 - public void decodeFrameWithHeaderWithEmptyValue() { + void decodeFrameWithHeaderWithEmptyValue() { String accept = "accept-version:1.1\n"; String valuelessKey = "key:\n"; 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 c403a72537d..52993419af5 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 @@ -68,7 +68,7 @@ class DefaultUserDestinationResolverTests { } @Test // SPR-14044 - public void handleSubscribeForDestinationWithoutLeadingSlash() { + void handleSubscribeForDestinationWithoutLeadingSlash() { this.resolver.setRemoveLeadingSlash(true); TestPrincipal user = new TestPrincipal("joe"); @@ -81,7 +81,7 @@ class DefaultUserDestinationResolverTests { } @Test // SPR-11325 - public void handleSubscribeOneUserMultipleSessions() { + void handleSubscribeOneUserMultipleSessions() { TestSimpUser simpUser = new TestSimpUser("joe"); simpUser.addSessions(new TestSimpSession("123"), new TestSimpSession("456")); @@ -107,7 +107,7 @@ class DefaultUserDestinationResolverTests { } @Test // gh-23836 - public void handleSubscribeInvalidUserName() { + void handleSubscribeInvalidUserName() { TestPrincipal user = new TestPrincipal("joe%2F"); String sourceDestination = "/user/queue/foo"; @@ -138,7 +138,7 @@ class DefaultUserDestinationResolverTests { } @Test // SPR-14044 - public void handleMessageForDestinationWithDotSeparator() { + void handleMessageForDestinationWithDotSeparator() { this.resolver.setRemoveLeadingSlash(true); TestPrincipal user = new TestPrincipal("joe"); @@ -151,7 +151,7 @@ class DefaultUserDestinationResolverTests { } @Test // SPR-12444 - public void handleMessageToOtherUser() { + void handleMessageToOtherUser() { TestSimpUser otherSimpUser = new TestSimpUser("anna"); otherSimpUser.addSessions(new TestSimpSession("456")); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ErrorMessageTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ErrorMessageTests.java index 23dbd6f0c2f..d4faefd9caa 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ErrorMessageTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ErrorMessageTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ErrorMessageTests { @Test - void testToString() { + void toStringOutput() { ErrorMessage em = new ErrorMessage(new RuntimeException("foo")); String emString = em.toString(); assertThat(emString).doesNotContain("original"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java index 93936ff7605..e1adce504a2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java @@ -132,7 +132,7 @@ class MessageHeaderAccessorTests { } @Test - void testRemoveHeader() { + void removeHeader() { Message message = new GenericMessage<>("payload", Collections.singletonMap("foo", "bar")); MessageHeaderAccessor accessor = new MessageHeaderAccessor(message); accessor.removeHeader("foo"); @@ -141,7 +141,7 @@ class MessageHeaderAccessorTests { } @Test - void testRemoveHeaderEvenIfNull() { + void removeHeaderEvenIfNull() { Message message = new GenericMessage<>("payload", Collections.singletonMap("foo", null)); MessageHeaderAccessor accessor = new MessageHeaderAccessor(message); accessor.removeHeader("foo"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java index 0e87ef93b6c..3d2f6733b12 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java @@ -48,7 +48,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests { @Test - protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { + protected void entityManagerFactoryImplementsEntityManagerFactoryInfo() { assertThat(entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Person"); @@ -57,33 +57,33 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testStateClean() { + void stateClean() { assertThat(countRowsInTable("person")).as("Should be no people from previous transactions").isEqualTo(0); } @Test - void testJdbcTx1_1() { - testJdbcTx2(); + void jdbcTx1_1() { + jdbcTx2(); } @Test - void testJdbcTx1_2() { - testJdbcTx2(); + void jdbcTx1_2() { + jdbcTx2(); } @Test - void testJdbcTx1_3() { - testJdbcTx2(); + void jdbcTx1_3() { + jdbcTx2(); } @Test - void testJdbcTx2() { + void jdbcTx2() { assertThat(countRowsInTable("person")).as("Any previous tx must have been rolled back").isEqualTo(0); executeSqlScript("/org/springframework/orm/jpa/insertPerson.sql"); } @Test - void testEntityManagerProxyIsProxy() { + void entityManagerProxyIsProxy() { assertThat(Proxy.isProxyClass(sharedEntityManager.getClass())).isTrue(); Query q = sharedEntityManager.createQuery("select p from Person as p"); q.getResultList(); @@ -94,7 +94,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testBogusQuery() { + void bogusQuery() { assertThatRuntimeException().isThrownBy(() -> { Query query = sharedEntityManager.createQuery("It's raining toads"); // required in OpenJPA case @@ -103,7 +103,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testGetReferenceWhenNoRow() { + void getReferenceWhenNoRow() { assertThatException().isThrownBy(() -> { Person notThere = sharedEntityManager.getReference(Person.class, 666); // We may get here (as with Hibernate). Either behavior is valid: @@ -114,7 +114,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testLazyLoading() throws Exception { + void lazyLoading() throws Exception { try { Person tony = new Person(); tony.setFirstName("Tony"); @@ -151,7 +151,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test @SuppressWarnings("unchecked") - public void testMultipleResults() { + protected void multipleResults() { // Add with JDBC String firstName = "Tony"; insertPerson(firstName); @@ -170,17 +170,17 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testEntityManagerProxyRejectsProgrammaticTxManagement() { + void entityManagerProxyRejectsProgrammaticTxManagement() { assertThatIllegalStateException().as("Should not be able to create transactions on container managed EntityManager") .isThrownBy(sharedEntityManager::getTransaction); } @Test - void testInstantiateAndSaveWithSharedEmProxy() { - testInstantiateAndSave(sharedEntityManager); + void instantiateAndSaveWithSharedEmProxy() { + instantiateAndSave(sharedEntityManager); } - protected void testInstantiateAndSave(EntityManager em) { + protected void instantiateAndSave(EntityManager em) { assertThat(countRowsInTable("person")).as("Should be no people from previous transactions").isEqualTo(0); Person p = new Person(); p.setFirstName("Tony"); @@ -193,7 +193,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test @SuppressWarnings("unchecked") - public void testQueryNoPersons() { + protected void queryNoPersons() { EntityManager em = entityManagerFactory.createEntityManager(); Query q = em.createQuery("select p from Person as p"); List people = q.getResultList(); @@ -203,7 +203,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test @SuppressWarnings("unchecked") - public void testQueryNoPersonsNotTransactional() { + protected void queryNoPersonsNotTransactional() { endTransaction(); EntityManager em = entityManagerFactory.createEntityManager(); @@ -215,7 +215,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test @SuppressWarnings("unchecked") - public void testQueryNoPersonsShared() { + protected void queryNoPersonsShared() { Query q = this.sharedEntityManager.createQuery("select p from Person as p"); q.setFlushMode(FlushModeType.AUTO); List people = q.getResultList(); @@ -225,7 +225,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test @SuppressWarnings("unchecked") - public void testQueryNoPersonsSharedNotTransactional() { + protected void queryNoPersonsSharedNotTransactional() { endTransaction(); EntityManager em = this.sharedEntityManager; @@ -243,7 +243,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests } @Test - void testCanSerializeProxies() throws Exception { + void canSerializeProxies() throws Exception { assertThat(SerializationTestUtils.serializeAndDeserialize(entityManagerFactory)).isNotNull(); assertThat(SerializationTestUtils.serializeAndDeserialize(sharedEntityManager)).isNotNull(); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java index 1b645ae1a93..df133dcd0a5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java @@ -41,7 +41,7 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana @Test @SuppressWarnings("unchecked") - public void testEntityManagerProxyIsProxy() { + void entityManagerProxyIsProxy() { EntityManager em = entityManagerFactory.createEntityManager(); assertThat(Proxy.isProxyClass(em.getClass())).isTrue(); Query q = em.createQuery("select p from Person as p"); @@ -54,20 +54,20 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana } @Test - void testEntityManagerProxyAcceptsProgrammaticTxJoining() { + void entityManagerProxyAcceptsProgrammaticTxJoining() { EntityManager em = entityManagerFactory.createEntityManager(); em.joinTransaction(); } @Test - void testInstantiateAndSave() { + void instantiateAndSave() { EntityManager em = entityManagerFactory.createEntityManager(); em.joinTransaction(); doInstantiateAndSave(em); } @Test - void testCannotFlushWithoutGettingTransaction() { + void cannotFlushWithoutGettingTransaction() { EntityManager em = entityManagerFactory.createEntityManager(); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy(() -> doInstantiateAndSave(em)); @@ -80,8 +80,8 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana setComplete(); } - protected void doInstantiateAndSave(EntityManager em) { - testStateClean(); + void doInstantiateAndSave(EntityManager em) { + stateClean(); Person p = new Person(); p.setFirstName("Tony"); @@ -93,12 +93,12 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana } @Test - void testStateClean() { + void stateClean() { assertThat(countRowsInTable("person")).as("Should be no people from previous transactions").isEqualTo(0); } @Test - void testReuseInNewTransaction() { + void reuseInNewTransaction() { EntityManager em = entityManagerFactory.createEntityManager(); em.joinTransaction(); @@ -134,7 +134,7 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana } @Test - void testRollbackOccurs() { + void rollbackOccurs() { EntityManager em = entityManagerFactory.createEntityManager(); em.joinTransaction(); doInstantiateAndSave(em); @@ -143,7 +143,7 @@ class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityMana } @Test - void testCommitOccurs() { + void commitOccurs() { EntityManager em = entityManagerFactory.createEntityManager(); em.joinTransaction(); doInstantiateAndSave(em); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java index 0cfc5befa92..f7cf2644380 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java @@ -48,17 +48,17 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage @Test - void testExceptionTranslationWithDialectFoundOnIntroducedEntityManagerInfo() throws Exception { + void exceptionTranslationWithDialectFoundOnIntroducedEntityManagerInfo() throws Exception { doTestExceptionTranslationWithDialectFound(((EntityManagerFactoryInfo) entityManagerFactory).getJpaDialect()); } @Test - void testExceptionTranslationWithDialectFoundOnEntityManagerFactoryBean() throws Exception { + void exceptionTranslationWithDialectFoundOnEntityManagerFactoryBean() throws Exception { assertThat(entityManagerFactoryBean.getJpaDialect()).as("Dialect must have been set").isNotNull(); doTestExceptionTranslationWithDialectFound(entityManagerFactoryBean); } - protected void doTestExceptionTranslationWithDialectFound(PersistenceExceptionTranslator pet) { + void doTestExceptionTranslationWithDialectFound(PersistenceExceptionTranslator pet) { RuntimeException in1 = new RuntimeException("in1"); PersistenceException in2 = new PersistenceException(); assertThat(pet.translateExceptionIfPossible(in1)).as("No translation here").isNull(); @@ -69,7 +69,7 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage @Test @SuppressWarnings("unchecked") - public void testEntityManagerProxyIsProxy() { + void entityManagerProxyIsProxy() { EntityManager em = createContainerManagedEntityManager(); assertThat(Proxy.isProxyClass(em.getClass())).isTrue(); Query q = em.createQuery("select p from Person as p"); @@ -84,7 +84,7 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage // This would be legal, at least if not actually _starting_ a tx @Test - void testEntityManagerProxyRejectsProgrammaticTxManagement() { + void entityManagerProxyRejectsProgrammaticTxManagement() { assertThatIllegalStateException().isThrownBy( createContainerManagedEntityManager()::getTransaction); } @@ -94,24 +94,24 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage * We take the view that this is a valid no op. */ @Test - void testContainerEntityManagerProxyAllowsJoinTransactionInTransaction() { + void containerEntityManagerProxyAllowsJoinTransactionInTransaction() { createContainerManagedEntityManager().joinTransaction(); } @Test - void testContainerEntityManagerProxyRejectsJoinTransactionWithoutTransaction() { + void containerEntityManagerProxyRejectsJoinTransactionWithoutTransaction() { endTransaction(); assertThatExceptionOfType(TransactionRequiredException.class).isThrownBy( createContainerManagedEntityManager()::joinTransaction); } @Test - void testInstantiateAndSave() { + void instantiateAndSave() { EntityManager em = createContainerManagedEntityManager(); doInstantiateAndSave(em); } - protected void doInstantiateAndSave(EntityManager em) { + private void doInstantiateAndSave(EntityManager em) { assertThat(countRowsInTable(em, "person")).as("Should be no people from previous transactions").isEqualTo(0); Person p = new Person(); @@ -124,7 +124,7 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage } @Test - void testReuseInNewTransaction() { + void reuseInNewTransaction() { EntityManager em = createContainerManagedEntityManager(); doInstantiateAndSave(em); endTransaction(); @@ -146,7 +146,7 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage } @Test - void testRollbackOccurs() { + void rollbackOccurs() { EntityManager em = createContainerManagedEntityManager(); doInstantiateAndSave(em); endTransaction(); // Should roll back @@ -154,7 +154,7 @@ class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManage } @Test - void testCommitOccurs() { + void commitOccurs() { EntityManager em = createContainerManagedEntityManager(); doInstantiateAndSave(em); setComplete(); 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 a460f309ee1..477074d3580 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 @@ -42,7 +42,7 @@ class DefaultJpaDialectTests { @Test - void testDefaultBeginTransaction() throws Exception { + void defaultBeginTransaction() throws Exception { TransactionDefinition definition = new DefaultTransactionDefinition(); EntityManager entityManager = mock(); EntityTransaction entityTx = mock(); @@ -52,7 +52,7 @@ class DefaultJpaDialectTests { } @Test - void testCustomIsolationLevel() { + void customIsolationLevel() { DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ); @@ -61,7 +61,7 @@ class DefaultJpaDialectTests { } @Test - void testTranslateException() { + void translateException() { PersistenceException ex = new OptimisticLockException(); assertThat(dialect.translateExceptionIfPossible(ex)) .isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java index a852eaae41f..c854256b097 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify; class EntityManagerFactoryBeanSupportTests extends AbstractEntityManagerFactoryBeanTests { @Test - void testHookIsCalled() { + void hookIsCalled() { DummyEntityManagerFactoryBean demf = new DummyEntityManagerFactoryBean(mockEmf); demf.afterPropertiesSet(); 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 01849d7d1a0..c85d636b07c 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 @@ -52,7 +52,7 @@ class EntityManagerFactoryUtilsTests { * 'org.springframework.orm.jpa.EntityManagerFactoryUtils.doGetEntityManager(EntityManagerFactory)' */ @Test - void testDoGetEntityManager() { + void doGetEntityManager() { // test null assertion assertThatIllegalArgumentException().isThrownBy(() -> EntityManagerFactoryUtils.doGetTransactionalEntityManager(null, null)); @@ -64,7 +64,7 @@ class EntityManagerFactoryUtilsTests { } @Test - void testDoGetEntityManagerWithTx() { + void doGetEntityManagerWithTx() { try { EntityManagerFactory factory = mock(); EntityManager manager = mock(); @@ -84,7 +84,7 @@ class EntityManagerFactoryUtilsTests { } @Test - void testTranslatesIllegalStateException() { + void translatesIllegalStateException() { IllegalStateException ise = new IllegalStateException(); DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ise); assertThat(dex.getCause()).isSameAs(ise); @@ -92,7 +92,7 @@ class EntityManagerFactoryUtilsTests { } @Test - void testTranslatesIllegalArgumentException() { + void translatesIllegalArgumentException() { IllegalArgumentException iae = new IllegalArgumentException(); DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(iae); assertThat(dex.getCause()).isSameAs(iae); @@ -103,7 +103,7 @@ class EntityManagerFactoryUtilsTests { * We do not convert unknown exceptions. They may result from user code. */ @Test - void testDoesNotTranslateUnfamiliarException() { + void doesNotTranslateUnfamiliarException() { UnsupportedOperationException userRuntimeException = new UnsupportedOperationException(); assertThat(EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(userRuntimeException)).as("Exception should not be wrapped").isNull(); } @@ -114,7 +114,7 @@ class EntityManagerFactoryUtilsTests { */ @Test @SuppressWarnings("serial") - public void testConvertJpaPersistenceException() { + void convertJpaPersistenceException() { EntityNotFoundException entityNotFound = new EntityNotFoundException(); assertThat(EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(entityNotFound).getClass()).isSameAs(JpaObjectRetrievalFailureException.class); 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 604d0f8c8bf..5337299ba6b 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 @@ -81,7 +81,7 @@ class JpaTransactionManagerTests { @Test - void testTransactionCommit() { + void transactionCommit() { assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); @@ -101,7 +101,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionCommitWithRollbackException() { + void transactionCommitWithRollbackException() { given(tx.getRollbackOnly()).willReturn(true); willThrow(new RollbackException()).given(tx).commit(); @@ -129,7 +129,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollback() { + void transactionRollback() { given(tx.isActive()).willReturn(true); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -150,7 +150,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollbackWithAlreadyRolledBack() { + void transactionRollbackWithAlreadyRolledBack() { assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); @@ -168,7 +168,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollbackOnly() { + void transactionRollbackOnly() { given(tx.isActive()).willReturn(true); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -192,7 +192,7 @@ class JpaTransactionManagerTests { } @Test - void testParticipatingTransactionWithCommit() { + void participatingTransactionWithCommit() { assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); @@ -214,7 +214,7 @@ class JpaTransactionManagerTests { } @Test - void testParticipatingTransactionWithRollback() { + void participatingTransactionWithRollback() { given(tx.isActive()).willReturn(true); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -238,7 +238,7 @@ class JpaTransactionManagerTests { } @Test - void testParticipatingTransactionWithRollbackOnly() { + void participatingTransactionWithRollbackOnly() { given(tx.isActive()).willReturn(true); given(tx.getRollbackOnly()).willReturn(true); willThrow(new RollbackException()).given(tx).commit(); @@ -267,7 +267,7 @@ class JpaTransactionManagerTests { } @Test - void testParticipatingTransactionWithRequiresNew() { + void participatingTransactionWithRequiresNew() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -291,7 +291,7 @@ class JpaTransactionManagerTests { } @Test - void testParticipatingTransactionWithRequiresNewAndPrebound() { + void participatingTransactionWithRequiresNewAndPrebound() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -325,7 +325,7 @@ class JpaTransactionManagerTests { } @Test - void testPropagationSupportsAndRequiresNew() { + void propagationSupportsAndRequiresNew() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -351,7 +351,7 @@ class JpaTransactionManagerTests { } @Test - void testPropagationSupportsAndRequiresNewAndEarlyAccess() { + void propagationSupportsAndRequiresNewAndEarlyAccess() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -379,7 +379,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionWithRequiresNewInAfterCompletion() { + void transactionWithRequiresNewInAfterCompletion() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); EntityManager manager2 = mock(); @@ -419,7 +419,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionCommitWithPropagationSupports() { + void transactionCommitWithPropagationSupports() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -442,7 +442,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollbackWithPropagationSupports() { + void transactionRollbackWithPropagationSupports() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -465,7 +465,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionCommitWithPrebound() { + void transactionCommitWithPrebound() { assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager)); @@ -491,7 +491,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollbackWithPrebound() { + void transactionRollbackWithPrebound() { given(tx.isActive()).willReturn(true); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -520,7 +520,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionCommitWithPreboundAndPropagationSupports() { + void transactionCommitWithPreboundAndPropagationSupports() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -548,7 +548,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionRollbackWithPreboundAndPropagationSupports() { + void transactionRollbackWithPreboundAndPropagationSupports() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -577,7 +577,7 @@ class JpaTransactionManagerTests { } @Test - void testInvalidIsolation() { + void invalidIsolation() { tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); assertThatExceptionOfType(InvalidIsolationLevelException.class).isThrownBy(() -> @@ -587,7 +587,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionTimeout() { + void transactionTimeout() { tt.setTimeout(1000); tt.executeWithoutResult(status -> {}); @@ -596,7 +596,7 @@ class JpaTransactionManagerTests { } @Test - void testTransactionFlush() { + void transactionFlush() { assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index fa1d0aab34c..238576c8bbe 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -32,13 +32,13 @@ import static org.assertj.core.api.Assertions.assertThat; class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { @Test - void testCanCastNativeEntityManagerFactoryToEclipseLinkEntityManagerFactoryImpl() { + void canCastNativeEntityManagerFactoryToEclipseLinkEntityManagerFactoryImpl() { EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getNativeEntityManagerFactory().getClass().getName()).endsWith("EntityManagerFactoryImpl"); } @Test - void testCanCastSharedEntityManagerProxyToEclipseLinkEntityManager() { + void canCastSharedEntityManagerProxyToEclipseLinkEntityManager() { assertThat(sharedEntityManager).isInstanceOf(JpaEntityManager.class); JpaEntityManager eclipselinkEntityManager = (JpaEntityManager) sharedEntityManager; assertThat(eclipselinkEntityManager.getActiveSession()).isNotNull(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactorySimpleIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactorySimpleIntegrationTests.java index bf742640803..28ad47ce216 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactorySimpleIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactorySimpleIntegrationTests.java @@ -33,8 +33,9 @@ class EclipseLinkEntityManagerFactorySimpleIntegrationTests extends EclipseLinkE "/org/springframework/orm/jpa/memdb.xml", "/org/springframework/orm/jpa/inject.xml"}; } + @Override @Test - protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { + protected void entityManagerFactoryImplementsEntityManagerFactoryInfo() { assertThat(entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Person"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java index 0f7a8fba6cd..e1ebecf7352 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java @@ -47,23 +47,23 @@ class HibernateEntityManagerFactoryIntegrationTests extends AbstractContainerEnt @Test - void testAdvisedEntityManagerProxyFromSmartFactoryBean() { + void advisedEntityManagerProxyFromSmartFactoryBean() { assertThat(AopUtils.isAopProxy(sharedEntityManager)).isTrue(); } @Test - void testCanCastNativeEntityManagerFactoryToHibernateEntityManagerFactoryImpl() { + void canCastNativeEntityManagerFactoryToHibernateEntityManagerFactoryImpl() { EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getNativeEntityManagerFactory()).isInstanceOf(SessionFactory.class); } @Test - void testCanCastSharedEntityManagerProxyToHibernateEntityManager() { + void canCastSharedEntityManagerProxyToHibernateEntityManager() { assertThat(((EntityManagerProxy) sharedEntityManager).getTargetEntityManager()).isInstanceOf(Session.class); } @Test - void testCanUnwrapAopProxy() { + void canUnwrapAopProxy() { EntityManager em = entityManagerFactory.createEntityManager(); EntityManager proxy = ProxyFactory.getProxy(EntityManager.class, new SingletonTargetSource(em)); assertThat(proxy.unwrap(Session.class)).isSameAs(em); @@ -71,7 +71,7 @@ class HibernateEntityManagerFactoryIntegrationTests extends AbstractContainerEnt } @Test // SPR-16956 - public void testReadOnly() { + void readOnly() { assertThat(sharedEntityManager.unwrap(Session.class).getHibernateFlushMode()).isSameAs(FlushMode.AUTO); assertThat(sharedEntityManager.unwrap(Session.class).isDefaultReadOnly()).isFalse(); endTransaction(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactorySimpleIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactorySimpleIntegrationTests.java index 9ff6a9b40b1..d19033506b4 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactorySimpleIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactorySimpleIntegrationTests.java @@ -33,8 +33,9 @@ class HibernateEntityManagerFactorySimpleIntegrationTests extends HibernateEntit "/org/springframework/orm/jpa/memdb.xml", "/org/springframework/orm/jpa/inject.xml"}; } + @Override @Test - protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { + protected void entityManagerFactoryImplementsEntityManagerFactoryInfo() { assertThat(entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Person"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java index 1ebb9949305..88a41b59358 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java @@ -38,7 +38,7 @@ class HibernateJpaDialectTests { @Test - void testTranslateException() { + void translateException() { // Plain JPA exception RuntimeException ex = new OptimisticLockException(); assertThat(dialect.translateExceptionIfPossible(ex)) diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java index 71e56f3da7c..c6c5fd5603c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java @@ -47,7 +47,7 @@ class HibernateMultiEntityManagerFactoryIntegrationTests extends AbstractContain @Override @Test - protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { + protected void entityManagerFactoryImplementsEntityManagerFactoryInfo() { assertThat(this.entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) this.entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Drivers"); @@ -56,7 +56,7 @@ class HibernateMultiEntityManagerFactoryIntegrationTests extends AbstractContain } @Test - void testEntityManagerFactory2() { + void entityManagerFactory2() { EntityManager em = this.entityManagerFactory2.createEntityManager(); try { assertThatIllegalArgumentException().isThrownBy(() -> diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java index 6e45ac277d6..7370b777fae 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java @@ -70,14 +70,14 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai @Test @Override - protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { + protected void entityManagerFactoryImplementsEntityManagerFactoryInfo() { assertThat(entityManagerFactory).as("Must not have introduced config interface") .isNotInstanceOf(EntityManagerFactoryInfo.class); } @Test @SuppressWarnings("unchecked") - public void testEntityListener() { + void entityListener() { String firstName = "Tony"; insertPerson(firstName); @@ -88,7 +88,7 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai } @Test - public void testCurrentSession() { + void currentSession() { String firstName = "Tony"; insertPerson(firstName); @@ -99,7 +99,7 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai } @Test - public void testSharedSession() { + void sharedSession() { String firstName = "Tony"; insertPerson(firstName); @@ -126,7 +126,7 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai } @Test - public void testStatelessSession() { + void statelessSession() { String firstName = "Tony"; insertPerson(firstName); @@ -151,7 +151,7 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai } @Test // SPR-16956 - public void testReadOnly() { + void readOnly() { assertThat(sessionFactory.getCurrentSession().getHibernateFlushMode()).isSameAs(FlushMode.AUTO); assertThat(sessionFactory.getCurrentSession().isDefaultReadOnly()).isFalse(); endTransaction(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java index 94a2a3af395..35db69e3c5e 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java @@ -71,7 +71,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests @Test - void testCanRetrieveBeanByTypeWithJpaCompliantOptions() { + void canRetrieveBeanByTypeWithJpaCompliantOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); @@ -87,7 +87,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveBeanByNameWithJpaCompliantOptions() { + void canRetrieveBeanByNameWithJpaCompliantOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); @@ -104,7 +104,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveBeanByTypeWithNativeOptions() { + void canRetrieveBeanByTypeWithNativeOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); @@ -132,7 +132,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveBeanByNameWithNativeOptions() { + void canRetrieveBeanByNameWithNativeOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); @@ -160,7 +160,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveFallbackBeanByTypeWithJpaCompliantOptions() { + void canRetrieveFallbackBeanByTypeWithJpaCompliantOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); NoDefinitionInSpringContextTestBeanInstanceProducer fallbackProducer = new NoDefinitionInSpringContextTestBeanInstanceProducer(); @@ -181,7 +181,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveFallbackBeanByNameWithJpaCompliantOptions() { + void canRetrieveFallbackBeanByNameWithJpaCompliantOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); NoDefinitionInSpringContextTestBeanInstanceProducer fallbackProducer = new NoDefinitionInSpringContextTestBeanInstanceProducer(); @@ -203,7 +203,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveFallbackBeanByTypeWithNativeOptions() { + void canRetrieveFallbackBeanByTypeWithNativeOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); NoDefinitionInSpringContextTestBeanInstanceProducer fallbackProducer = new NoDefinitionInSpringContextTestBeanInstanceProducer(); @@ -224,7 +224,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testCanRetrieveFallbackBeanByNameWithNativeOptions() { + void canRetrieveFallbackBeanByNameWithNativeOptions() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); NoDefinitionInSpringContextTestBeanInstanceProducer fallbackProducer = new NoDefinitionInSpringContextTestBeanInstanceProducer(); @@ -246,7 +246,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testFallbackExceptionInCaseOfNoSpringBeanFound() { + void fallbackExceptionInCaseOfNoSpringBeanFound() { assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> getBeanContainer().getBean(NoDefinitionInSpringContextTestBean.class, NativeLifecycleOptions.INSTANCE, IneffectiveBeanInstanceProducer.INSTANCE @@ -254,7 +254,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testOriginalExceptionInCaseOfFallbackProducerFailure() { + void originalExceptionInCaseOfFallbackProducerFailure() { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> getBeanContainer().getBean(AttributeConverter.class, NativeLifecycleOptions.INSTANCE, IneffectiveBeanInstanceProducer.INSTANCE @@ -262,7 +262,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testFallbackExceptionInCaseOfNoSpringBeanFoundByName() { + void fallbackExceptionInCaseOfNoSpringBeanFoundByName() { assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> getBeanContainer().getBean("some name", NoDefinitionInSpringContextTestBean.class, NativeLifecycleOptions.INSTANCE, IneffectiveBeanInstanceProducer.INSTANCE @@ -270,7 +270,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testOriginalExceptionInCaseOfFallbackProducerFailureByName() { + void originalExceptionInCaseOfFallbackProducerFailureByName() { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> getBeanContainer().getBean("invalid", AttributeConverter.class, NativeLifecycleOptions.INSTANCE, IneffectiveBeanInstanceProducer.INSTANCE @@ -278,7 +278,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests } @Test - void testRetrieveBeanShouldRetainOriginalBeanType() { + void retrieveBeanShouldRetainOriginalBeanType() { BeanContainer beanContainer = getBeanContainer(); assertThat(beanContainer).isNotNull(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java index f693018a469..5469469ab9a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThatRuntimeException; class PersistenceXmlParsingTests { @Test - void testMetaInfCase() throws Exception { + void metaInfCase() throws Exception { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/META-INF/persistence.xml"; @@ -66,7 +66,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample1() { + void example1() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-example1.xml"; @@ -80,7 +80,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample2() { + void example2() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-example2.xml"; @@ -98,7 +98,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample3() throws Exception { + void example3() throws Exception { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-example3.xml"; @@ -120,7 +120,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample4() throws Exception { + void example4() throws Exception { SimpleNamingContextBuilder builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder(); DataSource ds = new DriverManagerDataSource(); builder.bind("java:comp/env/jdbc/MyDB", ds); @@ -148,7 +148,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample5() throws Exception { + void example5() throws Exception { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-example5.xml"; @@ -171,7 +171,7 @@ class PersistenceXmlParsingTests { } @Test - void testExampleComplex() throws Exception { + void exampleComplex() throws Exception { DataSource ds = new DriverManagerDataSource(); String resource = "/org/springframework/orm/jpa/persistence-complex.xml"; @@ -229,7 +229,7 @@ class PersistenceXmlParsingTests { } @Test - void testExample6() { + void example6() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-example6.xml"; @@ -243,7 +243,7 @@ class PersistenceXmlParsingTests { @Disabled("not doing schema parsing anymore for JPA 2.0 compatibility") @Test - void testInvalidPersistence() { + void invalidPersistence() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-invalid.xml"; @@ -252,7 +252,7 @@ class PersistenceXmlParsingTests { @Disabled("not doing schema parsing anymore for JPA 2.0 compatibility") @Test - void testNoSchemaPersistence() { + void noSchemaPersistence() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-no-schema.xml"; @@ -260,7 +260,7 @@ class PersistenceXmlParsingTests { } @Test - void testPersistenceUnitRootUrl() throws Exception { + void persistenceUnitRootUrl() throws Exception { URL url = PersistenceUnitReader.determinePersistenceUnitRootUrl(new ClassPathResource("/org/springframework/orm/jpa/persistence-no-schema.xml")); assertThat(url).isNull(); @@ -270,7 +270,7 @@ class PersistenceXmlParsingTests { } @Test - void testPersistenceUnitRootUrlWithJar() throws Exception { + void persistenceUnitRootUrlWithJar() throws Exception { ClassPathResource archive = new ClassPathResource("/org/springframework/orm/jpa/jpa-archive.jar"); String newRoot = "jar:" + archive.getURL().toExternalForm() + "!/META-INF/persist.xml"; Resource insideArchive = new UrlResource(newRoot); @@ -281,7 +281,7 @@ class PersistenceXmlParsingTests { } @Test - void testJpa1ExcludeUnlisted() { + void jpa1ExcludeUnlisted() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-exclude-1.0.xml"; @@ -312,7 +312,7 @@ class PersistenceXmlParsingTests { } @Test - void testJpa2ExcludeUnlisted() { + void jpa2ExcludeUnlisted() { PersistenceUnitReader reader = new PersistenceUnitReader( new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); String resource = "/org/springframework/orm/jpa/persistence-exclude-2.0.xml"; 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 eb82a898aea..f60ba2e6838 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 @@ -90,7 +90,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewInterceptor() { + void openEntityManagerInViewInterceptor() { OpenEntityManagerInViewInterceptor interceptor = new OpenEntityManagerInViewInterceptor(); interceptor.setEntityManagerFactory(this.factory); @@ -126,7 +126,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewInterceptorAsyncScenario() throws Exception { + void openEntityManagerInViewInterceptorAsyncScenario() throws Exception { // Initial request thread @@ -183,7 +183,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewInterceptorAsyncTimeoutScenario() throws Exception { + void openEntityManagerInViewInterceptorAsyncTimeoutScenario() throws Exception { // Initial request thread @@ -223,7 +223,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewInterceptorAsyncErrorScenario() throws Exception { + void openEntityManagerInViewInterceptorAsyncErrorScenario() throws Exception { // Initial request thread @@ -263,7 +263,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewFilter() throws Exception { + void openEntityManagerInViewFilter() throws Exception { given(manager.isOpen()).willReturn(true); final EntityManagerFactory factory2 = mock(); @@ -317,7 +317,7 @@ class OpenEntityManagerInViewTests { } @Test - void testOpenEntityManagerInViewFilterAsyncScenario() throws Exception { + void openEntityManagerInViewFilterAsyncScenario() throws Exception { given(manager.isOpen()).willReturn(true); final EntityManagerFactory factory2 = mock(); 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 2570d3982e7..fb0a572287c 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 @@ -83,7 +83,7 @@ class PersistenceContextTransactionTests { @Test - void testTransactionCommitWithSharedEntityManager() { + void transactionCommitWithSharedEntityManager() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -97,7 +97,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithSharedEntityManagerAndPropagationSupports() { + void transactionCommitWithSharedEntityManagerAndPropagationSupports() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.execute(status -> { @@ -110,7 +110,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManager() { + void transactionCommitWithExtendedEntityManager() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -124,7 +124,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManagerAndPropagationSupports() { + void transactionCommitWithExtendedEntityManagerAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -138,7 +138,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithSharedEntityManagerUnsynchronized() { + void transactionCommitWithSharedEntityManagerUnsynchronized() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -152,7 +152,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithSharedEntityManagerUnsynchronizedAndPropagationSupports() { + void transactionCommitWithSharedEntityManagerUnsynchronizedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -167,7 +167,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManagerUnsynchronized() { + void transactionCommitWithExtendedEntityManagerUnsynchronized() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -181,7 +181,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManagerUnsynchronizedAndPropagationSupports() { + void transactionCommitWithExtendedEntityManagerUnsynchronizedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); @@ -195,7 +195,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoined() { + void transactionCommitWithSharedEntityManagerUnsynchronizedJoined() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -210,7 +210,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoined() { + void transactionCommitWithExtendedEntityManagerUnsynchronizedJoined() { given(manager.getTransaction()).willReturn(tx); tt.execute(status -> { @@ -225,7 +225,7 @@ class PersistenceContextTransactionTests { } @Test - void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoinedAndPropagationSupports() { + void transactionCommitWithExtendedEntityManagerUnsynchronizedJoinedAndPropagationSupports() { given(manager.isOpen()).willReturn(true); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java index 187647bd6ff..306dbb1deb7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionIntegrationTests.java @@ -40,12 +40,12 @@ class PersistenceInjectionIntegrationTests extends AbstractEntityManagerFactoryI @Test - void testDefaultPersistenceContextSetterInjection() { + void defaultPersistenceContextSetterInjection() { assertThat(defaultSetterInjected.getEntityManager()).isNotNull(); } @Test - void testSetterInjectionOfNamedPersistenceContext() { + void setterInjectionOfNamedPersistenceContext() { assertThat(namedSetterInjected.getEntityManagerFactory()).isNotNull(); } 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 08dea09e45a..ace5813b602 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 @@ -65,7 +65,7 @@ import static org.mockito.Mockito.withSettings; class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { @Test - void testPrivatePersistenceContextField() throws Exception { + void privatePersistenceContextField() throws Exception { mockEmf = mock(EntityManagerFactory.class, withSettings().serializable()); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -89,7 +89,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPrivateVendorSpecificPersistenceContextField() { + void privateVendorSpecificPersistenceContextField() { GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); gac.registerBeanDefinition("annotationProcessor", @@ -104,7 +104,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicExtendedPersistenceContextSetter() { + void publicExtendedPersistenceContextSetter() { EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); @@ -122,7 +122,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicSpecificExtendedPersistenceContextSetter() { + void publicSpecificExtendedPersistenceContextSetter() { EntityManagerFactory mockEmf2 = mock(); EntityManager mockEm2 = mock(); given(mockEmf2.createEntityManager()).willReturn(mockEm2); @@ -145,7 +145,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testInjectionIntoExistingObjects() { + void injectionIntoExistingObjects() { EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); @@ -165,7 +165,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicExtendedPersistenceContextSetterWithSerialization() throws Exception { + void publicExtendedPersistenceContextSetterWithSerialization() throws Exception { DummyInvocationHandler ih = new DummyInvocationHandler(); Object mockEm = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {EntityManager.class}, ih); given(mockEmf.createEntityManager()).willReturn((EntityManager) mockEm); @@ -194,7 +194,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { @Test @SuppressWarnings({"unchecked", "rawtypes"}) - public void testPublicExtendedPersistenceContextSetterWithEntityManagerInfoAndSerialization() throws Exception { + void publicExtendedPersistenceContextSetterWithEntityManagerInfoAndSerialization() throws Exception { EntityManager mockEm = mock(EntityManager.class, withSettings().serializable()); given(mockEm.isOpen()).willReturn(true); EntityManagerFactoryWithInfo mockEmf = mock(); @@ -218,7 +218,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicExtendedPersistenceContextSetterWithOverriding() { + void publicExtendedPersistenceContextSetterWithOverriding() { EntityManager mockEm2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); @@ -236,7 +236,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPrivatePersistenceUnitField() { + void privatePersistenceUnitField() { GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); gac.registerBeanDefinition("annotationProcessor", @@ -251,7 +251,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicPersistenceUnitSetter() { + void publicPersistenceUnitSetter() { GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); gac.registerBeanDefinition("annotationProcessor", @@ -266,7 +266,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicPersistenceUnitSetterWithOverriding() { + void publicPersistenceUnitSetterWithOverriding() { EntityManagerFactory mockEmf2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); @@ -284,7 +284,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() { + void publicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() { EntityManagerFactory mockEmf2 = mock(); GenericApplicationContext gac = new GenericApplicationContext(); @@ -309,7 +309,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPublicPersistenceUnitSetterWithMultipleUnitsIdentifiedThroughUnitName() { + void publicPersistenceUnitSetterWithMultipleUnitsIdentifiedThroughUnitName() { EntityManagerFactoryWithInfo mockEmf2 = mock(); given(mockEmf2.getPersistenceUnitName()).willReturn("Person"); @@ -334,7 +334,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPersistenceUnitsFromJndi() { + void persistenceUnitsFromJndi() { EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); @@ -376,7 +376,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPersistenceUnitsFromJndiWithDefaultUnit() { + void persistenceUnitsFromJndiWithDefaultUnit() { EntityManagerFactoryWithInfo mockEmf2 = mock(); Map persistenceUnits = new HashMap<>(); @@ -406,7 +406,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testSinglePersistenceUnitFromJndi() { + void singlePersistenceUnitFromJndi() { Map persistenceUnits = new HashMap<>(); persistenceUnits.put("Person", "pu1"); ExpectedLookupTemplate jt = new ExpectedLookupTemplate(); @@ -431,7 +431,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPersistenceContextsFromJndi() { + void persistenceContextsFromJndi() { EntityManager mockEm = mock(); EntityManager mockEm2 = mock(); EntityManager mockEm3 = mock(); @@ -471,7 +471,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPersistenceContextsFromJndiWithDefaultUnit() { + void persistenceContextsFromJndiWithDefaultUnit() { EntityManager mockEm = mock(); EntityManager mockEm2 = mock(); EntityManager mockEm3 = mock(); @@ -512,7 +512,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testSinglePersistenceContextFromJndi() { + void singlePersistenceContextFromJndi() { EntityManager mockEm = mock(); EntityManager mockEm2 = mock(); @@ -544,28 +544,28 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testFieldOfWrongTypeAnnotatedWithPersistenceUnit() { + void fieldOfWrongTypeAnnotatedWithPersistenceUnit() { PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor(); assertThatIllegalStateException().isThrownBy(() -> pabpp.postProcessProperties(null, new FieldOfWrongTypeAnnotatedWithPersistenceUnit(), "bean")); } @Test - void testSetterOfWrongTypeAnnotatedWithPersistenceUnit() { + void setterOfWrongTypeAnnotatedWithPersistenceUnit() { PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor(); assertThatIllegalStateException().isThrownBy(() -> pabpp.postProcessProperties(null, new SetterOfWrongTypeAnnotatedWithPersistenceUnit(), "bean")); } @Test - void testSetterWithNoArgs() { + void setterWithNoArgs() { PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor(); assertThatIllegalStateException().isThrownBy(() -> pabpp.postProcessProperties(null, new SetterWithNoArgs(), "bean")); } @Test - void testNoPropertiesPassedIn() { + void noPropertiesPassedIn() { EntityManager mockEm = mock(); given(mockEmf.createEntityManager()).willReturn(mockEm); @@ -576,7 +576,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPropertiesPassedIn() { + void propertiesPassedIn() { Properties props = new Properties(); props.put("foo", "bar"); EntityManager mockEm = mock(); @@ -590,7 +590,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPropertiesForTransactionalEntityManager() { + void propertiesForTransactionalEntityManager() { Properties props = new Properties(); props.put("foo", "bar"); EntityManager em = mock(); @@ -614,7 +614,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { * generate new EMs or not. */ @Test - void testPropertiesForSharedEntityManager1() { + void propertiesForSharedEntityManager1() { Properties props = new Properties(); props.put("foo", "bar"); EntityManager em = mock(); @@ -647,7 +647,7 @@ class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanTests { } @Test - void testPropertiesForSharedEntityManager2() { + void propertiesForSharedEntityManager2() { Properties props = new Properties(); props.put("foo", "bar"); EntityManager em = mock(); 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 a76a8cfc789..3a085105e75 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 @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; class SharedEntityManagerFactoryTests { @Test - void testValidUsage() { + void validUsage() { Object o = new Object(); EntityManager mockEm = mock(); 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 8bee995db43..0544c02cbb3 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 @@ -152,7 +152,7 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { } @Test - void testInvalidContextPath() { + void invalidContextPath() { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); marshaller.setContextPath("ab"); assertThatExceptionOfType(UncategorizedMappingException.class).isThrownBy(marshaller::afterPropertiesSet); 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 099ca1cadd0..2aa0600fc14 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 @@ -112,7 +112,7 @@ class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests @Test @Override @SuppressWarnings("unchecked") - public void unmarshalPartialStaxSourceXmlStreamReader() throws Exception { + protected void unmarshalPartialStaxSourceXmlStreamReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactory.newInstance(); XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(INPUT_STRING)); streamReader.nextTag(); // skip to flights @@ -125,7 +125,7 @@ class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests @Test @SuppressWarnings("unchecked") - public void unmarshalAnXmlReferringToAWrappedXmlElementDecl() throws Exception { + void unmarshalAnXmlReferringToAWrappedXmlElementDecl() throws Exception { // SPR-10714 unmarshaller = new Jaxb2Marshaller(); unmarshaller.setPackagesToScan("org.springframework.oxm.jaxb"); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerTests.java index bb4b55206e6..6b53539a785 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerTests.java @@ -82,7 +82,7 @@ class R2dbcTransactionManagerTests { @Test - void testSimpleTransaction() { + void simpleTransaction() { when(connectionMock.isAutoCommit()).thenReturn(false); AtomicInteger commits = new AtomicInteger(); when(connectionMock.commitTransaction()).thenReturn( @@ -114,7 +114,7 @@ class R2dbcTransactionManagerTests { } @Test - void testBeginFails() { + void beginFails() { reset(connectionFactoryMock); when(connectionFactoryMock.create()).thenReturn( Mono.error(new R2dbcBadGrammarException("fail"))); @@ -222,7 +222,7 @@ class R2dbcTransactionManagerTests { } @Test - void testCommitFails() { + void commitFails() { when(connectionMock.isAutoCommit()).thenReturn(false); when(connectionMock.commitTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Commit should fail")))); @@ -246,7 +246,7 @@ class R2dbcTransactionManagerTests { } @Test - void testRollback() { + void rollback() { when(connectionMock.isAutoCommit()).thenReturn(false); AtomicInteger commits = new AtomicInteger(); when(connectionMock.commitTransaction()).thenReturn( @@ -274,7 +274,7 @@ class R2dbcTransactionManagerTests { @Test @SuppressWarnings("unchecked") - void testRollbackFails() { + void rollbackFails() { when(connectionMock.rollbackTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Commit should fail"))), Mono.empty()); @@ -296,7 +296,7 @@ class R2dbcTransactionManagerTests { @Test @SuppressWarnings("unchecked") - void testConnectionReleasedWhenRollbackFails() { + void connectionReleasedWhenRollbackFails() { when(connectionMock.rollbackTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Rollback should fail"))), Mono.empty()); when(connectionMock.setTransactionIsolationLevel(any())).thenReturn(Mono.empty()); @@ -318,7 +318,7 @@ class R2dbcTransactionManagerTests { } @Test - void testCommitAndRollbackFails() { + void commitAndRollbackFails() { when(connectionMock.isAutoCommit()).thenReturn(false); when(connectionMock.commitTransaction()).thenReturn(Mono.defer(() -> Mono.error(new R2dbcBadGrammarException("Commit should fail")))); @@ -343,7 +343,7 @@ class R2dbcTransactionManagerTests { } @Test - void testTransactionSetRollbackOnly() { + void transactionSetRollbackOnly() { when(connectionMock.isAutoCommit()).thenReturn(false); when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty()); TestTransactionSynchronization sync = new TestTransactionSynchronization( @@ -380,7 +380,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationNeverWithExistingTransaction() { + void propagationNeverWithExistingTransaction() { when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty()); DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); @@ -407,7 +407,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationNestedWithExistingTransaction() { + void propagationNestedWithExistingTransaction() { when(connectionMock.createSavepoint(anyString())).thenReturn(Mono.empty()); when(connectionMock.rollbackTransactionToSavepoint(anyString())).thenReturn(Mono.empty()); when(connectionMock.releaseSavepoint(anyString())).thenReturn(Mono.empty()); @@ -535,7 +535,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationSupportsAndNested() { + void propagationSupportsAndNested() { when(connectionMock.commitTransaction()).thenReturn(Mono.empty()); DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); @@ -562,7 +562,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationSupportsAndNestedWithRollback() { + void propagationSupportsAndNestedWithRollback() { when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty()); DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); @@ -592,7 +592,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationSupportsAndRequiresNew() { + void propagationSupportsAndRequiresNew() { when(connectionMock.commitTransaction()).thenReturn(Mono.empty()); DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); @@ -619,7 +619,7 @@ class R2dbcTransactionManagerTests { } @Test - void testPropagationSupportsAndRequiresNewWithRollback() { + void propagationSupportsAndRequiresNewWithRollback() { when(connectionMock.rollbackTransaction()).thenReturn(Mono.empty()); DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java index fc261f7a731..b757a6bbc0b 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java @@ -90,7 +90,7 @@ class ScriptUtilsTests { } @Test // SPR-13218 - public void splitScriptWithSingleQuotesNestedInsideDoubleQuotes() { + void splitScriptWithSingleQuotesNestedInsideDoubleQuotes() { String statement1 = "select '1' as \"Dogbert's owner's\" from dual"; String statement2 = "select '2' as \"Dilbert's\" from dual"; @@ -103,7 +103,7 @@ class ScriptUtilsTests { } @Test // SPR-11560 - public void readAndSplitScriptWithMultipleNewlinesAsSeparator() { + void readAndSplitScriptWithMultipleNewlinesAsSeparator() { String script = readScript("db-test-data-multi-newline.sql"); List statements = splitSqlScript(script, "\n\n"); @@ -145,7 +145,7 @@ class ScriptUtilsTests { } @Test // SPR-10330 - public void readAndSplitScriptContainingCommentsWithLeadingTabs() { + void readAndSplitScriptContainingCommentsWithLeadingTabs() { String script = readScript("test-data-with-comments-and-leading-tabs.sql"); List statements = splitSqlScript(script, ";"); @@ -157,7 +157,7 @@ class ScriptUtilsTests { } @Test // SPR-9531 - public void readAndSplitScriptContainingMultiLineComments() { + void readAndSplitScriptContainingMultiLineComments() { String script = readScript("test-data-with-multi-line-comments.sql"); List statements = splitSqlScript(script, ";"); diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupTests.java index 2e224b3f18d..df4a526ef6d 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupTests.java @@ -74,7 +74,7 @@ class MapConnectionFactoryLookupTests { @Test @SuppressWarnings({"rawtypes", "unchecked"}) - public void getConnectionFactoryWhereSuppliedMapHasNonConnectionFactoryTypeUnderSpecifiedKey() { + void getConnectionFactoryWhereSuppliedMapHasNonConnectionFactoryTypeUnderSpecifiedKey() { Map connectionFactories = new HashMap<>(); connectionFactories.put(CONNECTION_FACTORY_NAME, new Object()); MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup(connectionFactories); diff --git a/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistrarIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistrarIntegrationTests.java index 24ab3233f53..b3cb20e8c6a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistrarIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistrarIntegrationTests.java @@ -69,7 +69,7 @@ class DynamicPropertyRegistrarIntegrationTests { } @Test - void testReceivesDynamicProperties(@Value("${api.url.1}") String apiUrl1, @Value("${api.url.2}") String apiUrl2) { + void receivesDynamicProperties(@Value("${api.url.1}") String apiUrl1, @Value("${api.url.2}") String apiUrl2) { assertApiUrlIsDynamic1(apiUrl1); assertApiUrlIsDynamic2(apiUrl2); } diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerListenerExecutionOrderTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerListenerExecutionOrderTests.java index 373d84f5cf0..b18c577b5e3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerListenerExecutionOrderTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerListenerExecutionOrderTests.java @@ -22,7 +22,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.springframework.util.ReflectionUtils; +import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -40,7 +40,7 @@ class TestContextManagerListenerExecutionOrderTests { private final TestContextManager testContextManager = new TestContextManager(TestCase.class); - private final Method testMethod = ReflectionUtils.findMethod(TestCase.class, "testMethod"); + private final Method testMethod = ClassUtils.getMethod(TestCase.class, "testMethod"); @Test @@ -105,7 +105,7 @@ class TestContextManagerListenerExecutionOrderTests { private static class TestCase { @SuppressWarnings("unused") - void testMethod() { + public void testMethod() { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerMethodInvokerTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerMethodInvokerTests.java index 25029631aab..2b73dfe0059 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerMethodInvokerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerMethodInvokerTests.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.junit.jupiter.api.Test; -import org.springframework.util.ReflectionUtils; +import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.context.MethodInvoker.DEFAULT_INVOKER; @@ -38,7 +38,7 @@ class TestContextManagerMethodInvokerTests { private final TestContextManager testContextManager = new TestContextManager(TestCase.class); - private final Method testMethod = ReflectionUtils.findMethod(TestCase.class, "testMethod"); + private final Method testMethod = ClassUtils.getMethod(TestCase.class, "testMethod"); @Test @@ -71,7 +71,7 @@ class TestContextManagerMethodInvokerTests { private static class TestCase { @SuppressWarnings("unused") - void testMethod() { + public void testMethod() { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/TestPropertySourceRuntimeHintsTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/TestPropertySourceRuntimeHintsTests.java index 71f9e697097..04f98db9888 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/TestPropertySourceRuntimeHintsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/TestPropertySourceRuntimeHintsTests.java @@ -47,7 +47,7 @@ class TestPropertySourceRuntimeHintsTests { @Test - void testPropertySourceWithClassPathStarLocationPattern() { + void propertySourceWithClassPathStarLocationPattern() { Class testClass = ClassPathStarLocationPatternTestCase.class; // We can effectively only assert that an exception is not thrown; however, @@ -63,7 +63,7 @@ class TestPropertySourceRuntimeHintsTests { } @Test - void testPropertySourceWithWildcardLocationPattern() { + void propertySourceWithWildcardLocationPattern() { Class testClass = WildcardLocationPatternTestCase.class; // We can effectively only assert that an exception is not thrown; however, diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanInheritanceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanInheritanceIntegrationTests.java index 9d8a2d1a429..ddbaa79fa4f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanInheritanceIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanInheritanceIntegrationTests.java @@ -141,13 +141,13 @@ public class TestBeanInheritanceIntegrationTests { } @Test // gh-34194, gh-34204 - void testBeanInSubclassOverridesTestBeanInSuperclass() { + void beanInSubclassOverridesTestBeanInSuperclass() { assertThat(ctx.getBean("enigmaBean")).as("applicationContext").hasToString("enigma in subclass"); assertThat(this.enigmaBean.value()).as("injection point").isEqualTo("enigma in subclass"); } @Test // gh-34194, gh-34204 - void testBeanInNestedClassOverridesTestBeanInEnclosingClass() { + void beanInNestedClassOverridesTestBeanInEnclosingClass() { assertThat(ctx.getBean("puzzleBean")).as("applicationContext").hasToString("puzzle in nested class"); assertThat(this.puzzleBean.value()).as("injection point").isEqualTo("puzzle in nested class"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanWithDirtiesContextBeforeMethodIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanWithDirtiesContextBeforeMethodIntegrationTests.java index 2a58a8d849a..80f350aceff 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanWithDirtiesContextBeforeMethodIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanWithDirtiesContextBeforeMethodIntegrationTests.java @@ -59,7 +59,7 @@ class TestBeanWithDirtiesContextBeforeMethodIntegrationTests { @RepeatedTest(2) @DirtiesContext(methodMode = BEFORE_METHOD) - void testOverride() { + void override() { assertThat(service).isSameAs(autowiredService); given(service.greeting()).willReturn("Spring"); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java index 4b7d8497d55..0b49fa12480 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java @@ -61,7 +61,7 @@ public class MockitoBeanAndScopedProxyIntegrationTests { } @Test - void testMocking() { + void mocking() { assertThat(serviceCaller.sayGreeting()).isEqualTo("I say mock"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithDirtiesContextBeforeMethodIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithDirtiesContextBeforeMethodIntegrationTests.java index 0a8160bf7f8..cf21b049311 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithDirtiesContextBeforeMethodIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithDirtiesContextBeforeMethodIntegrationTests.java @@ -56,7 +56,7 @@ class MockitoBeanWithDirtiesContextBeforeMethodIntegrationTests { @RepeatedTest(2) @DirtiesContext(methodMode = BEFORE_METHOD) - void testMocking() { + void mocking() { assertThat(service).isSameAs(autowiredService); given(service.greeting()).willReturn("Spring"); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java index 96d4a4aaa68..054a742be7b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanWithGenericsOnTestFieldForNewBeanIntegrationTests.java @@ -52,7 +52,7 @@ class MockitoBeanWithGenericsOnTestFieldForNewBeanIntegrationTests { @Test - void testMocking() { + void mocking() { given(stringService.greeting()).willReturn("Hello"); given(integerService.greeting()).willReturn(42); assertThat(caller.sayGreeting()).isEqualTo("I say Hello 42"); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithDirtiesContextBeforeMethodIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithDirtiesContextBeforeMethodIntegrationTests.java index b6492b05838..81151bd356b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithDirtiesContextBeforeMethodIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithDirtiesContextBeforeMethodIntegrationTests.java @@ -58,7 +58,7 @@ class MockitoSpyBeanWithDirtiesContextBeforeMethodIntegrationTests { @RepeatedTest(2) @DirtiesContext(methodMode = BEFORE_METHOD) - void testSpying() { + void spying() { assertThat(service).isSameAs(autowiredService); assertThat(caller.sayGreeting()).isEqualTo("I say simple"); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanIntegrationTests.java index 05eb1ae9397..22e450cafc4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanIntegrationTests.java @@ -53,7 +53,7 @@ class MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanIntegrationTest @Test - void testSpying() { + void spying() { assertThat(caller.sayGreeting()).isEqualTo("I say Enigma 123"); then(service).should().greeting(); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java index ad5f5bcd9f6..92eedc09192 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanProducedByFactoryBeanIntegrationTests.java @@ -54,7 +54,7 @@ class MockitoSpyBeanWithGenericsOnTestFieldForExistingGenericBeanProducedByFacto @Test - void testSpying() { + void spying() { assertIsSpy(exampleService); Object spiedInstance = mockingDetails(exampleService).getMockCreationSettings().getSpiedInstance(); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java index a268b2abac7..10d8e930f8c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests.java @@ -56,7 +56,7 @@ class MockitoSpyBeanWithMultipleExistingBeansAndOnePrimaryIntegrationTests { @Test - void testSpying() { + void spying() { assertIsSpy(spy); assertMockName(spy, "two"); 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 685b792c1b5..e9b2aee1981 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 @@ -54,7 +54,7 @@ class AotMergedContextConfigurationTests { @Test - void testEquals() { + void equals() { assertThat(aotMergedConfig1).isEqualTo(aotMergedConfig1); assertThat(aotMergedConfig1).isEqualTo(aotMergedConfig2); @@ -63,7 +63,7 @@ class AotMergedContextConfigurationTests { } @Test - void testHashCode() { + void hashCodeBehavior() { assertThat(aotMergedConfig1).hasSameHashCodeAs(aotMergedConfig2); assertThat(aotMergedConfig1).doesNotHaveSameHashCodeAs(mergedConfig); diff --git a/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java index cc050d5db9a..deaa2cb0780 100644 --- a/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/config/interfaces/DirtiesContextInterfaceTests.java @@ -95,7 +95,7 @@ class DirtiesContextInterfaceTests { @Test - public void verifyContextWasAutowired() { + void verifyContextWasAutowired() { assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull(); } diff --git a/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java b/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java index f420a712932..832cd78e26d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java @@ -56,7 +56,7 @@ public class CustomTestEventTests { } @Test - public void customTestEventPublished() { + void customTestEventPublished() { assertThat(events).hasSize(1); CustomEvent customEvent = events.get(0); assertThat(customEvent.getSource()).isEqualTo(getClass()); diff --git a/spring-test/src/test/java/org/springframework/test/context/event/DirtiesContextEventPublishingTests.java b/spring-test/src/test/java/org/springframework/test/context/event/DirtiesContextEventPublishingTests.java index 89c912bcf1f..2d98a2d929b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/DirtiesContextEventPublishingTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/DirtiesContextEventPublishingTests.java @@ -198,17 +198,17 @@ class DirtiesContextEventPublishingTests { static class Config { @BeforeTestClass - public void beforeTestClass(BeforeTestClassEvent e) { + void beforeTestClass(BeforeTestClassEvent e) { events.add(e.getClass()); } @PrepareTestInstance - public void prepareTestInstance(PrepareTestInstanceEvent e) { + void prepareTestInstance(PrepareTestInstanceEvent e) { events.add(e.getClass()); } @BeforeTestMethod - public void beforeTestMethod(BeforeTestMethodEvent e) { + void beforeTestMethod(BeforeTestMethodEvent e) { events.add(e.getClass()); } diff --git a/spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java b/spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java index 4b589903be5..982bc3f3c3e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java @@ -141,7 +141,7 @@ class EagerTestExecutionEventPublishingTests { static class Config { @BeforeTestClass - public void beforeTestClass(BeforeTestClassEvent e) { + void beforeTestClass(BeforeTestClassEvent e) { events.add(e.getClass()); } 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 7b6958225da..d6e9983df13 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 @@ -93,19 +93,19 @@ public class EventPublishingTestExecutionListenerIntegrationTests { } @Test - public void beforeTestClassAnnotation() throws Exception { + void beforeTestClassAnnotation() throws Exception { testContextManager.beforeTestClass(); verify(listener, only()).beforeTestClass(testContext); } @Test - public void prepareTestInstanceAnnotation() throws Exception { + void prepareTestInstanceAnnotation() throws Exception { testContextManager.prepareTestInstance(testInstance); verify(listener, only()).prepareTestInstance(testContext); } @Test - public void beforeTestMethodAnnotation() throws Exception { + void beforeTestMethodAnnotation() throws Exception { testContextManager.beforeTestMethod(testInstance, traceableTestMethod); verify(listener, only()).beforeTestMethod(testContext); } @@ -117,7 +117,7 @@ public class EventPublishingTestExecutionListenerIntegrationTests { * {@link ExampleTestCase#standardTest()} is not. */ @Test - public void beforeTestMethodAnnotationWithFailingCondition() throws Exception { + void beforeTestMethodAnnotationWithFailingCondition() throws Exception { Method standardTest = ReflectionUtils.findMethod(ExampleTestCase.class, "standardTest"); testContextManager.beforeTestMethod(testInstance, standardTest); verify(listener, never()).beforeTestMethod(testContext); @@ -128,8 +128,8 @@ public class EventPublishingTestExecutionListenerIntegrationTests { * should fail the test method. */ @Test - public void beforeTestMethodAnnotationWithFailingEventListener() throws Exception { - Method method = ReflectionUtils.findMethod(ExampleTestCase.class, "testWithFailingEventListener"); + void beforeTestMethodAnnotationWithFailingEventListener() throws Exception { + Method method = ReflectionUtils.findMethod(ExampleTestCase.class, "withFailingEventListener"); assertThatRuntimeException() .isThrownBy(() -> testContextManager.beforeTestMethod(testInstance, method)) .withMessageContaining("Boom!"); @@ -141,10 +141,10 @@ public class EventPublishingTestExecutionListenerIntegrationTests { * should not fail the test method. */ @Test - public void beforeTestMethodAnnotationWithFailingAsyncEventListener() throws Exception { + void beforeTestMethodAnnotationWithFailingAsyncEventListener() throws Exception { TrackingAsyncUncaughtExceptionHandler.asyncException = null; - String methodName = "testWithFailingAsyncEventListener"; + String methodName = "withFailingAsyncEventListener"; Method method = ReflectionUtils.findMethod(ExampleTestCase.class, methodName); testContextManager.beforeTestMethod(testInstance, method); @@ -157,25 +157,25 @@ public class EventPublishingTestExecutionListenerIntegrationTests { } @Test - public void beforeTestExecutionAnnotation() throws Exception { + void beforeTestExecutionAnnotation() throws Exception { testContextManager.beforeTestExecution(testInstance, traceableTestMethod); verify(listener, only()).beforeTestExecution(testContext); } @Test - public void afterTestExecutionAnnotation() throws Exception { + void afterTestExecutionAnnotation() throws Exception { testContextManager.afterTestExecution(testInstance, traceableTestMethod, null); verify(listener, only()).afterTestExecution(testContext); } @Test - public void afterTestMethodAnnotation() throws Exception { + void afterTestMethodAnnotation() throws Exception { testContextManager.afterTestMethod(testInstance, traceableTestMethod, null); verify(listener, only()).afterTestMethod(testContext); } @Test - public void afterTestClassAnnotation() throws Exception { + void afterTestClassAnnotation() throws Exception { testContextManager.afterTestClass(); verify(listener, only()).afterTestClass(testContext); } @@ -192,22 +192,22 @@ public class EventPublishingTestExecutionListenerIntegrationTests { @Traceable @Test - public void traceableTest() { + void traceableTest() { /* no-op */ } @Test - public void standardTest() { + void standardTest() { /* no-op */ } @Test - public void testWithFailingEventListener() { + void withFailingEventListener() { /* no-op */ } @Test - public void testWithFailingAsyncEventListener() { + void withFailingAsyncEventListener() { /* no-op */ } @@ -260,7 +260,7 @@ public class EventPublishingTestExecutionListenerIntegrationTests { listener().beforeTestMethod(e.getSource()); } - @BeforeTestMethod("event.testContext.testMethod.name == 'testWithFailingEventListener'") + @BeforeTestMethod("event.testContext.testMethod.name == 'withFailingEventListener'") public void beforeTestMethodWithFailure(BeforeTestMethodEvent event) throws Exception { listener().beforeTestMethod(event.getSource()); throw new RuntimeException("Boom!"); @@ -305,7 +305,7 @@ public class EventPublishingTestExecutionListenerIntegrationTests { this.listener = listener; } - @BeforeTestMethod("event.testContext.testMethod.name == 'testWithFailingAsyncEventListener'") + @BeforeTestMethod("event.testContext.testMethod.name == 'withFailingAsyncEventListener'") @Async public void beforeTestMethodWithAsyncFailure(BeforeTestMethodEvent event) throws Exception { this.listener.beforeTestMethod(event.getSource()); diff --git a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java index 80e950186b1..fc94b4ab735 100644 --- a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java @@ -49,7 +49,7 @@ class ExpressionUsageTests { @Test - void testSpr5906() { + void spr5906() { // verify the property values have been evaluated as expressions assertThat(props.getProperty("user.name")).isEqualTo("Dave"); assertThat(props.getProperty("username")).isEqualTo("Andy"); @@ -60,7 +60,7 @@ class ExpressionUsageTests { } @Test - void testSpr5847() { + void spr5847() { assertThat(andy2.getName()).isEqualTo("Andy"); assertThat(andy.getName()).isEqualTo("Andy"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerConfiguredViaMetaAnnotationTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerConfiguredViaMetaAnnotationTests.java index 8a4facfab1c..afa1f583b99 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerConfiguredViaMetaAnnotationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerConfiguredViaMetaAnnotationTests.java @@ -66,7 +66,7 @@ public class InitializerConfiguredViaMetaAnnotationTests { @Test - public void beansFromInitializerAndComposedAnnotation() { + void beansFromInitializerAndComposedAnnotation() { assertThat(strings).hasSize(2); assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("bar"); diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerWithoutConfigFilesOrClassesTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerWithoutConfigFilesOrClassesTests.java index 229f39167cf..0ecd4953ff7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerWithoutConfigFilesOrClassesTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/InitializerWithoutConfigFilesOrClassesTests.java @@ -43,7 +43,7 @@ public class InitializerWithoutConfigFilesOrClassesTests { @Test - public void foo() { + void foo() { assertThat(foo).isEqualTo("foo"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MergedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MergedInitializersAnnotationConfigTests.java index 4ecdee1adbc..e7b5e75970a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MergedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MergedInitializersAnnotationConfigTests.java @@ -37,7 +37,7 @@ public class MergedInitializersAnnotationConfigTests extends SingleInitializerAn @Override @Test - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("foo"); assertThat(baz).isEqualTo("dev profile config"); diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MultipleInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MultipleInitializersAnnotationConfigTests.java index 350bc447e59..ecc3c080cc2 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MultipleInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/MultipleInitializersAnnotationConfigTests.java @@ -43,7 +43,7 @@ public class MultipleInitializersAnnotationConfigTests { @Test - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("foo"); assertThat(baz).isEqualTo("dev profile config"); diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OrderedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OrderedInitializersAnnotationConfigTests.java index f79c5c7b89b..50c5171c900 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OrderedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OrderedInitializersAnnotationConfigTests.java @@ -61,7 +61,7 @@ public class OrderedInitializersAnnotationConfigTests { @Test - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo(PROFILE_GLOBAL); assertThat(bar).isEqualTo(PROFILE_GLOBAL); assertThat(baz).isEqualTo(PROFILE_TWO); @@ -74,12 +74,12 @@ public class OrderedInitializersAnnotationConfigTests { static class GlobalConfig { @Bean - public String foo() { + String foo() { return PROFILE_GLOBAL; } @Bean - public String bar() { + String bar() { return PROFILE_GLOBAL; } diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OverriddenInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OverriddenInitializersAnnotationConfigTests.java index 9039b18d28c..7fdcada6f81 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OverriddenInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/OverriddenInitializersAnnotationConfigTests.java @@ -37,7 +37,7 @@ public class OverriddenInitializersAnnotationConfigTests extends SingleInitializ @Test @Override - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo("foo"); assertThat(bar).isNull(); assertThat(baz).isEqualTo("dev profile config"); diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/PropertySourcesInitializerTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/PropertySourcesInitializerTests.java index bba356dcbec..59e4ccec956 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/PropertySourcesInitializerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/PropertySourcesInitializerTests.java @@ -63,7 +63,7 @@ public class PropertySourcesInitializerTests { @Test - public void customPropertySourceConfiguredViaContextInitializer() { + void customPropertySourceConfiguredViaContextInitializer() { assertThat(enigma).isEqualTo("foo"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/SingleInitializerAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/SingleInitializerAnnotationConfigTests.java index 4553bd5aec6..6834676a412 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/SingleInitializerAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/annotation/SingleInitializerAnnotationConfigTests.java @@ -49,7 +49,7 @@ public class SingleInitializerAnnotationConfigTests { @Test - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("foo"); assertThat(baz).isEqualTo("global config"); diff --git a/spring-test/src/test/java/org/springframework/test/context/initializers/xml/MultipleInitializersXmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/initializers/xml/MultipleInitializersXmlConfigTests.java index 413a5a8f9f3..f7015190c76 100644 --- a/spring-test/src/test/java/org/springframework/test/context/initializers/xml/MultipleInitializersXmlConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/initializers/xml/MultipleInitializersXmlConfigTests.java @@ -42,7 +42,7 @@ public class MultipleInitializersXmlConfigTests { @Test - public void activeBeans() { + void activeBeans() { assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("foo"); assertThat(baz).isEqualTo("dev profile config"); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java index ec3f77140c2..a30eea68378 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java @@ -90,7 +90,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests { // something else like an error in the @Configuration class, etc. if (getExpectedFailedCount(testClass) > 0) { events.assertThatEvents().haveExactly(1, - event(test("testNothing"), + event(test("dummyTest"), finishedWithFailure( instanceOf(AssertionError.class), message(msg -> msg.contains("always failing"))))); @@ -177,7 +177,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests { private abstract static class BaseTestCase { @Test - void testNothing() { + void dummyTest() { } } @@ -215,7 +215,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests { static class FailingBeforeTransactionTestCase { @Test - void testNothing() { + void dummyTest() { } @BeforeTransaction @@ -230,7 +230,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests { static class FailingAfterTransactionTestCase { @Test - void testNothing() { + void dummyTest() { } @AfterTransaction diff --git a/spring-test/src/test/java/org/springframework/test/context/litemode/AnnotatedConfigClassesWithoutAtConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/litemode/AnnotatedConfigClassesWithoutAtConfigurationTests.java index c0ed561e34b..cd57db70d93 100644 --- a/spring-test/src/test/java/org/springframework/test/context/litemode/AnnotatedConfigClassesWithoutAtConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/litemode/AnnotatedConfigClassesWithoutAtConfigurationTests.java @@ -84,7 +84,7 @@ class AnnotatedConfigClassesWithoutAtConfigurationTests { @Test - void testSPR_9051() { + void spr_9051() { assertThat(enigma).isNotNull(); assertThat(lifecycleBean).isNotNull(); assertThat(lifecycleBean.isInitialized()).isTrue(); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java index b613932a109..4301e94ac9c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java @@ -209,7 +209,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithInheritedConfig() { + void buildMergedConfigForNestedTestClassWithInheritedConfig() { Class testClass = OuterTestCase.NestedTestCaseWithInheritedConfig.class; Class[] expectedClasses = array(FooConfig.class); MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass); @@ -222,7 +222,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithMergedInheritedConfig() { + void buildMergedConfigForNestedTestClassWithMergedInheritedConfig() { Class testClass = OuterTestCase.NestedTestCaseWithMergedInheritedConfig.class; Class[] expectedClasses = array(FooConfig.class, BarConfig.class); MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass); @@ -235,7 +235,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithOverriddenConfig() { + void buildMergedConfigForNestedTestClassWithOverriddenConfig() { Class testClass = OuterTestCase.NestedTestCaseWithOverriddenConfig.class; Class[] expectedClasses = array(BarConfig.class); MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass); @@ -248,7 +248,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForDoubleNestedTestClassWithInheritedOverriddenConfig() { + void buildMergedConfigForDoubleNestedTestClassWithInheritedOverriddenConfig() { Class testClass = OuterTestCase.NestedTestCaseWithOverriddenConfig.DoubleNestedTestCaseWithInheritedOverriddenConfig.class; Class[] expectedClasses = array(BarConfig.class); MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass); @@ -261,7 +261,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForContextHierarchy() { + void buildMergedConfigForContextHierarchy() { Class testClass = ContextHierarchyOuterTestCase.class; Class[] expectedClasses = array(BarConfig.class); @@ -280,7 +280,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithInheritedConfigForContextHierarchy() { + void buildMergedConfigForNestedTestClassWithInheritedConfigForContextHierarchy() { Class enclosingTestClass = ContextHierarchyOuterTestCase.class; Class testClass = ContextHierarchyOuterTestCase.NestedTestCaseWithInheritedConfig.class; Class[] expectedClasses = array(BarConfig.class); @@ -300,7 +300,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithMergedInheritedConfigForContextHierarchy() { + void buildMergedConfigForNestedTestClassWithMergedInheritedConfigForContextHierarchy() { Class testClass = ContextHierarchyOuterTestCase.NestedTestCaseWithMergedInheritedConfig.class; Class[] expectedClasses = array(BarConfig.class, BazConfig.class); @@ -319,7 +319,7 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt * @since 5.3 */ @Test - public void buildMergedConfigForNestedTestClassWithOverriddenConfigForContextHierarchy() { + void buildMergedConfigForNestedTestClassWithOverriddenConfigForContextHierarchy() { Class testClass = ContextHierarchyOuterTestCase.NestedTestCaseWithOverriddenConfig.class; MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass); assertThat(mergedConfig).as("merged config").isNotNull(); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java index eda6d30d14d..89dea5c6e4d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java @@ -60,12 +60,12 @@ class TestConstructorUtilsTests { } @Test - void testConstructorAnnotation() throws Exception { + void constructorAnnotation() throws Exception { assertAutowirable(TestConstructorAnnotationTestCase.class); } @Test - void testConstructorAsMetaAnnotation() throws Exception { + void constructorAsMetaAnnotation() throws Exception { assertAutowirable(TestConstructorAsMetaAnnotationTestCase.class); } diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTestNGTests.java index 79a46607173..d62e8bc084b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTestNGTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTestNGTests.java @@ -146,7 +146,7 @@ class FailingBeforeAndAfterMethodsTestNGTests { abstract static class BaseTestCase extends AbstractTestNGSpringContextTests { @org.testng.annotations.Test - void testNothing() { + void nothing() { } } @@ -182,7 +182,7 @@ class FailingBeforeAndAfterMethodsTestNGTests { static class FailingBeforeTransactionTestCase extends AbstractTransactionalTestNGSpringContextTests { @org.testng.annotations.Test - void testNothing() { + void nothing() { } @BeforeTransaction @@ -195,7 +195,7 @@ class FailingBeforeAndAfterMethodsTestNGTests { static class FailingAfterTransactionTestCase extends AbstractTransactionalTestNGSpringContextTests { @org.testng.annotations.Test - void testNothing() { + void nothing() { } @AfterTransaction diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TestNGConcurrencyTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TestNGConcurrencyTests.java index add01dd5b81..64b63f78f8a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/TestNGConcurrencyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/TestNGConcurrencyTests.java @@ -58,52 +58,52 @@ class TestNGConcurrencyTests { static class ConcurrentTestCase extends AbstractTestNGSpringContextTests { @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message1") - public void message1() { + void message1() { throw new RuntimeException("Message1"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message2") - public void message2() { + void message2() { throw new RuntimeException("Message2"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message3") - public void message3() { + void message3() { throw new RuntimeException("Message3"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message4") - public void message4() { + void message4() { throw new RuntimeException("Message4"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message5") - public void message5() { + void message5() { throw new RuntimeException("Message5"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message6") - public void message6() { + void message6() { throw new RuntimeException("Message6"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message7") - public void message7() { + void message7() { throw new RuntimeException("Message7"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message8") - public void message8() { + void message8() { throw new RuntimeException("Message8"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message9") - public void message9() { + void message9() { throw new RuntimeException("Message9"); } @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Message10") - public void message10() { + void message10() { throw new RuntimeException("Message10"); } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java index 4a319729abc..990cdd9d396 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java @@ -43,7 +43,7 @@ public class ContentRequestMatchersTests { @Test - public void testContentType() throws Exception { + void contentType() throws Exception { this.request.getHeaders().setContentType(MediaType.APPLICATION_JSON); MockRestRequestMatchers.content().contentType("application/json").match(this.request); @@ -51,7 +51,7 @@ public class ContentRequestMatchersTests { } @Test - public void testContentTypeNoMatch1() { + void contentTypeNoMatch1() { this.request.getHeaders().setContentType(MediaType.APPLICATION_JSON); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -59,7 +59,7 @@ public class ContentRequestMatchersTests { } @Test - public void testContentTypeNoMatch2() { + void contentTypeNoMatch2() { this.request.getHeaders().setContentType(MediaType.APPLICATION_JSON); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -67,14 +67,14 @@ public class ContentRequestMatchersTests { } @Test - public void testString() throws Exception { + void string() throws Exception { this.request.getBody().write("test".getBytes()); MockRestRequestMatchers.content().string("test").match(this.request); } @Test - public void testStringNoMatch() throws Exception { + void stringNoMatch() throws Exception { this.request.getBody().write("test".getBytes()); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -82,7 +82,7 @@ public class ContentRequestMatchersTests { } @Test - public void testBytes() throws Exception { + void bytes() throws Exception { byte[] content = "test".getBytes(); this.request.getBody().write(content); @@ -90,7 +90,7 @@ public class ContentRequestMatchersTests { } @Test - public void testBytesNoMatch() throws Exception { + void bytesNoMatch() throws Exception { this.request.getBody().write("test".getBytes()); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -98,7 +98,7 @@ public class ContentRequestMatchersTests { } @Test - public void testFormData() throws Exception { + void formData() throws Exception { String contentType = "application/x-www-form-urlencoded;charset=UTF-8"; String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3"; @@ -114,7 +114,7 @@ public class ContentRequestMatchersTests { } @Test - public void testFormDataContains() throws Exception { + void formDataContains() throws Exception { String contentType = "application/x-www-form-urlencoded;charset=UTF-8"; String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3"; @@ -127,7 +127,7 @@ public class ContentRequestMatchersTests { } @Test - public void testMultipartData() throws Exception { + void multipartData() throws Exception { String contentType = "multipart/form-data;boundary=1234567890"; String body = """ --1234567890\r @@ -161,7 +161,7 @@ public class ContentRequestMatchersTests { } @Test - public void testMultipartDataContains() throws Exception { + void multipartDataContains() throws Exception { String contentType = "multipart/form-data;boundary=1234567890"; String body = """ --1234567890\r @@ -197,7 +197,7 @@ public class ContentRequestMatchersTests { } @Test - public void testXml() throws Exception { + void xml() throws Exception { String content = "bazbazz"; this.request.getBody().write(content.getBytes()); @@ -205,7 +205,7 @@ public class ContentRequestMatchersTests { } @Test - public void testXmlNoMatch() throws Exception { + void xmlNoMatch() throws Exception { this.request.getBody().write("11".getBytes()); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -213,7 +213,7 @@ public class ContentRequestMatchersTests { } @Test - public void testNodeMatcher() throws Exception { + void nodeMatcher() throws Exception { String content = "baz"; this.request.getBody().write(content.getBytes()); @@ -221,7 +221,7 @@ public class ContentRequestMatchersTests { } @Test - public void testNodeMatcherNoMatch() throws Exception { + void nodeMatcherNoMatch() throws Exception { String content = "baz"; this.request.getBody().write(content.getBytes()); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> @@ -229,7 +229,7 @@ public class ContentRequestMatchersTests { } @Test - public void testJsonLenientMatch() throws Exception { + void jsonLenientMatch() throws Exception { String content = "{\n \"foo array\":[\"first\",\"second\"] , \"someExtraProperty\": \"which is allowed\" \n}"; this.request.getBody().write(content.getBytes()); @@ -241,7 +241,7 @@ public class ContentRequestMatchersTests { @Test @Deprecated - public void testJsonLenientMatchWithDeprecatedBooleanFlag() throws Exception { + void jsonLenientMatchWithDeprecatedBooleanFlag() throws Exception { String content = "{\n \"foo array\":[\"first\",\"second\"] , \"someExtraProperty\": \"which is allowed\" \n}"; this.request.getBody().write(content.getBytes()); @@ -250,7 +250,7 @@ public class ContentRequestMatchersTests { } @Test - public void testJsonStrictMatch() throws Exception { + void jsonStrictMatch() throws Exception { String content = "{\n \"foo\": \"bar\", \"foo array\":[\"first\",\"second\"] \n}"; this.request.getBody().write(content.getBytes()); @@ -262,7 +262,7 @@ public class ContentRequestMatchersTests { @Test @Deprecated - public void testJsonStrictMatchWithDeprecatedBooleanFlag() throws Exception { + void jsonStrictMatchWithDeprecatedBooleanFlag() throws Exception { String content = "{\n \"foo\": \"bar\", \"foo array\":[\"first\",\"second\"] \n}"; this.request.getBody().write(content.getBytes()); @@ -273,7 +273,7 @@ public class ContentRequestMatchersTests { } @Test - public void testJsonLenientNoMatch() throws Exception { + void jsonLenientNoMatch() throws Exception { String content = "{\n \"bar\" : \"foo\" \n}"; this.request.getBody().write(content.getBytes()); @@ -291,7 +291,7 @@ public class ContentRequestMatchersTests { @Test @Deprecated - public void testJsonLenientNoMatchWithDeprecatedBooleanFlag() throws Exception { + void jsonLenientNoMatchWithDeprecatedBooleanFlag() throws Exception { String content = "{\n \"bar\" : \"foo\" \n}"; this.request.getBody().write(content.getBytes()); @@ -303,7 +303,7 @@ public class ContentRequestMatchersTests { } @Test - public void testJsonStrictNoMatch() throws Exception { + void jsonStrictNoMatch() throws Exception { String content = "{\n \"foo array\":[\"first\",\"second\"] , \"someExtraProperty\": \"which is NOT allowed\" \n}"; this.request.getBody().write(content.getBytes()); @@ -316,7 +316,7 @@ public class ContentRequestMatchersTests { @Test @Deprecated - public void testJsonStrictNoMatchWithDeprecatedBooleanFlag() throws Exception { + void jsonStrictNoMatchWithDeprecatedBooleanFlag() throws Exception { String content = "{\n \"foo array\":[\"first\",\"second\"] , \"someExtraProperty\": \"which is NOT allowed\" \n}"; this.request.getBody().write(content.getBytes()); diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java index 9b2048ddb8c..8b6e61cdb43 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java @@ -58,200 +58,200 @@ public class JsonPathRequestMatchersTests { @Test - public void valueWithMismatch() { + void valueWithMismatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").value("bogus").match(request)); } @Test - public void valueWithDirectMatch() throws Exception { + void valueWithDirectMatch() throws Exception { new JsonPathRequestMatchers("$.str").value("foo").match(request); } @Test // SPR-14498 - public void valueWithNumberConversion() throws Exception { + void valueWithNumberConversion() throws Exception { new JsonPathRequestMatchers("$.num").value(5.0f).match(request); } @Test - public void valueWithMatcher() throws Exception { + void valueWithMatcher() throws Exception { new JsonPathRequestMatchers("$.str").value(equalTo("foo")).match(request); } @Test // SPR-14498 - public void valueWithMatcherAndNumberConversion() throws Exception { + void valueWithMatcherAndNumberConversion() throws Exception { new JsonPathRequestMatchers("$.num").value(equalTo(5.0f), Float.class).match(request); } @Test - public void valueWithMatcherAndMismatch() { + void valueWithMatcherAndMismatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").value(equalTo("bogus")).match(request)); } @Test - public void exists() throws Exception { + void exists() throws Exception { new JsonPathRequestMatchers("$.str").exists().match(request); } @Test - public void existsForAnEmptyArray() throws Exception { + void existsForAnEmptyArray() throws Exception { new JsonPathRequestMatchers("$.emptyArray").exists().match(request); } @Test - public void existsForAnEmptyMap() throws Exception { + void existsForAnEmptyMap() throws Exception { new JsonPathRequestMatchers("$.emptyMap").exists().match(request); } @Test - public void existsNoMatch() { + void existsNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.bogus").exists().match(request)); } @Test - public void doesNotExist() throws Exception { + void doesNotExist() throws Exception { new JsonPathRequestMatchers("$.bogus").doesNotExist().match(request); } @Test - public void doesNotExistNoMatch() { + void doesNotExistNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").doesNotExist().match(request)); } @Test - public void doesNotExistForAnEmptyArray() { + void doesNotExistForAnEmptyArray() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.emptyArray").doesNotExist().match(request)); } @Test - public void doesNotExistForAnEmptyMap() { + void doesNotExistForAnEmptyMap() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.emptyMap").doesNotExist().match(request)); } @Test - public void isEmptyForAnEmptyString() throws Exception { + void isEmptyForAnEmptyString() throws Exception { new JsonPathRequestMatchers("$.emptyString").isEmpty().match(request); } @Test - public void isEmptyForAnEmptyArray() throws Exception { + void isEmptyForAnEmptyArray() throws Exception { new JsonPathRequestMatchers("$.emptyArray").isEmpty().match(request); } @Test - public void isEmptyForAnEmptyMap() throws Exception { + void isEmptyForAnEmptyMap() throws Exception { new JsonPathRequestMatchers("$.emptyMap").isEmpty().match(request); } @Test - public void isNotEmptyForString() throws Exception { + void isNotEmptyForString() throws Exception { new JsonPathRequestMatchers("$.str").isNotEmpty().match(request); } @Test - public void isNotEmptyForNumber() throws Exception { + void isNotEmptyForNumber() throws Exception { new JsonPathRequestMatchers("$.num").isNotEmpty().match(request); } @Test - public void isNotEmptyForBoolean() throws Exception { + void isNotEmptyForBoolean() throws Exception { new JsonPathRequestMatchers("$.bool").isNotEmpty().match(request); } @Test - public void isNotEmptyForArray() throws Exception { + void isNotEmptyForArray() throws Exception { new JsonPathRequestMatchers("$.arr").isNotEmpty().match(request); } @Test - public void isNotEmptyForMap() throws Exception { + void isNotEmptyForMap() throws Exception { new JsonPathRequestMatchers("$.colorMap").isNotEmpty().match(request); } @Test - public void isNotEmptyForAnEmptyString() { + void isNotEmptyForAnEmptyString() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.emptyString").isNotEmpty().match(request)); } @Test - public void isNotEmptyForAnEmptyArray() { + void isNotEmptyForAnEmptyArray() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.emptyArray").isNotEmpty().match(request)); } @Test - public void isNotEmptyForAnEmptyMap() { + void isNotEmptyForAnEmptyMap() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.emptyMap").isNotEmpty().match(request)); } @Test - public void isArray() throws Exception { + void isArray() throws Exception { new JsonPathRequestMatchers("$.arr").isArray().match(request); } @Test - public void isArrayForAnEmptyArray() throws Exception { + void isArrayForAnEmptyArray() throws Exception { new JsonPathRequestMatchers("$.emptyArray").isArray().match(request); } @Test - public void isArrayNoMatch() { + void isArrayNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").isArray().match(request)); } @Test - public void isMap() throws Exception { + void isMap() throws Exception { new JsonPathRequestMatchers("$.colorMap").isMap().match(request); } @Test - public void isMapForAnEmptyMap() throws Exception { + void isMapForAnEmptyMap() throws Exception { new JsonPathRequestMatchers("$.emptyMap").isMap().match(request); } @Test - public void isMapNoMatch() { + void isMapNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").isMap().match(request)); } @Test - public void isBoolean() throws Exception { + void isBoolean() throws Exception { new JsonPathRequestMatchers("$.bool").isBoolean().match(request); } @Test - public void isBooleanNoMatch() { + void isBooleanNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").isBoolean().match(request)); } @Test - public void isNumber() throws Exception { + void isNumber() throws Exception { new JsonPathRequestMatchers("$.num").isNumber().match(request); } @Test - public void isNumberNoMatch() { + void isNumberNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.str").isNumber().match(request)); } @Test - public void isString() throws Exception { + void isString() throws Exception { new JsonPathRequestMatchers("$.str").isString().match(request); } @Test - public void isStringNoMatch() { + void isStringNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathRequestMatchers("$.arr").isString().match(request)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java index 0375a5086d9..42accf01606 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java @@ -60,7 +60,7 @@ public class MultipartRequestMatchersTests { @Test - public void testContains() throws Exception { + void contains() throws Exception { this.input.add("foo", "bar"); this.input.add("foo", "baz"); this.input.add("lorem", "ipsum"); @@ -71,7 +71,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testDoesNotContain() { + void doesNotContain() { this.input.add("foo", "bar"); this.input.add("foo", "baz"); this.input.add("lorem", "ipsum"); @@ -82,7 +82,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testParamsMatch() throws Exception { + void paramsMatch() throws Exception { this.input.add("foo", "value 1"); this.input.add("bar", "value A"); this.input.add("baz", "value B"); @@ -93,7 +93,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testResourceMatch() throws Exception { + void resourceMatch() throws Exception { MultipartFile f1 = new MockMultipartFile("f1", "foo.txt", "text/plain", "Foo Lorem ipsum".getBytes()); MultipartFile f2 = new MockMultipartFile("f2", "bar.txt", "text/plain", "Bar Lorem ipsum".getBytes()); MultipartFile f3 = new MockMultipartFile("f3", "foobar.txt", "text/plain", "Foobar Lorem ipsum".getBytes()); @@ -110,7 +110,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testResourceNoMatch() { + void resourceNoMatch() { MockMultipartFile foo = new MockMultipartFile("f1", "foo.txt", "text/plain", "Foo Lorem ipsum".getBytes()); MockMultipartFile bar = new MockMultipartFile("f2", "bar.txt", "text/plain", "Bar Lorem ipsum".getBytes()); @@ -126,7 +126,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testByteArrayMatch() throws Exception { + void byteArrayMatch() throws Exception { MultipartFile f1 = new MockMultipartFile("f1", "foo.txt", "text/plain", "Foo Lorem ipsum".getBytes()); MultipartFile f2 = new MockMultipartFile("f2", "bar.txt", "text/plain", "Bar Lorem ipsum".getBytes()); MultipartFile f3 = new MockMultipartFile("f3", "foobar.txt", "text/plain", "Foobar Lorem ipsum".getBytes()); @@ -146,7 +146,7 @@ public class MultipartRequestMatchersTests { } @Test - public void testByteArrayNoMatch() throws Exception { + void byteArrayNoMatch() throws Exception { MultipartFile f1 = new MockMultipartFile("f1", "foo.txt", "text/plain", "Foo Lorem ipsum".getBytes()); MultipartFile f2 = new MockMultipartFile("f2", "bar.txt", "text/plain", "Bar Lorem ipsum".getBytes()); @@ -162,7 +162,7 @@ public class MultipartRequestMatchersTests { } @Test // gh-36154 - public void testHttpEntityMatch() throws Exception { + void httpEntityMatch() throws Exception { String contentType = "text/plain"; MultipartFile file = new MockMultipartFile("file", "foo.txt", contentType, "Foo Lorem ipsum".getBytes()); diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java index 55108cb7c87..ac30ed597e8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java @@ -46,78 +46,78 @@ public class XpathRequestMatchersTests { @Test - public void testNodeMatcher() throws Exception { + void nodeMatcher() throws Exception { new XpathRequestMatchers("/foo/bar", null).node(Matchers.notNullValue()).match(this.request); } @Test - public void testNodeMatcherNoMatch() { + void nodeMatcherNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar", null).node(Matchers.nullValue()).match(this.request)); } @Test - public void testExists() throws Exception { + void exists() throws Exception { new XpathRequestMatchers("/foo/bar", null).exists().match(this.request); } @Test - public void testExistsNoMatch() { + void existsNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/Bar", null).exists().match(this.request)); } @Test - public void testDoesNotExist() throws Exception { + void doesNotExist() throws Exception { new XpathRequestMatchers("/foo/Bar", null).doesNotExist().match(this.request); } @Test - public void testDoesNotExistNoMatch() { + void doesNotExistNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar", null).doesNotExist().match(this.request)); } @Test - public void testNodeCount() throws Exception { + void nodeCount() throws Exception { new XpathRequestMatchers("/foo/bar", null).nodeCount(2).match(this.request); } @Test - public void testNodeCountNoMatch() { + void nodeCountNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar", null).nodeCount(1).match(this.request)); } @Test - public void testString() throws Exception { + void string() throws Exception { new XpathRequestMatchers("/foo/bar[1]", null).string("111").match(this.request); } @Test - public void testStringNoMatch() { + void stringNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar[1]", null).string("112").match(this.request)); } @Test - public void testNumber() throws Exception { + void number() throws Exception { new XpathRequestMatchers("/foo/bar[1]", null).number(111.0).match(this.request); } @Test - public void testNumberNoMatch() { + void numberNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar[1]", null).number(111.1).match(this.request)); } @Test - public void testBoolean() throws Exception { + void booleanCase() throws Exception { new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(true).match(this.request); } @Test - public void testBooleanNoMatch() { + void booleanNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(false).match(this.request)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java index 124aad87b73..79d43c00e4f 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java @@ -56,7 +56,7 @@ class HeaderRequestMatchersIntegrationTests { @Test - void testString() { + void string() { this.mockServer.expect(requestTo("/person/1")) .andExpect(header("Accept", "application/json, application/*+json")) .andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON)); @@ -65,7 +65,7 @@ class HeaderRequestMatchersIntegrationTests { } @Test - void testStringContains() { + void stringContains() { this.mockServer.expect(requestTo("/person/1")) .andExpect(header("Accept", containsString("json"))) .andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON)); diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java index 2fc97e730d5..4f01a8fad26 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java @@ -86,7 +86,7 @@ class XmlContentRequestMatchersIntegrationTests { } @Test - void testXmlEqualTo() { + void xmlEqualTo() { this.mockServer.expect(requestTo("/composers")) .andExpect(content().contentType("application/xml")) .andExpect(content().xml(PEOPLE_XML)) @@ -96,7 +96,7 @@ class XmlContentRequestMatchersIntegrationTests { } @Test - void testHamcrestNodeMatcher() { + void hamcrestNodeMatcher() { this.mockServer.expect(requestTo("/composers")) .andExpect(content().contentType("application/xml")) .andExpect(content().node(hasXPath("/people/composers/composer[1]"))) diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java index 939960cad89..d142a1f676b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java @@ -91,7 +91,7 @@ public class XpathRequestMatchersIntegrationTests { @Test - public void testExists() throws Exception { + void exists() throws Exception { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -109,7 +109,7 @@ public class XpathRequestMatchersIntegrationTests { } @Test - public void testDoesNotExist() throws Exception { + void doesNotExist() throws Exception { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -125,7 +125,7 @@ public class XpathRequestMatchersIntegrationTests { } @Test - public void testString() throws Exception { + void string() throws Exception { String composerName = "/ns:people/composers/composer[%s]/name"; String performerName = "/ns:people/performers/performer[%s]/name"; @@ -146,7 +146,7 @@ public class XpathRequestMatchersIntegrationTests { } @Test - public void testNumber() throws Exception { + void number() throws Exception { String composerDouble = "/ns:people/composers/composer[%s]/someDouble"; this.mockServer.expect(requestTo("/composers")) @@ -163,7 +163,7 @@ public class XpathRequestMatchersIntegrationTests { } @Test - public void testBoolean() throws Exception { + void booleanCase() throws Exception { String performerBooleanValue = "/ns:people/performers/performer[%s]/someBoolean"; @@ -177,7 +177,7 @@ public class XpathRequestMatchersIntegrationTests { } @Test - public void testNodeCount() throws Exception { + void nodeCount() throws Exception { this.mockServer.expect(requestTo("/composers")) .andExpect(content().contentType("application/xml")) .andExpect(xpath("/ns:people/composers/composer", NS).nodeCount(4)) diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java index 023b5ce94d1..9f35e704dd5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java @@ -38,7 +38,7 @@ public class ApplicationContextSpecTests { @Test // SPR-17094 - public void sessionManagerBean() { + void sessionManagerBean() { ApplicationContext context = new AnnotationConfigApplicationContext(WebConfig.class); ApplicationContextSpec spec = new ApplicationContextSpec(context); WebTestClient testClient = spec.configureClient().build(); diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java index 38dfbb4ae0f..29c0e6476cb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DefaultControllerSpecTests { @Test - public void controller() { + void controller() { new DefaultControllerSpec(new MyController()).build() .get().uri("/") .exchange() @@ -59,7 +59,7 @@ public class DefaultControllerSpecTests { } @Test - public void controllerAdvice() { + void controllerAdvice() { new DefaultControllerSpec(new MyController()) .controllerAdvice(new MyControllerAdvice()) .build() @@ -70,7 +70,7 @@ public class DefaultControllerSpecTests { } @Test - public void controllerAdviceWithClassArgument() { + void controllerAdviceWithClassArgument() { new DefaultControllerSpec(MyController.class) .controllerAdvice(MyControllerAdvice.class) .build() @@ -81,7 +81,7 @@ public class DefaultControllerSpecTests { } @Test - public void configurerConsumers() { + void configurerConsumers() { TestConsumer argumentResolverConsumer = new TestConsumer<>(); TestConsumer contentTypeResolverConsumer = new TestConsumer<>(); TestConsumer corsRegistryConsumer = new TestConsumer<>(); @@ -113,7 +113,7 @@ public class DefaultControllerSpecTests { } @Test // gh-25854 - public void uriTemplate() { + void uriTemplate() { new DefaultControllerSpec(new MyController()).build() .get().uri("/") .exchange() diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java index 4f56accb9f6..ef289507b24 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java @@ -33,7 +33,7 @@ import org.springframework.web.reactive.function.server.ServerResponse; public class DefaultRouterFunctionSpecTests { @Test - public void webFilter() { + void webFilter() { RouterFunction routerFunction = RouterFunctions.route() .GET("/", request -> ServerResponse.ok().build()) @@ -55,7 +55,7 @@ public class DefaultRouterFunctionSpecTests { } @Test - public void exceptionHandler() { + void exceptionHandler() { RouterFunction routerFunction = RouterFunctions.route() .GET("/error", request -> Mono.error(new IllegalStateException("boo"))) diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java index 26610d781b4..adf1c84ae17 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java @@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class HttpHandlerConnectorTests { @Test - public void adaptRequest() { + void adaptRequest() { TestHttpHandler handler = new TestHttpHandler(response -> { response.setStatusCode(HttpStatus.OK); @@ -79,7 +79,7 @@ public class HttpHandlerConnectorTests { } @Test - public void adaptResponse() { + void adaptResponse() { ResponseCookie cookie = ResponseCookie.from("custom-cookie", "c0").build(); @@ -105,7 +105,7 @@ public class HttpHandlerConnectorTests { } @Test // gh-23936 - public void handlerOnNonBlockingThread() { + void handlerOnNonBlockingThread() { TestHttpHandler handler = new TestHttpHandler(response -> { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java index faffa388906..474b3cc4957 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java @@ -43,7 +43,7 @@ public class MockServerSpecTests { @Test - public void applyFiltersAfterConfigurerAdded() { + void applyFiltersAfterConfigurerAdded() { MockServerConfigurer configurer = new MockServerConfigurer() { @@ -67,7 +67,7 @@ public class MockServerSpecTests { } @Test - public void applyFiltersBeforeServerCreated() { + void applyFiltersBeforeServerCreated() { MockServerConfigurer configurer = new MockServerConfigurer() { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java index d8387bbd253..4503ec45460 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java @@ -41,7 +41,7 @@ public class MockServerTests { @Test // SPR-15674 (in comments) - public void mutateDoesNotCreateNewSession() { + void mutateDoesNotCreateNewSession() { WebTestClient client = WebTestClient .bindToWebHandler(exchange -> { @@ -76,7 +76,7 @@ public class MockServerTests { } @Test // SPR-16059 - public void mutateDoesCopy() { + void mutateDoesCopy() { WebTestClient.Builder builder = WebTestClient .bindToWebHandler(exchange -> exchange.getResponse().setComplete()) @@ -113,7 +113,7 @@ public class MockServerTests { } @Test // SPR-16124 - public void exchangeResultHasCookieHeaders() { + void exchangeResultHasCookieHeaders() { ExchangeResult result = WebTestClient .bindToWebHandler(exchange -> { @@ -138,7 +138,7 @@ public class MockServerTests { } @Test - public void responseBodyContentWithFluxExchangeResult() { + void responseBodyContentWithFluxExchangeResult() { FluxExchangeResult result = WebTestClient .bindToWebHandler(exchange -> { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java index 24866a8df0c..5a12d5f3e5d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java @@ -61,7 +61,7 @@ public class WiretapConnectorTests { } @Test - public void captureAndClaim() { + void captureAndClaim() { ClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/test"); ClientHttpResponse response = new MockClientHttpResponse(HttpStatus.OK); ClientHttpConnector connector = createConnector(request, response); diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ControllerTests.java index ee2dbf88ea7..a0929197740 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ControllerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ControllerTests.java @@ -41,7 +41,7 @@ public class ControllerTests { @Test - public void test() throws Exception { + void test() throws Exception { this.client.get().uri("/test") .exchange() .expectStatus().isOk() diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java index 84b59628682..42798bd12d8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java @@ -64,7 +64,7 @@ public class HttpServerTests { @Test - public void test() { + void test() { this.client.get().uri("/test") .exchange() .expectStatus().isOk() diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/RouterFunctionTests.java index 487f0626b6c..015858273f5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/RouterFunctionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/RouterFunctionTests.java @@ -47,7 +47,7 @@ public class RouterFunctionTests { } @Test - public void test() throws Exception { + void test() throws Exception { this.testClient.get().uri("/test") .exchange() .expectStatus().isOk() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java index c906673b4d9..a59f567ffbc 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java @@ -34,14 +34,14 @@ public class DefaultMvcResultTests { private final DefaultMvcResult mvcResult = new DefaultMvcResult(new MockHttpServletRequest(), null); @Test - public void getAsyncResultSuccess() { + void getAsyncResultSuccess() { this.mvcResult.setAsyncResult("Foo"); this.mvcResult.setAsyncDispatchLatch(new CountDownLatch(0)); this.mvcResult.getAsyncResult(); } @Test - public void getAsyncResultFailure() { + void getAsyncResultFailure() { assertThatIllegalStateException().isThrownBy(() -> this.mvcResult.getAsyncResult(0)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/assertj/MockMvcTesterIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/assertj/MockMvcTesterIntegrationTests.java index a3d7d7b4244..c164828f5e7 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/assertj/MockMvcTesterIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/assertj/MockMvcTesterIntegrationTests.java @@ -442,12 +442,12 @@ public class MockMvcTesterIntegrationTests { private final ByteArrayOutputStream capturedOut = new ByteArrayOutputStream(); @BeforeEach - public void setUp() { + void setUp() { System.setOut(new PrintStream(capturedOut)); } @AfterEach - public void tearDown() { + void tearDown() { System.setOut(standardOut); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java index 0dbe6ec628d..ef10b982211 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/client/RestTestClientTests.java @@ -26,7 +26,6 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -51,13 +50,7 @@ import static org.hamcrest.Matchers.equalTo; */ class RestTestClientTests { - private RestTestClient client; - - - @BeforeEach - void setUp() { - this.client = RestTestClient.bindToController(new TestController()).build(); - } + private RestTestClient client = RestTestClient.bindToController(new TestController()).build(); @Nested @@ -65,7 +58,7 @@ class RestTestClientTests { @ParameterizedTest @ValueSource(strings = {"GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"}) - void testMethod(String method) { + void method(String method) { RestTestClientTests.this.client.method(HttpMethod.valueOf(method)).uri("/test") .exchange() .expectStatus().isOk() @@ -73,7 +66,7 @@ class RestTestClientTests { } @Test - void testGet() { + void get() { RestTestClientTests.this.client.get().uri("/test") .exchange() .expectStatus().isOk() @@ -81,7 +74,7 @@ class RestTestClientTests { } @Test - void testPost() { + void post() { RestTestClientTests.this.client.post().uri("/test") .exchange() .expectStatus().isOk() @@ -89,7 +82,7 @@ class RestTestClientTests { } @Test - void testPut() { + void put() { RestTestClientTests.this.client.put().uri("/test") .exchange() .expectStatus().isOk() @@ -97,7 +90,7 @@ class RestTestClientTests { } @Test - void testDelete() { + void delete() { RestTestClientTests.this.client.delete().uri("/test") .exchange() .expectStatus().isOk() @@ -105,7 +98,7 @@ class RestTestClientTests { } @Test - void testPatch() { + void patch() { RestTestClientTests.this.client.patch().uri("/test") .exchange() .expectStatus().isOk() @@ -113,7 +106,7 @@ class RestTestClientTests { } @Test - void testHead() { + void head() { RestTestClientTests.this.client.head().uri("/test") .exchange() .expectStatus().isOk() @@ -121,7 +114,7 @@ class RestTestClientTests { } @Test - void testOptions() { + void options() { RestTestClientTests.this.client.options().uri("/test") .exchange() .expectStatus().isOk() @@ -167,7 +160,7 @@ class RestTestClientTests { } @Test - void testWithPathVariables() { + void withPathVariables() { RestTestClientTests.this.client.get().uri("/test/{id}", 1) .exchange() .expectStatus().isOk() @@ -175,7 +168,7 @@ class RestTestClientTests { } @Test - void testWithParameterMap() { + void withParameterMap() { RestTestClientTests.this.client.get().uri("/test/{id}", Map.of("id", 1)) .exchange() .expectStatus().isOk() @@ -183,7 +176,7 @@ class RestTestClientTests { } @Test - void testWithUrlBuilder() { + void withUrlBuilder() { RestTestClientTests.this.client.get().uri(builder -> builder.path("/test/{id}").build(1)) .exchange() .expectStatus().isOk() @@ -191,7 +184,7 @@ class RestTestClientTests { } @Test - void testURI() { + void uri() { RestTestClientTests.this.client.get().uri(URI.create("/test")) .exchange() .expectStatus().isOk() @@ -202,8 +195,9 @@ class RestTestClientTests { @Nested class Cookies { + @Test - void testCookie() { + void cookie() { RestTestClientTests.this.client.get().uri("/test") .cookie("foo", "bar") .exchange() @@ -212,7 +206,7 @@ class RestTestClientTests { } @Test - void testCookies() { + void cookies() { RestTestClientTests.this.client.get().uri("/test") .cookies(cookies -> cookies.add("foo", "bar")) .exchange() @@ -224,8 +218,9 @@ class RestTestClientTests { @Nested class Headers { + @Test - void testHeader() { + void header() { RestTestClientTests.this.client.get().uri("/test") .header("foo", "bar") .exchange() @@ -234,7 +229,7 @@ class RestTestClientTests { } @Test - void testHeaders() { + void headers() { RestTestClientTests.this.client.get().uri("/test") .headers(headers -> headers.set("foo", "bar")) .exchange() @@ -243,7 +238,7 @@ class RestTestClientTests { } @Test - void testContentType() { + void contentType() { RestTestClientTests.this.client.post().uri("/test") .contentType(MediaType.APPLICATION_JSON) .exchange() @@ -252,7 +247,7 @@ class RestTestClientTests { } @Test - void testAcceptCharset() { + void acceptCharset() { RestTestClientTests.this.client.get().uri("/test") .acceptCharset(StandardCharsets.UTF_8) .exchange() @@ -261,7 +256,7 @@ class RestTestClientTests { } @Test - void testIfModifiedSince() { + void ifModifiedSince() { RestTestClientTests.this.client.get().uri("/test") .ifModifiedSince(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) .exchange() @@ -270,7 +265,7 @@ class RestTestClientTests { } @Test - void testIfNoneMatch() { + void ifNoneMatch() { RestTestClientTests.this.client.get().uri("/test") .ifNoneMatch("foo") .exchange() @@ -282,8 +277,9 @@ class RestTestClientTests { @Nested class Expectations { + @Test - void testExpectCookie() { + void expectCookie() { RestTestClientTests.this.client.get().uri("/test") .exchange() .expectCookie().value("session", v -> MatcherAssert.assertThat(v, equalTo("abc"))); @@ -293,8 +289,9 @@ class RestTestClientTests { @Nested class ReturnResults { + @Test - void testBodyReturnResult() { + void bodyReturnResult() { var result = RestTestClientTests.this.client.get().uri("/test") .exchange() .expectStatus().isOk() @@ -303,7 +300,7 @@ class RestTestClientTests { } @Test - void testReturnResultClass() { + void returnResultClass() { var result = RestTestClientTests.this.client.get().uri("/test") .exchange() .expectStatus().isOk() @@ -312,7 +309,7 @@ class RestTestClientTests { } @Test - void testReturnResultParameterizedTypeReference() { + void returnResultParameterizedTypeReference() { var result = RestTestClientTests.this.client.get().uri("/test") .exchange() .expectStatus().isOk() @@ -322,7 +319,7 @@ class RestTestClientTests { } @Test - void testResultContent() { + void resultContent() { String body = "body-in"; EntityExchangeResult result = RestTestClientTests.this.client.post().uri("/body") .body(body) @@ -357,4 +354,5 @@ class RestTestClientTests { return body + "-out"; } } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java index eb0ddc5208f..3a237fa3237 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java @@ -55,7 +55,7 @@ class RouterFunctionTests { } @Test - void testEntityExchangeResult() { + void entityExchangeResult() { EntityExchangeResult result = this.testClient.get().uri("/test") .exchange() .expectStatus().isOk() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java index 2df30f05d1b..103537c2c88 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java @@ -28,28 +28,28 @@ import org.junit.jupiter.api.Test; public class HostRequestMatcherTests extends AbstractWebRequestMatcherTests { @Test - public void localhost() throws Exception { + void localhost() throws Exception { WebRequestMatcher matcher = new HostRequestMatcher("localhost"); assertMatches(matcher, "http://localhost/jquery-1.11.0.min.js"); assertDoesNotMatch(matcher, "http://company.example/jquery-1.11.0.min.js"); } @Test - public void multipleHosts() throws Exception { + void multipleHosts() throws Exception { WebRequestMatcher matcher = new HostRequestMatcher("localhost", "example.com"); assertMatches(matcher, "http://localhost/jquery-1.11.0.min.js"); assertMatches(matcher, "https://example.com/jquery-1.11.0.min.js"); } @Test - public void specificPort() throws Exception { + void specificPort() throws Exception { WebRequestMatcher matcher = new HostRequestMatcher("localhost:8080"); assertMatches(matcher, "http://localhost:8080/jquery-1.11.0.min.js"); assertDoesNotMatch(matcher, "http://localhost:9090/jquery-1.11.0.min.js"); } @Test - public void defaultHttpPort() throws Exception { + void defaultHttpPort() throws Exception { WebRequestMatcher matcher = new HostRequestMatcher("localhost:80"); assertMatches(matcher, "http://localhost:80/jquery-1.11.0.min.js"); assertMatches(matcher, "http://localhost/jquery-1.11.0.min.js"); @@ -58,7 +58,7 @@ public class HostRequestMatcherTests extends AbstractWebRequestMatcherTests { } @Test - public void defaultHttpsPort() throws Exception { + void defaultHttpsPort() throws Exception { WebRequestMatcher matcher = new HostRequestMatcher("localhost:443"); assertMatches(matcher, "https://localhost:443/jquery-1.11.0.min.js"); assertMatches(matcher, "https://localhost/jquery-1.11.0.min.js"); 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 4c32620ab43..f8d5199782f 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 @@ -69,19 +69,19 @@ public class MockMvcConnectionBuilderSupportTests { @Test - public void constructorMockMvcNull() { + void constructorMockMvcNull() { assertThatIllegalArgumentException().isThrownBy(() -> new MockMvcWebConnectionBuilderSupport((MockMvc) null){}); } @Test - public void constructorContextNull() { + void constructorContextNull() { assertThatIllegalArgumentException().isThrownBy(() -> new MockMvcWebConnectionBuilderSupport((WebApplicationContext) null){}); } @Test - public void context() throws Exception { + void context() throws Exception { WebConnection conn = this.builder.createConnection(this.client); assertMockMvcUsed(conn, "http://localhost/"); @@ -89,7 +89,7 @@ public class MockMvcConnectionBuilderSupportTests { } @Test - public void mockMvc() throws Exception { + void mockMvc() throws Exception { MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); WebConnection conn = new MockMvcWebConnectionBuilderSupport(mockMvc) {}.createConnection(this.client); @@ -98,7 +98,7 @@ public class MockMvcConnectionBuilderSupportTests { } @Test - public void mockMvcExampleDotCom() throws Exception { + void mockMvcExampleDotCom() throws Exception { WebConnection conn = this.builder.useMockMvcForHosts("example.com").createConnection(this.client); assertMockMvcUsed(conn, "http://localhost/"); @@ -107,19 +107,19 @@ public class MockMvcConnectionBuilderSupportTests { } @Test - public void mockMvcAlwaysUseMockMvc() throws Exception { + void mockMvcAlwaysUseMockMvc() throws Exception { WebConnection conn = this.builder.alwaysUseMockMvc().createConnection(this.client); assertMockMvcUsed(conn, "http://other.example/"); } @Test - public void defaultContextPathEmpty() throws Exception { + void defaultContextPathEmpty() throws Exception { WebConnection conn = this.builder.createConnection(this.client); assertThat(getResponse(conn, "http://localhost/abc").getContentAsString()).isEmpty(); } @Test - public void defaultContextPathCustom() throws Exception { + void defaultContextPathCustom() throws Exception { WebConnection conn = this.builder.contextPath("/abc").createConnection(this.client); assertThat(getResponse(conn, "http://localhost/abc/def").getContentAsString()).isEqualTo("/abc"); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java index 25e7f4805f9..5b5408945d4 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java @@ -46,21 +46,21 @@ public class MockMvcWebConnectionTests { @Test - public void contextPathNull() throws IOException { + void contextPathNull() throws IOException { this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, null)); Page page = this.webClient.getPage("http://localhost/context/a"); assertThat(page.getWebResponse().getStatusCode()).isEqualTo(200); } @Test - public void contextPathExplicit() throws IOException { + void contextPathExplicit() throws IOException { this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, "/context")); Page page = this.webClient.getPage("http://localhost/context/a"); assertThat(page.getWebResponse().getStatusCode()).isEqualTo(200); } @Test - public void contextPathEmpty() { + void contextPathEmpty() { this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, "")); // Empty context path (root context) should not match to a URL with a context path assertThatExceptionOfType(FailingHttpStatusCodeException.class) @@ -75,14 +75,14 @@ public class MockMvcWebConnectionTests { } @Test - public void forward() throws IOException { + void forward() throws IOException { this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, "")); Page page = this.webClient.getPage("http://localhost/forward"); assertThat(page.getWebResponse().getContentAsString()).isEqualTo("hello"); } @Test - public void infiniteForward() { + void infiniteForward() { this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, "")); assertThatIllegalStateException() .isThrownBy(() -> this.webClient.getPage("http://localhost/infiniteForward")) @@ -90,13 +90,13 @@ public class MockMvcWebConnectionTests { } @Test - public void contextPathDoesNotStartWithSlash() { + void contextPathDoesNotStartWithSlash() { assertThatIllegalArgumentException().isThrownBy(() -> new MockMvcWebConnection(this.mockMvc, this.webClient, "context")); } @Test - public void contextPathEndsWithSlash() { + void contextPathEndsWithSlash() { assertThatIllegalArgumentException().isThrownBy(() -> new MockMvcWebConnection(this.mockMvc, this.webClient, "/context/")); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java index 310546b7a4d..3dfcf66cb83 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java @@ -55,20 +55,20 @@ public class MockWebResponseBuilderTests { @Test - public void constructorWithNullWebRequest() { + void constructorWithNullWebRequest() { assertThatIllegalArgumentException().isThrownBy(() -> new MockWebResponseBuilder(0L, null, this.response)); } @Test - public void constructorWithNullResponse() { + void constructorWithNullResponse() { assertThatIllegalArgumentException().isThrownBy(() -> new MockWebResponseBuilder(0L, new WebRequest(new URL("http://company.example:80/test/this/here")), null)); } @Test - public void buildContent() throws Exception { + void buildContent() throws Exception { this.response.getWriter().write("expected content"); WebResponse webResponse = this.responseBuilder.build(); @@ -76,7 +76,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildContentCharset() throws Exception { + void buildContentCharset() throws Exception { this.response.addHeader("Content-Type", "text/html; charset=UTF-8"); WebResponse webResponse = this.responseBuilder.build(); @@ -84,7 +84,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildContentType() throws Exception { + void buildContentType() throws Exception { this.response.addHeader("Content-Type", "text/html; charset-UTF-8"); WebResponse webResponse = this.responseBuilder.build(); @@ -92,7 +92,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildResponseHeaders() throws Exception { + void buildResponseHeaders() throws Exception { this.response.addHeader("Content-Type", "text/html"); this.response.addHeader("X-Test", "value"); Cookie cookie = new Cookie("cookieA", "valueA"); @@ -120,7 +120,7 @@ public class MockWebResponseBuilderTests { } @Test // SPR-14169 - public void buildResponseHeadersNullDomainDefaulted() throws Exception { + void buildResponseHeadersNullDomainDefaulted() throws Exception { Cookie cookie = new Cookie("cookieA", "valueA"); this.response.addCookie(cookie); WebResponse webResponse = this.responseBuilder.build(); @@ -133,7 +133,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildStatus() throws Exception { + void buildStatus() throws Exception { WebResponse webResponse = this.responseBuilder.build(); assertThat(webResponse.getStatusCode()).isEqualTo(200); @@ -141,7 +141,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildStatusNotOk() throws Exception { + void buildStatusNotOk() throws Exception { this.response.setStatus(401); WebResponse webResponse = this.responseBuilder.build(); @@ -150,7 +150,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildStatusWithCustomMessage() throws Exception { + void buildStatusWithCustomMessage() throws Exception { this.response.sendError(401, "Custom"); WebResponse webResponse = this.responseBuilder.build(); @@ -159,7 +159,7 @@ public class MockWebResponseBuilderTests { } @Test - public void buildWebRequest() throws Exception { + void buildWebRequest() throws Exception { WebResponse webResponse = this.responseBuilder.build(); assertThat(webResponse.getWebRequest()).isEqualTo(this.webRequest); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java index 4a0c3db782c..e8c544b8ecb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; public class UrlRegexRequestMatcherTests extends AbstractWebRequestMatcherTests { @Test - public void verifyExampleInClassLevelJavadoc() throws Exception { + void verifyExampleInClassLevelJavadoc() throws Exception { WebRequestMatcher cdnMatcher = new UrlRegexRequestMatcher(".*?//code.jquery.com/.*"); assertMatches(cdnMatcher, "https://code.jquery.com/jquery-1.11.0.min.js"); assertDoesNotMatch(cdnMatcher, "http://localhost/jquery-1.11.0.min.js"); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java index 1d9fc4aa5e9..f8ad7b9a1a1 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriverTests.java @@ -66,7 +66,7 @@ class WebConnectionHtmlUnitDriverTests { } @Test - public void setWebConnection() { + void setWebConnection() { this.driver.setWebConnection(this.connection); assertThat(this.driver.getWebConnection()).isEqualTo(this.connection); assertThatExceptionOfType(WebDriverException.class).isThrownBy(() -> this.driver.get("https://example.com")); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java index 5010554fe4a..cbc83263eb6 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java @@ -29,23 +29,23 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class FlashAttributeResultMatchersTests { @Test - public void attributeExists() throws Exception { + void attributeExists() throws Exception { new FlashAttributeResultMatchers().attributeExists("good").match(getStubMvcResult()); } @Test - public void attributeExists_DoesNotExist() { + void attributeExists_DoesNotExist() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new FlashAttributeResultMatchers().attributeExists("bad").match(getStubMvcResult())); } @Test - public void attribute() throws Exception { + void attribute() throws Exception { new FlashAttributeResultMatchers().attribute("good", "good").match(getStubMvcResult()); } @Test - public void attribute_incorrectValue() { + void attribute_incorrectValue() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new FlashAttributeResultMatchers().attribute("good", "not good").match(getStubMvcResult())); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java index a3166e16df1..2c3784f708c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java @@ -43,7 +43,7 @@ public class HeaderResultMatchersTests { @Test // SPR-17330 - public void matchDateFormattedWithHttpHeaders() throws Exception { + void matchDateFormattedWithHttpHeaders() throws Exception { long epochMilli = ZonedDateTime.of(2018, 10, 5, 0, 0, 0, 0, ZoneOffset.UTC).toInstant().toEpochMilli(); HttpHeaders headers = new HttpHeaders(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java index e79d172ceb1..8038c5dfa34 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java @@ -39,98 +39,98 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class MockMvcResultMatchersTests { @Test - public void redirect() throws Exception { + void redirect() throws Exception { assertThatCode(() -> redirectedUrl("/resource/1").match(redirectedUrlStub("/resource/1"))) .doesNotThrowAnyException(); } @Test - public void redirectNonMatching() { + void redirectNonMatching() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> redirectedUrl("/resource/2").match(redirectedUrlStub("/resource/1"))) .withMessageEndingWith("expected: but was:"); } @Test - public void redirectNonMatchingBecauseNotRedirect() { + void redirectNonMatchingBecauseNotRedirect() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> redirectedUrl("/resource/1").match(forwardedUrlStub("/resource/1"))) .withMessageEndingWith("expected: but was:"); } @Test - public void redirectWithUrlTemplate() { + void redirectWithUrlTemplate() { assertThatCode(() -> redirectedUrlTemplate("/orders/{orderId}/items/{itemId}", 1, 2).match(redirectedUrlStub("/orders/1/items/2"))) .doesNotThrowAnyException(); } @Test - public void redirectWithMatchingPattern() { + void redirectWithMatchingPattern() { assertThatCode(() -> redirectedUrlPattern("/resource/*").match(redirectedUrlStub("/resource/1"))) .doesNotThrowAnyException(); } @Test - public void redirectWithNonMatchingPattern() { + void redirectWithNonMatchingPattern() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> redirectedUrlPattern("/resource/").match(redirectedUrlStub("/resource/1"))) .withMessage("'/resource/' is not an Ant-style path pattern"); } @Test - public void redirectWithNonMatchingPatternBecauseNotRedirect() { + void redirectWithNonMatchingPatternBecauseNotRedirect() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> redirectedUrlPattern("/resource/*").match(forwardedUrlStub("/resource/1"))) .withMessage("Redirected URL 'null' does not match the expected URL pattern '/resource/*'"); } @Test - public void forward() throws Exception { + void forward() throws Exception { assertThatCode(() -> forwardedUrl("/api/resource/1").match(forwardedUrlStub("/api/resource/1"))) .doesNotThrowAnyException(); } @Test - public void forwardNonMatching() { + void forwardNonMatching() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> forwardedUrlPattern("api/resource/2").match(forwardedUrlStub("api/resource/1"))) .withMessage("'api/resource/2' is not an Ant-style path pattern"); } @Test - public void forwardNonMatchingBecauseNotForward() { + void forwardNonMatchingBecauseNotForward() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> forwardedUrlPattern("/resource/*").match(redirectedUrlStub("/resource/1"))) .withMessage("Forwarded URL 'null' does not match the expected URL pattern '/resource/*'"); } @Test - public void forwardWithQueryString() { + void forwardWithQueryString() { assertThatCode(() -> forwardedUrl("/api/resource/1?arg=value").match(forwardedUrlStub("/api/resource/1?arg=value"))) .doesNotThrowAnyException(); } @Test - public void forwardWithUrlTemplate() { + void forwardWithUrlTemplate() { assertThatCode(() -> forwardedUrlTemplate("/orders/{orderId}/items/{itemId}", 1, 2).match(forwardedUrlStub("/orders/1/items/2"))) .doesNotThrowAnyException(); } @Test - public void forwardWithMatchingPattern() { + void forwardWithMatchingPattern() { assertThatCode(() -> forwardedUrlPattern("/api/**/?").match(forwardedUrlStub("/api/resource/1"))) .doesNotThrowAnyException(); } @Test - public void forwardWithNonMatchingPattern() { + void forwardWithNonMatchingPattern() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> forwardedUrlPattern("/resource/").match(forwardedUrlStub("/resource/1"))) .withMessage("'/resource/' is not an Ant-style path pattern"); } @Test - public void forwardWithNonMatchingPatternBecauseNotForward() { + void forwardWithNonMatchingPatternBecauseNotForward() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> forwardedUrlPattern("/resource/*").match(redirectedUrlStub("/resource/1"))) .withMessage("Forwarded URL 'null' does not match the expected URL pattern '/resource/*'"); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java index 8b7a2894e83..beafff572fc 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java @@ -47,7 +47,7 @@ public class StatusResultMatchersTests { @Test - public void testHttpStatusCodeResultMatchers() throws Exception { + void httpStatusCodeResultMatchers() throws Exception { List failures = new ArrayList<>(); for (HttpStatus status : HttpStatus.values()) { MockHttpServletResponse response = new MockHttpServletResponse(); @@ -79,7 +79,7 @@ public class StatusResultMatchersTests { } @Test - public void statusRanges() throws Exception { + void statusRanges() throws Exception { for (HttpStatus status : HttpStatus.values()) { MockHttpServletResponse response = new MockHttpServletResponse(); response.setStatus(status.value()); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java index 640184cd6b7..35e71e0f0b2 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java @@ -38,95 +38,95 @@ public class XpathResultMatchersTests { @Test - public void node() throws Exception { + void node() throws Exception { new XpathResultMatchers("/foo/bar", null).node(Matchers.notNullValue()).match(getStubMvcResult()); } @Test - public void nodeNoMatch() { + void nodeNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar", null).node(Matchers.nullValue()).match(getStubMvcResult())); } @Test - public void nodeList() throws Exception { + void nodeList() throws Exception { new XpathResultMatchers("/foo/bar", null).nodeList(Matchers.notNullValue()).match(getStubMvcResult()); } @Test - public void nodeListNoMatch() { + void nodeListNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar", null).nodeList(Matchers.nullValue()).match(getStubMvcResult())); } @Test - public void exists() throws Exception { + void exists() throws Exception { new XpathResultMatchers("/foo/bar", null).exists().match(getStubMvcResult()); } @Test - public void existsNoMatch() { + void existsNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/Bar", null).exists().match(getStubMvcResult())); } @Test - public void doesNotExist() throws Exception { + void doesNotExist() throws Exception { new XpathResultMatchers("/foo/Bar", null).doesNotExist().match(getStubMvcResult()); } @Test - public void doesNotExistNoMatch() { + void doesNotExistNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar", null).doesNotExist().match(getStubMvcResult())); } @Test - public void nodeCount() throws Exception { + void nodeCount() throws Exception { new XpathResultMatchers("/foo/bar", null).nodeCount(2).match(getStubMvcResult()); } @Test - public void nodeCountNoMatch() { + void nodeCountNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar", null).nodeCount(1).match(getStubMvcResult())); } @Test - public void string() throws Exception { + void string() throws Exception { new XpathResultMatchers("/foo/bar[1]", null).string("111").match(getStubMvcResult()); } @Test - public void stringNoMatch() { + void stringNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar[1]", null).string("112").match(getStubMvcResult())); } @Test - public void number() throws Exception { + void number() throws Exception { new XpathResultMatchers("/foo/bar[1]", null).number(111.0).match(getStubMvcResult()); } @Test - public void numberNoMatch() { + void numberNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar[1]", null).number(111.1).match(getStubMvcResult())); } @Test - public void booleanValue() throws Exception { + void booleanValue() throws Exception { new XpathResultMatchers("/foo/bar[2]", null).booleanValue(true).match(getStubMvcResult()); } @Test - public void booleanValueNoMatch() { + void booleanValueNoMatch() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new XpathResultMatchers("/foo/bar[2]", null).booleanValue(false).match(getStubMvcResult())); } @Test - public void stringEncodingDetection() throws Exception { + void stringEncodingDetection() throws Exception { String content = "\n" + "Jürgen"; byte[] bytes = content.getBytes(StandardCharsets.UTF_8); 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 3dd3c7886f9..05fd0fc1283 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 @@ -74,7 +74,7 @@ public class AsyncControllerJavaConfigTests { } @Test - public void callableInterceptor() throws Exception { + void callableInterceptor() throws Exception { testClient.get().uri("/callable") .accept(MediaType.APPLICATION_JSON) .exchange() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java index 56be50662e8..1031d674954 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java @@ -66,7 +66,7 @@ public class WebAppResourceTests { // Resources served via @Test - public void resourceRequest() { + void resourceRequest() { testClient.get().uri("/resources/Spring.js") .exchange() .expectStatus().isOk() @@ -77,7 +77,7 @@ public class WebAppResourceTests { // Forwarded to the "default" servlet via @Test - public void resourcesViaDefaultServlet() throws Exception { + void resourcesViaDefaultServlet() throws Exception { EntityExchangeResult result = testClient.get().uri("/unknown/resource") .exchange() .expectStatus().isOk() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java index 15174fa42de..290798f91c4 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java @@ -67,7 +67,7 @@ public class XmlConfigTests { @Test - public void person() { + void person() { testClient.get().uri("/person/5") .accept(MediaType.APPLICATION_JSON) .exchange() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java index 33bf454b2fb..49bc94bdaa4 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java @@ -61,7 +61,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class FilterTests { @Test - public void whenFiltersCompleteMvcProcessesRequest() throws Exception { + void whenFiltersCompleteMvcProcessesRequest() throws Exception { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filters(new ContinueFilter()) .build(); @@ -81,7 +81,7 @@ public class FilterTests { } @Test - public void filtersProcessRequest() { + void filtersProcessRequest() { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filters(new ContinueFilter(), new RedirectFilter()) .build(); @@ -93,7 +93,7 @@ public class FilterTests { } @Test - public void filterMappedBySuffix() { + void filterMappedBySuffix() { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filter(new RedirectFilter(), "*.html") .build(); @@ -105,7 +105,7 @@ public class FilterTests { } @Test - public void filterWithExactMapping() { + void filterWithExactMapping() { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filter(new RedirectFilter(), "/p", "/persons") .build(); @@ -117,7 +117,7 @@ public class FilterTests { } @Test - public void filterSkipped() throws Exception { + void filterSkipped() throws Exception { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filter(new RedirectFilter(), "/p", "/person") .build(); @@ -138,7 +138,7 @@ public class FilterTests { } @Test - public void filterWrapsRequestResponse() throws Exception { + void filterWrapsRequestResponse() throws Exception { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filter(new WrappingRequestResponseFilter()) .build(); @@ -152,7 +152,7 @@ public class FilterTests { } @Test - public void filterWrapsRequestResponseAndPerformsAsyncDispatch() { + void filterWrapsRequestResponseAndPerformsAsyncDispatch() { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()) .filters(new WrappingRequestResponseFilter(), new ShallowEtagHeaderFilter()) .build(); 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 fb50ab12ce7..1179a11204c 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 @@ -56,7 +56,7 @@ public class FrameworkExtensionTests { @Test - public void fooHeader() { + void fooHeader() { this.client.mutateWith(headers().foo("a=b")) .get().uri("/") .exchange() @@ -64,7 +64,7 @@ public class FrameworkExtensionTests { } @Test - public void barHeader() { + void barHeader() { this.client.mutateWith(headers().bar("a=b")) .get().uri("/") .exchange() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java index e5a9de0f555..e810e7bd132 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java @@ -58,7 +58,7 @@ public class MultipartControllerTests { @Test - public void multipartRequestWithSingleFile() { + void multipartRequestWithSingleFile() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -82,14 +82,14 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithSingleFileNotPresent() { + void multipartRequestWithSingleFileNotPresent() { testClient.post().uri("/multipartfile") .exchange() .expectStatus().isFound(); } @Test - public void multipartRequestWithFileArray() { + void multipartRequestWithFileArray() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -106,14 +106,14 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithFileArrayNoMultipart() { + void multipartRequestWithFileArrayNoMultipart() { testClient.post().uri("/multipartfilearray") .exchange() .expectStatus().isFound(); } @Test - public void multipartRequestWithOptionalFile() { + void multipartRequestWithOptionalFile() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -129,7 +129,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithOptionalFileNotPresent() { + void multipartRequestWithOptionalFileNotPresent() { Map json = Collections.singletonMap("name", "yeeeah"); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); @@ -143,7 +143,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithOptionalFileArray() { + void multipartRequestWithOptionalFileArray() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -160,7 +160,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithOptionalFileArrayNotPresent() { + void multipartRequestWithOptionalFileArrayNotPresent() { Map json = Collections.singletonMap("name", "yeeeah"); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); @@ -174,7 +174,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithOptionalFileList() { + void multipartRequestWithOptionalFileList() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -191,7 +191,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithOptionalFileListNotPresent() { + void multipartRequestWithOptionalFileListNotPresent() { Map json = Collections.singletonMap("name", "yeeeah"); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); @@ -205,7 +205,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWithServletParts() { + void multipartRequestWithServletParts() { byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8); Map json = Collections.singletonMap("name", "yeeeah"); @@ -221,7 +221,7 @@ public class MultipartControllerTests { } @Test - public void multipartRequestWrapped() { + void multipartRequestWrapped() { Map json = Collections.singletonMap("name", "yeeeah"); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java index 5dea6948868..8e48aff6f35 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java @@ -39,7 +39,7 @@ import static org.springframework.http.MediaType.TEXT_EVENT_STREAM; public class ReactiveReturnTypeTests { @Test - public void sseWithFlux() { + void sseWithFlux() { WebTestClient testClient = MockMvcWebTestClient.bindToController(new ReactiveController()).build(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java index 3968f034574..b7286f74443 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java @@ -50,7 +50,7 @@ public class RedirectTests { @Test - public void save() throws Exception { + void save() throws Exception { EntityExchangeResult exchangeResult = testClient.post().uri("/persons?name=Andy") .exchange() @@ -67,7 +67,7 @@ public class RedirectTests { } @Test - public void saveSpecial() throws Exception { + void saveSpecial() throws Exception { EntityExchangeResult result = testClient.post().uri("/people?name=Andy") .exchange() @@ -84,7 +84,7 @@ public class RedirectTests { } @Test - public void saveWithErrors() throws Exception { + void saveWithErrors() throws Exception { EntityExchangeResult result = testClient.post().uri("/persons").exchange().expectStatus().isOk().expectBody().isEmpty(); @@ -96,7 +96,7 @@ public class RedirectTests { } @Test - public void saveSpecialWithErrors() throws Exception { + void saveSpecialWithErrors() throws Exception { EntityExchangeResult result = testClient.post().uri("/people").exchange().expectStatus().isOk().expectBody().isEmpty(); @@ -108,7 +108,7 @@ public class RedirectTests { } @Test - public void getPerson() throws Exception { + void getPerson() throws Exception { EntityExchangeResult result = MockMvcWebTestClient.bindToController(new PersonController()) .defaultRequest(get("/").flashAttr("message", "success!")) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java index f417f19be11..7ef78fef82d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class RequestParameterTests { @Test - public void queryParameter() { + void queryParameter() { WebTestClient client = MockMvcWebTestClient.bindToController(new PersonController()).build(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RouterFunctionTests.java index 95b1318d821..316c5f6ef1a 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RouterFunctionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RouterFunctionTests.java @@ -41,7 +41,7 @@ import static org.springframework.web.servlet.function.ServerResponse.ok; * * @author Arjen Poutsma */ -public class RouterFunctionTests { +class RouterFunctionTests { @Test void json() { @@ -52,7 +52,7 @@ public class RouterFunctionTests { } @Test - public void queryParameter() { + void queryParameter() { execute("/search?name=George", body -> body.jsonPath("$.name").isEqualTo("George")); } @@ -135,4 +135,5 @@ public class RouterFunctionTests { this.age = age; } } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java index 2bee43781df..53e7038681e 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java @@ -42,7 +42,7 @@ public class SseTests { @Test - public void sse() { + void sse() { FluxExchangeResult exchangeResult = this.testClient.get() .uri("/persons") .exchange() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java index 4336e3099c3..2f40ca93516 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java @@ -47,7 +47,7 @@ public class PrintingResultHandlerSmokeTests { // Comment out class-level @Disabled to see the output. @Test - public void printViaConsumer() { + void printViaConsumer() { testClient.post().uri("/") .contentType(MediaType.TEXT_PLAIN) .bodyValue("Hello Request".getBytes(StandardCharsets.UTF_8)) @@ -58,7 +58,7 @@ public class PrintingResultHandlerSmokeTests { } @Test - public void returnResultAndPrint() { + void returnResultAndPrint() { EntityExchangeResult result = testClient.post().uri("/") .contentType(MediaType.TEXT_PLAIN) .bodyValue("Hello Request".getBytes(StandardCharsets.UTF_8)) @@ -80,4 +80,5 @@ public class PrintingResultHandlerSmokeTests { return "Hello Response"; } } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/CookieAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/CookieAssertionTests.java index 15ecd6d3a04..434c950deaa 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/CookieAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/CookieAssertionTests.java @@ -64,55 +64,55 @@ public class CookieAssertionTests { @Test - public void testExists() { + void exists() { client.get().uri("/").exchange().expectCookie().exists(COOKIE_NAME); } @Test - public void testNotExists() { + void notExists() { client.get().uri("/").exchange().expectCookie().doesNotExist("unknownCookie"); } @Test - public void testEqualTo() { + void hamcrestEqualTo() { client.get().uri("/").exchange().expectCookie().valueEquals(COOKIE_NAME, "en-US"); client.get().uri("/").exchange().expectCookie() .value(COOKIE_NAME, v -> MatcherAssert.assertThat(v, equalTo("en-US"))); } @Test - public void testMatcher() { + void matcher() { client.get().uri("/").exchange().expectCookie() .value(COOKIE_NAME, v -> MatcherAssert.assertThat(v, startsWith("en-US"))); } @Test - public void testMaxAge() { + void maxAge() { client.get().uri("/").exchange().expectCookie().maxAge(COOKIE_NAME, Duration.ofSeconds(-1)); } @Test - public void testDomain() { + void domain() { client.get().uri("/").exchange().expectCookie().domain(COOKIE_NAME, "domain"); } @Test - public void testPath() { + void path() { client.get().uri("/").exchange().expectCookie().path(COOKIE_NAME, "/"); } @Test - public void testSecured() { + void secured() { client.get().uri("/").exchange().expectCookie().secure(COOKIE_NAME, false); } @Test - public void testHttpOnly() { + void httpOnly() { client.get().uri("/").exchange().expectCookie().httpOnly(COOKIE_NAME, true); } @Test - public void testSameSite() { + void sameSite() { client.get().uri("/").exchange().expectCookie().sameSite(COOKIE_NAME, "Strict"); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/HandlerAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/HandlerAssertionTests.java index 175f8f2eed0..fab507a4c17 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/HandlerAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/HandlerAssertionTests.java @@ -52,12 +52,12 @@ public class HandlerAssertionTests { @Test - public void handlerType() throws Exception { + void handlerType() throws Exception { performRequest().andExpect(handler().handlerType(SimpleController.class)); } @Test - public void methodCallOnNonMock() { + void methodCallOnNonMock() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> performRequest().andExpect(handler().methodCall("bogus"))) .withMessageContaining("The supplied object [bogus] is not an instance of") @@ -66,24 +66,24 @@ public class HandlerAssertionTests { } @Test - public void methodCall() throws Exception { + void methodCall() throws Exception { performRequest().andExpect(handler().methodCall(on(SimpleController.class).handle())); } @Test - public void methodName() throws Exception { + void methodName() throws Exception { performRequest().andExpect(handler().methodName("handle")); } @Test - public void methodNameMatchers() throws Exception { + void methodNameMatchers() throws Exception { performRequest() .andExpect(handler().methodName(equalTo("handle"))) .andExpect(handler().methodName(is(not("save")))); } @Test - public void method() throws Exception { + void method() throws Exception { Method method = SimpleController.class.getMethod("handle"); performRequest().andExpect(handler().method(method)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/JsonPathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/JsonPathAssertionTests.java index 1b6642a168d..9f767b17ca8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/JsonPathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/JsonPathAssertionTests.java @@ -58,7 +58,7 @@ public class JsonPathAssertionTests { @Test - public void exists() { + void exists() { String composerByName = "$.composers[?(@.name == '%s')]"; String performerByName = "$.performers[?(@.name == '%s')]"; @@ -78,7 +78,7 @@ public class JsonPathAssertionTests { } @Test - public void doesNotExist() { + void doesNotExist() { client.get().uri("/music/people") .exchange() .expectBody() @@ -88,7 +88,7 @@ public class JsonPathAssertionTests { } @Test - public void equality() { + void equality() { client.get().uri("/music/people") .exchange() .expectBody() @@ -106,7 +106,7 @@ public class JsonPathAssertionTests { } @Test - public void hamcrestMatcher() { + void hamcrestMatcher() { client.get().uri("/music/people") .exchange() .expectBody() @@ -117,7 +117,7 @@ public class JsonPathAssertionTests { } @Test - public void hamcrestMatcherWithParameterizedJsonPath() { + void hamcrestMatcherWithParameterizedJsonPath() { client.get().uri("/music/people") .exchange() .expectBody() diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/UrlAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/UrlAssertionTests.java index ac1eed12fd3..92f673d9a6c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/UrlAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/UrlAssertionTests.java @@ -40,7 +40,7 @@ public class UrlAssertionTests { @Test - public void testRedirect() { + void redirect() { testClient.get().uri("/persons") .exchange() .expectStatus().isFound() @@ -48,7 +48,7 @@ public class UrlAssertionTests { } @Test - public void testRedirectPattern() throws Exception { + void redirectPattern() throws Exception { EntityExchangeResult result = testClient.get().uri("/persons").exchange().expectBody().isEmpty(); @@ -57,7 +57,7 @@ public class UrlAssertionTests { } @Test - public void testForward() { + void forward() { testClient.get().uri("/") .exchange() .expectStatus().isOk() @@ -65,7 +65,7 @@ public class UrlAssertionTests { } @Test - public void testForwardPattern() throws Exception { + void forwardPattern() throws Exception { EntityExchangeResult result = testClient.get().uri("/").exchange().expectBody().isEmpty(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ViewNameAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ViewNameAssertionTests.java index 5da30b3b2b5..9004e5f67aa 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ViewNameAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ViewNameAssertionTests.java @@ -44,14 +44,14 @@ public class ViewNameAssertionTests { @Test - public void testEqualTo() throws Exception { + void hamcrestEqualTo() throws Exception { MockMvcWebTestClient.resultActionsFor(performRequest()) .andExpect(view().name("mySpecialView")) .andExpect(view().name(equalTo("mySpecialView"))); } @Test - public void testHamcrestMatcher() throws Exception { + void hamcrestMatcher() throws Exception { MockMvcWebTestClient.resultActionsFor(performRequest()) .andExpect(view().name(containsString("Special"))); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java index 7be88c94836..bdb1338336d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java @@ -66,14 +66,14 @@ public class XmlContentAssertionTests { @Test - public void testXmlEqualTo() { + void xmlEqualTo() { testClient.get().uri("/music/people") .exchange() .expectBody().xml(PEOPLE_XML); } @Test - public void testNodeHamcrestMatcher() { + void nodeHamcrestMatcher() { testClient.get().uri("/music/people") .exchange() .expectBody().xpath("/people/composers/composer[1]").exists(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java index f32dd11c806..28f6253d30b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java @@ -68,7 +68,7 @@ public class XpathAssertionTests { @Test - public void testExists() { + void exists() { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -85,7 +85,7 @@ public class XpathAssertionTests { } @Test - public void testDoesNotExist() { + void doesNotExist() { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -99,7 +99,7 @@ public class XpathAssertionTests { } @Test - public void testString() { + void string() { String composerName = "/ns:people/composers/composer[%s]/name"; String performerName = "/ns:people/performers/performer[%s]/name"; @@ -119,7 +119,7 @@ public class XpathAssertionTests { } @Test - public void testNumber() { + void number() { String expression = "/ns:people/composers/composer[%s]/someDouble"; testClient.get().uri("/music/people") @@ -134,7 +134,7 @@ public class XpathAssertionTests { } @Test - public void testBoolean() { + void booleanCase() { String expression = "/ns:people/performers/performer[%s]/someBoolean"; testClient.get().uri("/music/people") @@ -145,7 +145,7 @@ public class XpathAssertionTests { } @Test - public void testNodeCount() { + void nodeCount() { testClient.get().uri("/music/people") .exchange() .expectBody() @@ -156,7 +156,7 @@ public class XpathAssertionTests { } @Test - public void testFeedWithLinefeedChars() { + void feedWithLinefeedChars() { MockMvcWebTestClient.bindToController(new BlogFeedController()).build() .get().uri("/blog.atom") .accept(MediaType.APPLICATION_ATOM_XML) 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 5c0223868bc..7b4a2db3ec2 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 @@ -82,7 +82,7 @@ public class AsyncControllerJavaConfigTests { // SPR-13615 @Test - public void callableInterceptor() throws Exception { + void callableInterceptor() throws Exception { MvcResult mvcResult = this.mockMvc.perform(get("/callable").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(request().asyncStarted()) 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 c10f6533338..f612a63ea2a 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 @@ -91,7 +91,7 @@ public class JavaConfigTests { } @Test - public void person() throws Exception { + void person() throws Exception { this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON)) .andDo(print()) .andExpectAll( @@ -103,7 +103,7 @@ public class JavaConfigTests { } @Test - public void andExpectAllWithOneFailure() { + void andExpectAllWithOneFailure() { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON)) .andExpectAll( @@ -115,7 +115,7 @@ public class JavaConfigTests { } @Test - public void andExpectAllWithMultipleFailures() { + void andExpectAllWithMultipleFailures() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON)) .andExpectAll( diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java index 0c5fb074047..854a7ecd91a 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java @@ -65,7 +65,7 @@ public class WebAppResourceTests { // Resources served via @Test - public void resourceRequest() throws Exception { + void resourceRequest() throws Exception { this.mockMvc.perform(get("/resources/Spring.js")) .andExpect(content().contentType("text/javascript")) .andExpect(content().string(containsString("Spring={};"))); @@ -74,7 +74,7 @@ public class WebAppResourceTests { // Forwarded to the "default" servlet via @Test - public void resourcesViaDefaultServlet() throws Exception { + void resourcesViaDefaultServlet() throws Exception { this.mockMvc.perform(get("/unknown/resource")) .andExpect(handler().handlerType(DefaultServletHttpRequestHandler.class)) .andExpect(forwardedUrl("default")); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java index 3c433f1cede..92e66edbdf3 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java @@ -69,7 +69,7 @@ public class XmlConfigTests { } @Test - public void person() throws Exception { + void person() throws Exception { this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON)) .andDo(print()) .andExpect(status().isOk()) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java index 7d70293f4b0..ca1e086b564 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java @@ -82,12 +82,12 @@ public class CustomRequestAttributesRequestContextHolderTests { } @Test - public void singletonController() throws Exception { + void singletonController() throws Exception { this.mockMvc.perform(get("/singletonController").requestAttr(FROM_MVC_TEST_MOCK, FROM_MVC_TEST_MOCK)); } @AfterEach - public void verifyCustomRequestAttributesAreRestored() { + void verifyCustomRequestAttributesAreRestored() { RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); assertThat(requestAttributes).isInstanceOf(ServletRequestAttributes.class); HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/FormContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/FormContentTests.java index 1803b4da1ae..14724fb43c2 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/FormContentTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/FormContentTests.java @@ -36,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class FormContentTests { @Test // SPR-15753 - public void formContentIsNotDuplicated() throws Exception { + void formContentIsNotDuplicated() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new Spr15753Controller()) .addFilter(new FormContentFilter()) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java index 64fda28f410..cefefc23a6a 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java @@ -113,30 +113,30 @@ public class RequestContextHolderTests { } @Test - public void singletonController() throws Exception { + void singletonController() throws Exception { this.mockMvc.perform(get("/singletonController").requestAttr(FROM_MVC_TEST_MOCK, FROM_MVC_TEST_MOCK)); } @Test - public void requestScopedController() throws Exception { + void requestScopedController() throws Exception { assertThat(AopUtils.isCglibProxy(this.requestScopedController)).as("request-scoped controller must be a CGLIB proxy").isTrue(); this.mockMvc.perform(get("/requestScopedController").requestAttr(FROM_MVC_TEST_MOCK, FROM_MVC_TEST_MOCK)); } @Test - public void requestScopedService() throws Exception { + void requestScopedService() throws Exception { assertThat(AopUtils.isCglibProxy(this.requestScopedService)).as("request-scoped service must be a CGLIB proxy").isTrue(); this.mockMvc.perform(get("/requestScopedService").requestAttr(FROM_MVC_TEST_MOCK, FROM_MVC_TEST_MOCK)); } @Test - public void sessionScopedService() throws Exception { + void sessionScopedService() throws Exception { assertThat(AopUtils.isCglibProxy(this.sessionScopedService)).as("session-scoped service must be a CGLIB proxy").isTrue(); this.mockMvc.perform(get("/sessionScopedService").requestAttr(FROM_MVC_TEST_MOCK, FROM_MVC_TEST_MOCK)); } @AfterEach - public void verifyRestoredRequestAttributes() { + void verifyRestoredRequestAttributes() { assertRequestAttributes(false); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ApiVersionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ApiVersionTests.java index be52b6634df..10447d50b1b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ApiVersionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ApiVersionTests.java @@ -44,7 +44,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal public class ApiVersionTests { @Test - public void queryParameter() throws Exception { + void queryParameter() throws Exception { String header = "API-Version"; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java index 7ffd055ea93..9f0454204f4 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java @@ -68,7 +68,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal public class FilterTests { @Test - public void whenFiltersCompleteMvcProcessesRequest() throws Exception { + void whenFiltersCompleteMvcProcessesRequest() throws Exception { standaloneSetup(new PersonController()) .addFilters(new ContinueFilter()).build() .perform(post("/persons").param("name", "Andy")) @@ -81,7 +81,7 @@ public class FilterTests { } @Test - public void filtersProcessRequest() throws Exception { + void filtersProcessRequest() throws Exception { standaloneSetup(new PersonController()) .addFilters(new ContinueFilter(), new RedirectFilter()).build() .perform(post("/persons").param("name", "Andy")) @@ -89,7 +89,7 @@ public class FilterTests { } @Test - public void filterMappedBySuffix() throws Exception { + void filterMappedBySuffix() throws Exception { standaloneSetup(new PersonController()) .addFilter(new RedirectFilter(), "*.html").build() .perform(post("/persons.html").param("name", "Andy")) @@ -97,7 +97,7 @@ public class FilterTests { } @Test - public void filterWithExactMapping() throws Exception { + void filterWithExactMapping() throws Exception { standaloneSetup(new PersonController()) .addFilter(new RedirectFilter(), "/p", "/persons").build() .perform(post("/persons").param("name", "Andy")) @@ -105,7 +105,7 @@ public class FilterTests { } @Test - public void filterSkipped() throws Exception { + void filterSkipped() throws Exception { standaloneSetup(new PersonController()) .addFilter(new RedirectFilter(), "/p", "/person").build() .perform(post("/persons").param("name", "Andy")) @@ -118,7 +118,7 @@ public class FilterTests { } @Test - public void filterWrapsRequestResponse() throws Exception { + void filterWrapsRequestResponse() throws Exception { standaloneSetup(new PersonController()) .addFilters(new WrappingRequestResponseFilter()).build() .perform(post("/user")) @@ -126,7 +126,7 @@ public class FilterTests { } @Test // SPR-16067, SPR-16695 - public void filterWrapsRequestResponseAndPerformsAsyncDispatch() throws Exception { + void filterWrapsRequestResponseAndPerformsAsyncDispatch() throws Exception { MockMvc mockMvc = standaloneSetup(new PersonController()) .addFilters(new WrappingRequestResponseFilter(), new ShallowEtagHeaderFilter()) .build(); 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 d7fe6830a49..de2ba07bd01 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 @@ -56,12 +56,12 @@ public class FrameworkExtensionTests { @Test - public void fooHeader() throws Exception { + void fooHeader() throws Exception { this.mockMvc.perform(get("/").with(headers().foo("a=b"))).andExpect(content().string("Foo")); } @Test - public void barHeader() throws Exception { + void barHeader() throws Exception { this.mockMvc.perform(get("/").with(headers().bar("a=b"))).andExpect(content().string("Bar")); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java index 1a3efc3845b..3c66e97725d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java @@ -43,7 +43,7 @@ public class ReactiveReturnTypeTests { @Test // SPR-16869 - public void sseWithFlux() throws Exception { + void sseWithFlux() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(ReactiveController.class).build(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java index 09a3c0f49a5..321d52e6a65 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java @@ -57,7 +57,7 @@ public class RedirectTests { @Test - public void save() throws Exception { + void save() throws Exception { this.mockMvc.perform(post("/persons").param("name", "Andy")) .andExpect(status().isFound()) .andExpect(redirectedUrl("/persons/Joe")) @@ -68,7 +68,7 @@ public class RedirectTests { } @Test - public void saveSpecial() throws Exception { + void saveSpecial() throws Exception { this.mockMvc.perform(post("/people").param("name", "Andy")) .andExpect(status().isFound()) .andExpect(redirectedUrl("/persons/Joe")) @@ -79,7 +79,7 @@ public class RedirectTests { } @Test - public void saveWithErrors() throws Exception { + void saveWithErrors() throws Exception { this.mockMvc.perform(post("/persons")) .andExpect(status().isOk()) .andExpect(forwardedUrl("persons/add")) @@ -89,7 +89,7 @@ public class RedirectTests { } @Test - public void saveSpecialWithErrors() throws Exception { + void saveSpecialWithErrors() throws Exception { this.mockMvc.perform(post("/people")) .andExpect(status().isOk()) .andExpect(forwardedUrl("persons/add")) @@ -99,7 +99,7 @@ public class RedirectTests { } @Test - public void getPerson() throws Exception { + void getPerson() throws Exception { this.mockMvc.perform(get("/persons/Joe").flashAttr("message", "success!")) .andExpect(status().isOk()) .andExpect(forwardedUrl("persons/index")) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java index c9235a0e48b..5a7697f1bee 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java @@ -39,7 +39,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal public class RequestParameterTests { @Test - public void queryParameter() throws Exception { + void queryParameter() throws Exception { standaloneSetup(new PersonController()).build() .perform(get("/search?name=George").accept(MediaType.APPLICATION_JSON)) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RouterFunctionTests.java index 6318484119c..45ebce6ece5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RouterFunctionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RouterFunctionTests.java @@ -18,7 +18,6 @@ package org.springframework.test.web.servlet.samples.standalone; import java.util.concurrent.CompletableFuture; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -48,13 +47,8 @@ import static org.springframework.web.servlet.function.ServerResponse.ok; */ public class RouterFunctionTests { - private MockMvc mockMvc; + private MockMvc mockMvc = routerFunctions(testRoute()).defaultResponseCharacterEncoding(UTF_8).build(); - @BeforeEach - void setUp() { - RouterFunction testRoute = testRoute(); - this.mockMvc = routerFunctions(testRoute).defaultResponseCharacterEncoding(UTF_8).build(); - } @Test void json() throws Exception { @@ -75,7 +69,7 @@ public class RouterFunctionTests { } @Test - public void queryParameter() throws Exception { + void queryParameter() throws Exception { this.mockMvc .perform(get("/search?name=George").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) @@ -164,4 +158,5 @@ public class RouterFunctionTests { this.age = age; } } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java index 279ba271e8a..2b84f93e520 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java @@ -54,7 +54,7 @@ public class PrintingResultHandlerSmokeTests { // Comment out class-level @Disabled to see the output. @Test - public void testPrint() throws Exception { + void printToVariousOutputs() throws Exception { StringWriter writer = new StringWriter(); standaloneSetup(new SimpleController()) @@ -82,4 +82,5 @@ public class PrintingResultHandlerSmokeTests { return "Hello Response"; } } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java index 6e8e8ab6697..7260746bedf 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java @@ -82,50 +82,50 @@ public class CookieAssertionTests { @Test - public void testExists() throws Exception { + void exists() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().exists(COOKIE_NAME)); } @Test - public void testNotExists() throws Exception { + void notExists() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().doesNotExist("unknownCookie")); } @Test - public void testEqualTo() throws Exception { + void hamcrestEqualTo() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().value(COOKIE_NAME, "en-US")); this.mockMvc.perform(get("/")).andExpect(cookie().value(COOKIE_NAME, equalTo("en-US"))); } @Test - public void testMatcher() throws Exception { + void matcher() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().value(COOKIE_NAME, startsWith("en"))); } @Test - public void testMaxAge() throws Exception { + void maxAge() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().maxAge(COOKIE_NAME, -1)); } @Test - public void testDomain() throws Exception { + void domain() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().domain(COOKIE_NAME, "domain")); } @Test - void testSameSite() throws Exception { + void sameSite() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie() .sameSite(COOKIE_NAME, "foo")); } @Test - void testSameSiteMatcher() throws Exception { + void sameSiteMatcher() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie() .sameSite(COOKIE_WITH_ATTRIBUTES_NAME, startsWith("Str"))); } @Test - void testSameSiteNotEquals() { + void sameSiteNotEquals() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/")).andExpect(cookie() .sameSite(COOKIE_WITH_ATTRIBUTES_NAME, "Str"))) @@ -133,46 +133,46 @@ public class CookieAssertionTests { } @Test - public void testVersion() throws Exception { + void version() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().version(COOKIE_NAME, 0)); } @Test - public void testPath() throws Exception { + void path() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().path(COOKIE_NAME, "/")); } @Test - public void testSecured() throws Exception { + void secured() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().secure(COOKIE_NAME, false)); } @Test - public void testHttpOnly() throws Exception { + void httpOnly() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie().httpOnly(COOKIE_NAME, true)); } @Test - void testAttribute() throws Exception { + void attribute() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie() .attribute(COOKIE_WITH_ATTRIBUTES_NAME, SECOND_COOKIE_ATTRIBUTE, "there")); } @Test - void testAttributeMatcher() throws Exception { + void attributeMatcher() throws Exception { this.mockMvc.perform(get("/")).andExpect(cookie() .attribute(COOKIE_WITH_ATTRIBUTES_NAME, SECOND_COOKIE_ATTRIBUTE, is("there"))); } @Test - void testAttributeNotPresent() { + void attributeNotPresent() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/")) .andExpect(cookie().attribute(COOKIE_WITH_ATTRIBUTES_NAME, "randomAttribute", anything()))) .withMessage("Response cookie 'SecondCookie' doesn't have attribute 'randomAttribute'"); } @Test - void testAttributeNotEquals() { + void attributeNotEquals() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/")) .andExpect(cookie().attribute(COOKIE_WITH_ATTRIBUTES_NAME, SECOND_COOKIE_ATTRIBUTE, "foo"))) .withMessage("Response cookie 'SecondCookie' attribute 'COOKIE_ATTRIBUTE' expected: but was:"); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java index 08529114442..53d93d470c7 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java @@ -48,12 +48,12 @@ public class HandlerAssertionTests { @Test - public void handlerType() throws Exception { + void handlerType() throws Exception { this.mockMvc.perform(get("/")).andExpect(handler().handlerType(SimpleController.class)); } @Test - public void methodCallOnNonMock() { + void methodCallOnNonMock() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/")).andExpect(handler().methodCall("bogus"))) .withMessageContaining("The supplied object [bogus] is not an instance of") @@ -62,23 +62,23 @@ public class HandlerAssertionTests { } @Test - public void methodCall() throws Exception { + void methodCall() throws Exception { this.mockMvc.perform(get("/")).andExpect(handler().methodCall(on(SimpleController.class).handle())); } @Test - public void methodName() throws Exception { + void methodName() throws Exception { this.mockMvc.perform(get("/")).andExpect(handler().methodName("handle")); } @Test - public void methodNameMatchers() throws Exception { + void methodNameMatchers() throws Exception { this.mockMvc.perform(get("/")).andExpect(handler().methodName(equalTo("handle"))); this.mockMvc.perform(get("/")).andExpect(handler().methodName(is(not("save")))); } @Test - public void method() throws Exception { + void method() throws Exception { Method method = SimpleController.class.getMethod("handle"); this.mockMvc.perform(get("/")).andExpect(handler().method(method)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java index 95d632887ea..45abb48a20c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java @@ -87,56 +87,56 @@ public class HeaderAssertionTests { @Test - public void stringWithCorrectResponseHeaderValue() throws Exception { + void stringWithCorrectResponseHeaderValue() throws Exception { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, minuteAgo)) .andExpect(header().string(LAST_MODIFIED, now)); } @Test - public void stringWithMatcherAndCorrectResponseHeaderValue() throws Exception { + void stringWithMatcherAndCorrectResponseHeaderValue() throws Exception { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, minuteAgo)) .andExpect(header().string(LAST_MODIFIED, equalTo(now))); } @Test - public void multiStringHeaderValue() throws Exception { + void multiStringHeaderValue() throws Exception { this.mockMvc.perform(get("/persons/1")).andExpect(header().stringValues(VARY, "foo", "bar")); } @Test - public void multiStringHeaderValueWithMatchers() throws Exception { + void multiStringHeaderValueWithMatchers() throws Exception { this.mockMvc.perform(get("/persons/1")) .andExpect(header().stringValues(VARY, hasItems(containsString("foo"), startsWith("bar")))); } @Test - public void dateValueWithCorrectResponseHeaderValue() throws Exception { + void dateValueWithCorrectResponseHeaderValue() throws Exception { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, minuteAgo)) .andExpect(header().dateValue(LAST_MODIFIED, this.currentTime)); } @Test - public void longValueWithCorrectResponseHeaderValue() throws Exception { + void longValueWithCorrectResponseHeaderValue() throws Exception { this.mockMvc.perform(get("/persons/1")) .andExpect(header().longValue("X-Rate-Limiting", 42)); } @Test - public void stringWithMissingResponseHeader() throws Exception { + void stringWithMissingResponseHeader() throws Exception { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, now)) .andExpect(status().isNotModified()) .andExpect(header().stringValues("X-Custom-Header")); } @Test - public void stringWithMatcherAndMissingResponseHeader() throws Exception { + void stringWithMatcherAndMissingResponseHeader() throws Exception { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, now)) .andExpect(status().isNotModified()) .andExpect(header().string("X-Custom-Header", nullValue())); } @Test - public void longValueWithMissingResponseHeader() throws Exception { + void longValueWithMissingResponseHeader() throws Exception { try { this.mockMvc.perform(get("/persons/1").header(IF_MODIFIED_SINCE, now)) .andExpect(status().isNotModified()) @@ -153,35 +153,35 @@ public class HeaderAssertionTests { } @Test - public void exists() throws Exception { + void exists() throws Exception { this.mockMvc.perform(get("/persons/1")).andExpect(header().exists(LAST_MODIFIED)); } @Test - public void existsFail() { + void existsFail() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/persons/1")).andExpect(header().exists("X-Custom-Header"))); } @Test // SPR-10771 - public void doesNotExist() throws Exception { + void doesNotExist() throws Exception { this.mockMvc.perform(get("/persons/1")).andExpect(header().doesNotExist("X-Custom-Header")); } @Test // SPR-10771 - public void doesNotExistFail() { + void doesNotExistFail() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/persons/1")).andExpect(header().doesNotExist(LAST_MODIFIED))); } @Test - public void longValueWithIncorrectResponseHeaderValue() { + void longValueWithIncorrectResponseHeaderValue() { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.mockMvc.perform(get("/persons/1")).andExpect(header().longValue("X-Rate-Limiting", 1))); } @Test - public void stringWithMatcherAndIncorrectResponseHeaderValue() throws Exception { + void stringWithMatcherAndIncorrectResponseHeaderValue() throws Exception { long secondLater = this.currentTime + 1000; String expected = this.dateFormat.format(new Date(secondLater)); assertIncorrectResponseHeader(header().string(LAST_MODIFIED, expected), expected); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java index 0d8873f0bfd..e93a6ea7580 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java @@ -64,7 +64,7 @@ public class JsonPathAssertionTests { @Test - public void exists() throws Exception { + void exists() throws Exception { String composerByName = "$.composers[?(@.name == '%s')]"; String performerByName = "$.performers[?(@.name == '%s')]"; @@ -82,7 +82,7 @@ public class JsonPathAssertionTests { } @Test - public void doesNotExist() throws Exception { + void doesNotExist() throws Exception { this.mockMvc.perform(get("/music/people")) .andExpect(jsonPath("$.composers[?(@.name == 'Edvard Grieeeeeeg')]").doesNotExist()) .andExpect(jsonPath("$.composers[?(@.name == 'Robert Schuuuuuuman')]").doesNotExist()) @@ -90,7 +90,7 @@ public class JsonPathAssertionTests { } @Test - public void equality() throws Exception { + void equality() throws Exception { this.mockMvc.perform(get("/music/people")) .andExpect(jsonPath("$.composers[0].name").value("Johann Sebastian Bach")) .andExpect(jsonPath("$.performers[1].name").value("Yehudi Menuhin")); @@ -102,7 +102,7 @@ public class JsonPathAssertionTests { } @Test - public void hamcrestMatcher() throws Exception { + void hamcrestMatcher() throws Exception { this.mockMvc.perform(get("/music/people")) .andExpect(jsonPath("$.composers[0].name", startsWith("Johann"))) .andExpect(jsonPath("$.performers[0].name", endsWith("Ashkenazy"))) @@ -111,7 +111,7 @@ public class JsonPathAssertionTests { } @Test - public void hamcrestMatcherWithParameterizedJsonPath() throws Exception { + void hamcrestMatcherWithParameterizedJsonPath() throws Exception { String composerName = "$.composers[%s].name"; String performerName = "$.performers[%s].name"; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java index 1c5c3835927..985da131183 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java @@ -45,22 +45,22 @@ public class UrlAssertionTests { } @Test - public void testRedirect() throws Exception { + void redirect() throws Exception { this.mockMvc.perform(get("/persons")).andExpect(redirectedUrl("/persons/1")); } @Test - public void testRedirectPattern() throws Exception { + void redirectPattern() throws Exception { this.mockMvc.perform(get("/persons")).andExpect(redirectedUrlPattern("/persons/*")); } @Test - public void testForward() throws Exception { + void forward() throws Exception { this.mockMvc.perform(get("/")).andExpect(forwardedUrl("/home")); } @Test - public void testForwardPattern() throws Exception { + void forwardPattern() throws Exception { this.mockMvc.perform(get("/")).andExpect(forwardedUrlPattern("/ho?e")); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java index 3d7c58a71bb..a88f003f8e7 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java @@ -47,14 +47,14 @@ public class ViewNameAssertionTests { } @Test - public void testEqualTo() throws Exception { + void hamcrestEqualTo() throws Exception { this.mockMvc.perform(get("/")) .andExpect(view().name("mySpecialView")) .andExpect(view().name(equalTo("mySpecialView"))); } @Test - public void testHamcrestMatcher() throws Exception { + void hamcrestMatcher() throws Exception { this.mockMvc.perform(get("/")).andExpect(view().name(containsString("Special"))); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java index 4880f6e3c3a..2ed94557033 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java @@ -72,12 +72,12 @@ public class XmlContentAssertionTests { } @Test - public void testXmlEqualTo() throws Exception { + void xmlEqualTo() throws Exception { this.mockMvc.perform(get("/music/people")).andExpect(content().xml(PEOPLE_XML)); } @Test - public void testNodeHamcrestMatcher() throws Exception { + void nodeHamcrestMatcher() throws Exception { this.mockMvc.perform(get("/music/people")) .andExpect(content().node(hasXPath("/people/composers/composer[1]"))); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java index 4dd325e507f..a6d17bfda4c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java @@ -74,7 +74,7 @@ public class XpathAssertionTests { } @Test - public void testExists() throws Exception { + void exists() throws Exception { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -90,7 +90,7 @@ public class XpathAssertionTests { } @Test - public void testDoesNotExist() throws Exception { + void doesNotExist() throws Exception { String composer = "/ns:people/composers/composer[%s]"; String performer = "/ns:people/performers/performer[%s]"; @@ -104,7 +104,7 @@ public class XpathAssertionTests { } @Test - public void testString() throws Exception { + void string() throws Exception { String composerName = "/ns:people/composers/composer[%s]/name"; String performerName = "/ns:people/performers/performer[%s]/name"; @@ -122,7 +122,7 @@ public class XpathAssertionTests { } @Test - public void testNumber() throws Exception { + void number() throws Exception { String composerDouble = "/ns:people/composers/composer[%s]/someDouble"; @@ -136,7 +136,7 @@ public class XpathAssertionTests { } @Test - public void testBoolean() throws Exception { + void booleanCase() throws Exception { String performerBooleanValue = "/ns:people/performers/performer[%s]/someBoolean"; @@ -146,7 +146,7 @@ public class XpathAssertionTests { } @Test - public void testNodeCount() throws Exception { + void nodeCount() throws Exception { this.mockMvc.perform(get("/music/people")) .andExpect(xpath("/ns:people/composers/composer", musicNamespace).nodeCount(4)) @@ -157,7 +157,7 @@ public class XpathAssertionTests { @Test // SPR-10704 - public void testFeedWithLinefeedChars() throws Exception { + void feedWithLinefeedChars() throws Exception { standaloneSetup(new BlogFeedController()).build() .perform(get("/blog.atom").accept(MediaType.APPLICATION_ATOM_XML)) .andExpect(status().isOk()) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java index a4ac762f5d2..73c7ed16b5f 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java @@ -44,14 +44,14 @@ public class DefaultMockMvcBuilderTests { private final MockServletContext servletContext = new MockServletContext(); @Test - public void webAppContextSetupWithNullWac() { + void webAppContextSetupWithNullWac() { assertThatIllegalArgumentException().isThrownBy(() -> webAppContextSetup(null)) .withMessage("WebApplicationContext is required"); } @Test - public void webAppContextSetupWithNullServletContext() { + void webAppContextSetupWithNullServletContext() { assertThatIllegalArgumentException().isThrownBy(() -> webAppContextSetup(new StubWebApplicationContext(null))) .withMessage("WebApplicationContext must have a ServletContext"); @@ -61,7 +61,7 @@ public class DefaultMockMvcBuilderTests { * See SPR-12553 and SPR-13075. */ @Test - public void rootWacServletContainerAttributePreviouslySet() { + void rootWacServletContainerAttributePreviouslySet() { StubWebApplicationContext child = new StubWebApplicationContext(this.servletContext); this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, child); @@ -73,7 +73,7 @@ public class DefaultMockMvcBuilderTests { * See SPR-12553 and SPR-13075. */ @Test - public void rootWacServletContainerAttributePreviouslySetWithContextHierarchy() { + void rootWacServletContainerAttributePreviouslySetWithContextHierarchy() { StubWebApplicationContext root = new StubWebApplicationContext(this.servletContext); this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, root); @@ -90,7 +90,7 @@ public class DefaultMockMvcBuilderTests { * See SPR-12553 and SPR-13075. */ @Test - public void rootWacServletContainerAttributeNotPreviouslySet() { + void rootWacServletContainerAttributeNotPreviouslySet() { StubWebApplicationContext root = new StubWebApplicationContext(this.servletContext); DefaultMockMvcBuilder builder = webAppContextSetup(root); WebApplicationContext wac = builder.initWebAppContext(); @@ -102,7 +102,7 @@ public class DefaultMockMvcBuilderTests { * See SPR-12553 and SPR-13075. */ @Test - public void rootWacServletContainerAttributeNotPreviouslySetWithContextHierarchy() { + void rootWacServletContainerAttributeNotPreviouslySetWithContextHierarchy() { StaticApplicationContext ear = new StaticApplicationContext(); StaticWebApplicationContext root = new StaticWebApplicationContext(); root.setParent(ear); @@ -124,7 +124,7 @@ public class DefaultMockMvcBuilderTests { * See /SPR-14277 */ @Test - public void dispatcherServletCustomizer() { + void dispatcherServletCustomizer() { StubWebApplicationContext root = new StubWebApplicationContext(this.servletContext); DefaultMockMvcBuilder builder = webAppContextSetup(root); builder.addDispatcherServletCustomizer(ds -> ds.setContextId("test-id")); @@ -136,7 +136,7 @@ public class DefaultMockMvcBuilderTests { } @Test - public void dispatcherServletCustomizerProcessedInOrder() { + void dispatcherServletCustomizerProcessedInOrder() { StubWebApplicationContext root = new StubWebApplicationContext(this.servletContext); DefaultMockMvcBuilder builder = webAppContextSetup(root); builder.addDispatcherServletCustomizer(ds -> ds.setContextId("test-id")); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java index ee7d4ec01e8..ab9c3c529f6 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java @@ -64,7 +64,7 @@ public class MockMvcFilterDecoratorTests { @Test - public void init() throws Exception { + void init() throws Exception { FilterConfig config = new MockFilterConfig(); filter = new MockMvcFilterDecorator(delegate, new String[] {"/"}); filter.init(config); @@ -72,133 +72,133 @@ public class MockMvcFilterDecoratorTests { } @Test - public void destroy() { + void destroy() { filter = new MockMvcFilterDecorator(delegate, new String[] {"/"}); filter.destroy(); assertThat(delegate.destroy).isTrue(); } @Test - public void matchExact() throws Exception { + void matchExact() throws Exception { assertFilterInvoked("/test", "/test"); } @Test - public void matchExactEmpty() throws Exception { + void matchExactEmpty() throws Exception { assertFilterInvoked("", ""); } @Test - public void matchPathMappingAllFolder() throws Exception { + void matchPathMappingAllFolder() throws Exception { assertFilterInvoked("/test/this", "*"); assertFilterInvoked("/test/this", "/*"); } @Test - public void matchPathMappingAll() throws Exception { + void matchPathMappingAll() throws Exception { assertFilterInvoked("/test", "*"); assertFilterInvoked("/test", "/*"); } @Test - public void matchPathMappingAllContextRoot() throws Exception { + void matchPathMappingAllContextRoot() throws Exception { assertFilterInvoked("", "*"); assertFilterInvoked("", "/*"); } @Test - public void matchPathMappingContextRootAndSlash() throws Exception { + void matchPathMappingContextRootAndSlash() throws Exception { assertFilterInvoked("/", "*"); assertFilterInvoked("/", "/*"); } @Test - public void matchPathMappingFolderPatternWithMultiFolderPath() throws Exception { + void matchPathMappingFolderPatternWithMultiFolderPath() throws Exception { assertFilterInvoked("/test/this/here", "/test/*"); } @Test - public void matchPathMappingFolderPattern() throws Exception { + void matchPathMappingFolderPattern() throws Exception { assertFilterInvoked("/test/this", "/test/*"); } @Test - public void matchPathMappingNoSuffix() throws Exception { + void matchPathMappingNoSuffix() throws Exception { assertFilterInvoked("/test/", "/test/*"); } @Test - public void matchPathMappingMissingSlash() throws Exception { + void matchPathMappingMissingSlash() throws Exception { assertFilterInvoked("/test", "/test/*"); } @Test - public void noMatchPathMappingMulti() throws Exception { + void noMatchPathMappingMulti() throws Exception { assertFilterNotInvoked("/this/test/here", "/test/*"); } @Test - public void noMatchPathMappingEnd() throws Exception { + void noMatchPathMappingEnd() throws Exception { assertFilterNotInvoked("/this/test", "/test/*"); } @Test - public void noMatchPathMappingEndSuffix() throws Exception { + void noMatchPathMappingEndSuffix() throws Exception { assertFilterNotInvoked("/test2/", "/test/*"); } @Test - public void noMatchPathMappingMissingSlash() throws Exception { + void noMatchPathMappingMissingSlash() throws Exception { assertFilterNotInvoked("/test2", "/test/*"); } @Test - public void noMatchDispatcherType() throws Exception { + void noMatchDispatcherType() throws Exception { assertFilterNotInvoked(DispatcherType.FORWARD, DispatcherType.REQUEST, "/test", "/test"); } @Test - public void matchExtensionMulti() throws Exception { + void matchExtensionMulti() throws Exception { assertFilterInvoked("/test/this/here.html", "*.html"); } @Test - public void matchExtension() throws Exception { + void matchExtension() throws Exception { assertFilterInvoked("/test/this.html", "*.html"); } @Test - public void matchExtensionNoPrefix() throws Exception { + void matchExtensionNoPrefix() throws Exception { assertFilterInvoked("/.html", "*.html"); } @Test - public void matchExtensionNoFolder() throws Exception { + void matchExtensionNoFolder() throws Exception { assertFilterInvoked("/test.html", "*.html"); } @Test - public void noMatchExtensionNoSlash() throws Exception { + void noMatchExtensionNoSlash() throws Exception { assertFilterNotInvoked(".html", "*.html"); } @Test - public void noMatchExtensionSlashEnd() throws Exception { + void noMatchExtensionSlashEnd() throws Exception { assertFilterNotInvoked("/index.html/", "*.html"); } @Test - public void noMatchExtensionPeriodEnd() throws Exception { + void noMatchExtensionPeriodEnd() throws Exception { assertFilterNotInvoked("/index.html.", "*.html"); } @Test - public void noMatchExtensionLarger() throws Exception { + void noMatchExtensionLarger() throws Exception { assertFilterNotInvoked("/index.htm", "*.html"); } @Test - public void noMatchInvalidPattern() throws Exception { + void noMatchInvalidPattern() throws Exception { // pattern uses extension mapping but starts with / (treated as exact match) assertFilterNotInvoked("/index.html", "/*.html"); } @@ -207,37 +207,37 @@ public class MockMvcFilterDecoratorTests { * Below are tests from Table 12-1 of the Servlet Specification */ @Test - public void specPathMappingMultiFolderPattern() throws Exception { + void specPathMappingMultiFolderPattern() throws Exception { assertFilterInvoked("/foo/bar/index.html", "/foo/bar/*"); } @Test - public void specPathMappingMultiFolderPatternAlternate() throws Exception { + void specPathMappingMultiFolderPatternAlternate() throws Exception { assertFilterInvoked("/foo/bar/index.bop", "/foo/bar/*"); } @Test - public void specPathMappingNoSlash() throws Exception { + void specPathMappingNoSlash() throws Exception { assertFilterInvoked("/baz", "/baz/*"); } @Test - public void specPathMapping() throws Exception { + void specPathMapping() throws Exception { assertFilterInvoked("/baz/index.html", "/baz/*"); } @Test - public void specExactMatch() throws Exception { + void specExactMatch() throws Exception { assertFilterInvoked("/catalog", "/catalog"); } @Test - public void specExtensionMappingSingleFolder() throws Exception { + void specExtensionMappingSingleFolder() throws Exception { assertFilterInvoked("/catalog/racecar.bop", "*.bop"); } @Test - public void specExtensionMapping() throws Exception { + void specExtensionMapping() throws Exception { assertFilterInvoked("/index.bop", "*.bop"); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java index 1cbfd6d7a1a..95f599089bb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java @@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.setup.SharedHttpSessionConfig public class SharedHttpSessionTests { @Test - public void httpSession() throws Exception { + void httpSession() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new TestController()) .apply(sharedHttpSession()) .build(); @@ -61,7 +61,7 @@ public class SharedHttpSessionTests { } @Test - public void noHttpSession() throws Exception { + void noHttpSession() throws Exception { MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new TestController()) .apply(sharedHttpSession()) .build(); 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 294b75e7758..73714296be4 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 @@ -35,25 +35,25 @@ import static org.mockito.Mockito.verify; class LocalConnectionFactoryBeanTests { @Test - void testManagedConnectionFactoryIsRequired() { + void managedConnectionFactoryIsRequired() { assertThatIllegalArgumentException().isThrownBy( new LocalConnectionFactoryBean()::afterPropertiesSet); } @Test - void testIsSingleton() { + void isSingleton() { LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); assertThat(factory.isSingleton()).isTrue(); } @Test - void testGetObjectTypeIsNullIfConnectionFactoryHasNotBeenConfigured() { + void getObjectTypeIsNullIfConnectionFactoryHasNotBeenConfigured() { LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); assertThat(factory.getObjectType()).isNull(); } @Test - void testCreatesVanillaConnectionFactoryIfNoConnectionManagerHasBeenConfigured() throws Exception { + void createsVanillaConnectionFactoryIfNoConnectionManagerHasBeenConfigured() throws Exception { final Object CONNECTION_FACTORY = new Object(); ManagedConnectionFactory managedConnectionFactory = mock(); given(managedConnectionFactory.createConnectionFactory()).willReturn(CONNECTION_FACTORY); @@ -64,7 +64,7 @@ class LocalConnectionFactoryBeanTests { } @Test - void testCreatesManagedConnectionFactoryIfAConnectionManagerHasBeenConfigured() throws Exception { + void createsManagedConnectionFactoryIfAConnectionManagerHasBeenConfigured() throws Exception { ManagedConnectionFactory managedConnectionFactory = mock(); ConnectionManager connectionManager = mock(); LocalConnectionFactoryBean factory = new LocalConnectionFactoryBean(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java index d428da79fc5..6f37a8f7b97 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java @@ -636,9 +636,11 @@ class AnnotationTransactionAttributeSourceTests { interface ITestBean2X extends ITestBean2, BeanNameAware { + @Override @Transactional int getAge(); + @Override void setAge(int age); String getName(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index 4779b563739..82704e485b1 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -81,7 +81,7 @@ class EnableTransactionManagementTests { } @Test // gh-31238 - public void cglibProxyClassIsCachedAcrossApplicationContexts() { + void cglibProxyClassIsCachedAcrossApplicationContexts() { ConfigurableApplicationContext ctx; // Round #1 diff --git a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java index 22f4570bf69..a62364a430f 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java @@ -64,7 +64,7 @@ class HttpEntityTests { } @Test - void testEquals() { + void equals() { HttpHeaders headers1 = new HttpHeaders(); headers1.set("Content-Type", "text/plain"); 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 f03be86c264..5e446857e61 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java @@ -170,7 +170,7 @@ class HttpRangeTests { } @Test // gh-23576 - public void toResourceRegionStartingAtResourceByteCount() { + void toResourceRegionStartingAtResourceByteCount() { byte[] bytes = "Spring Framework".getBytes(StandardCharsets.UTF_8); ByteArrayResource resource = new ByteArrayResource(bytes); HttpRange range = HttpRange.createByteRange(resource.contentLength()); diff --git a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java index 8ec8ae00b3d..a7c9c090fb5 100644 --- a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java +++ b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.within; class MediaTypeTests { @Test - void testToString() { + void toStringOutput() { MediaType mediaType = new MediaType("text", "plain", 0.7); String result = mediaType.toString(); assertThat(result).as("Invalid toString() returned").isEqualTo("text/plain;q=0.7"); @@ -163,7 +163,7 @@ class MediaTypeTests { } @Test // gh-23241 - public void parseMediaTypesWithTrailingComma() { + void parseMediaTypesWithTrailingComma() { List mediaTypes = MediaType.parseMediaTypes("text/plain, text/html, "); assertThat(mediaTypes).as("No media types returned").isNotNull(); assertThat(mediaTypes).as("Incorrect number of media types").hasSize(2); @@ -279,7 +279,7 @@ class MediaTypeTests { } @Test - void testWithConversionService() { + void withConversionService() { ConversionService conversionService = new DefaultConversionService(); assertThat(conversionService.canConvert(String.class, MediaType.class)).isTrue(); MediaType mediaType = MediaType.parseMediaType("application/xml"); diff --git a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java index 67540fc1e7d..d145f3f92a8 100644 --- a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java +++ b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java @@ -83,7 +83,7 @@ class ResponseCookieTests { } @Test // gh-24663 - public void domainWithEmptyDoubleQuotes() { + void domainWithEmptyDoubleQuotes() { Arrays.asList("\"\"", "\t\"\" ", " \" \t \"\t") .forEach(domain -> { diff --git a/spring-web/src/test/java/org/springframework/http/client/JdkClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/JdkClientHttpRequestFactoryTests.java index efb0a01dd06..f82ede88255 100644 --- a/spring-web/src/test/java/org/springframework/http/client/JdkClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/JdkClientHttpRequestFactoryTests.java @@ -88,7 +88,7 @@ class JdkClientHttpRequestFactoryTests extends AbstractHttpRequestFactoryTests { } @Test // gh-31451 - public void contentLength0() throws IOException { + void contentLength0() throws IOException { URI uri = URI.create(this.baseUrl + "/methods/get"); ClientHttpRequest request = new BufferingClientHttpRequestFactory(this.factory).createRequest(uri, HttpMethod.GET); diff --git a/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java b/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java index 41c96ba672c..ac4e7a62e84 100644 --- a/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java @@ -91,7 +91,7 @@ class MultipartBodyBuilderTests { } @Test // SPR-16601 - public void publisherEntityAcceptedAsInput() { + void publisherEntityAcceptedAsInput() { Publisher publisher = Flux.just("foo", "bar", "baz"); MultipartBodyBuilder builder = new MultipartBodyBuilder(); 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 161011be5ba..9276f4f1f2d 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 @@ -80,7 +80,7 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact } @Test // SPR-8809 - public void interceptor() throws Exception { + void interceptor() throws Exception { final String headerName = "MyHeader"; final String headerValue = "MyValue"; ClientHttpRequestInterceptor interceptor = (request, body, execution) -> { @@ -106,7 +106,7 @@ public class SimpleClientHttpRequestFactoryTests extends AbstractHttpRequestFact } @Test // SPR-13225 - public void headerWithNullValue() { + void headerWithNullValue() { HttpURLConnection urlConnection = mock(); given(urlConnection.getRequestMethod()).willReturn("GET"); 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 4bc1265c246..af7201ccb29 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 @@ -47,7 +47,7 @@ class SimpleClientHttpResponseTests { @Test // SPR-14040 - public void shouldNotCloseConnectionWhenResponseClosed() throws Exception { + void shouldNotCloseConnectionWhenResponseClosed() throws Exception { TestByteArrayInputStream is = new TestByteArrayInputStream("Spring".getBytes(StandardCharsets.UTF_8)); given(this.connection.getResponseCode()).willReturn(200); given(this.connection.getInputStream()).willReturn(is); @@ -61,7 +61,7 @@ class SimpleClientHttpResponseTests { } @Test // SPR-14040 - public void shouldDrainStreamWhenResponseClosed() throws Exception { + void shouldDrainStreamWhenResponseClosed() throws Exception { byte[] buf = new byte[6]; TestByteArrayInputStream is = new TestByteArrayInputStream("SpringSpring".getBytes(StandardCharsets.UTF_8)); given(this.connection.getResponseCode()).willReturn(200); @@ -79,7 +79,7 @@ class SimpleClientHttpResponseTests { } @Test // SPR-14040 - public void shouldDrainErrorStreamWhenResponseClosed() throws Exception { + void shouldDrainErrorStreamWhenResponseClosed() throws Exception { byte[] buf = new byte[6]; TestByteArrayInputStream is = new TestByteArrayInputStream("SpringSpring".getBytes(StandardCharsets.UTF_8)); given(this.connection.getResponseCode()).willReturn(404); @@ -97,7 +97,7 @@ class SimpleClientHttpResponseTests { } @Test // SPR-16773 - public void shouldNotDrainWhenErrorStreamClosed() throws Exception { + void shouldNotDrainWhenErrorStreamClosed() throws Exception { InputStream is = mock(); given(this.connection.getResponseCode()).willReturn(404); given(this.connection.getErrorStream()).willReturn(is); @@ -115,7 +115,7 @@ class SimpleClientHttpResponseTests { } @Test // SPR-17181 - public void shouldDrainResponseEvenIfResponseNotRead() throws Exception { + void shouldDrainResponseEvenIfResponseNotRead() throws Exception { TestByteArrayInputStream is = new TestByteArrayInputStream("SpringSpring".getBytes(StandardCharsets.UTF_8)); given(this.connection.getResponseCode()).willReturn(200); given(this.connection.getInputStream()).willReturn(is); diff --git a/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java b/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java index f62149c8aee..ef8a7e120d4 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java @@ -65,7 +65,7 @@ class CancelWithoutDemandCodecTests { @Test // gh-22107 - public void cancelWithEncoderHttpMessageWriterAndSingleValue() { + void cancelWithEncoderHttpMessageWriterAndSingleValue() { CharSequenceEncoder encoder = CharSequenceEncoder.allMimeTypes(); HttpMessageWriter writer = new EncoderHttpMessageWriter<>(encoder); CancellingOutputMessage outputMessage = new CancellingOutputMessage(this.bufferFactory); @@ -75,7 +75,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22107 - public void cancelWithJackson() { + void cancelWithJackson() { JacksonJsonEncoder encoder = new JacksonJsonEncoder(); Flux flux = encoder.encode(Flux.just(new Pojo("foofoo", "barbar"), new Pojo("bar", "baz")), @@ -88,7 +88,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22107 - public void cancelWithJaxb2() { + void cancelWithJaxb2() { Jaxb2XmlEncoder encoder = new Jaxb2XmlEncoder(); Flux flux = encoder.encode(Mono.just(new Pojo("foo", "bar")), @@ -101,7 +101,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22543 - public void cancelWithProtobufEncoder() { + void cancelWithProtobufEncoder() { ProtobufEncoder encoder = new ProtobufEncoder(); Msg msg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build(); @@ -115,7 +115,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22731 - public void cancelWithProtobufDecoder() { + void cancelWithProtobufDecoder() { ProtobufDecoder decoder = new ProtobufDecoder(); Mono input = Mono.fromCallable(() -> { @@ -134,7 +134,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22107 - public void cancelWithMultipartContent() { + void cancelWithMultipartContent() { MultipartBodyBuilder builder = new MultipartBodyBuilder(); builder.part("part1", "value1"); builder.part("part2", "value2"); @@ -148,7 +148,7 @@ class CancelWithoutDemandCodecTests { } @Test // gh-22107 - public void cancelWithSse() { + void cancelWithSse() { ServerSentEvent event = ServerSentEvent.builder().data("bar").id("c42").event("foo").build(); ServerSentEventHttpMessageWriter writer = new ServerSentEventHttpMessageWriter(new JacksonJsonEncoder()); CancellingOutputMessage outputMessage = new CancellingOutputMessage(this.bufferFactory); diff --git a/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java index d6bc78771d3..70b60f8d7f3 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java @@ -202,7 +202,7 @@ class EncoderHttpMessageWriterTests { } @Test - public void noContentTypeWithEmptyBody() { + void noContentTypeWithEmptyBody() { Encoder encoder = CharSequenceEncoder.textPlainOnly(); HttpMessageWriter writer = new EncoderHttpMessageWriter<>(encoder); Mono writerMono = writer.write(Mono.empty(), ResolvableType.forClass(String.class), @@ -214,7 +214,7 @@ class EncoderHttpMessageWriterTests { } @Test - public void zeroContentLengthWithEmptyBody() { + void zeroContentLengthWithEmptyBody() { Encoder encoder = CharSequenceEncoder.textPlainOnly(); HttpMessageWriter writer = new EncoderHttpMessageWriter<>(encoder); Mono writerMono = writer.write(Mono.empty(), ResolvableType.forClass(String.class), diff --git a/spring-web/src/test/java/org/springframework/http/codec/JacksonTokenizerTests.java b/spring-web/src/test/java/org/springframework/http/codec/JacksonTokenizerTests.java index 905063667ea..7ef91d6064c 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/JacksonTokenizerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/JacksonTokenizerTests.java @@ -239,7 +239,7 @@ class JacksonTokenizerTests extends AbstractLeakCheckingTests { } @Test - void testLimit() { + void limit() { List source = asList( "[", "{", "\"id\":1,\"name\":\"Dan\"", "},", @@ -260,7 +260,7 @@ class JacksonTokenizerTests extends AbstractLeakCheckingTests { } @Test - void testLimitTokenized() { + void limitTokenized() { List source = asList( "[", @@ -297,7 +297,7 @@ class JacksonTokenizerTests extends AbstractLeakCheckingTests { } @Test // SPR-16521 - public void jsonEOFExceptionIsWrappedAsDecodingError() { + void jsonEOFExceptionIsWrappedAsDecodingError() { Flux source = Flux.just(stringBuffer("{\"status\": \"noClosingQuote}")); Flux tokens = JacksonTokenizer.tokenize(source, this.objectMapper, false, false, -1); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/CustomizedJackson2JsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/CustomizedJackson2JsonDecoderTests.java index 2eafe4e33bb..10730eb90e8 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/CustomizedJackson2JsonDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/CustomizedJackson2JsonDecoderTests.java @@ -50,7 +50,7 @@ class CustomizedJackson2JsonDecoderTests extends AbstractDecoderTests input = Flux.concat(stringBuffer("{\"property\":\"Value1\"}")); testDecodeAll(input, MyCustomizedDecoderBean.class, step -> step @@ -60,7 +60,7 @@ class CustomizedJackson2JsonDecoderTests extends AbstractDecoderTests input = stringBuffer("{\"property\":\"Value2\"}"); ResolvableType elementType = ResolvableType.forClass(MyCustomizedDecoderBean.class); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java index 7234d1e9ddd..50b3a9b5f28 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java @@ -58,13 +58,13 @@ import static org.springframework.http.MediaType.APPLICATION_XML; @SuppressWarnings("removal") class Jackson2JsonEncoderTests extends AbstractEncoderTests { - public Jackson2JsonEncoderTests() { + Jackson2JsonEncoderTests() { super(new Jackson2JsonEncoder()); } @Override @Test - public void canEncode() { + protected void canEncode() { ResolvableType pojoType = ResolvableType.forClass(Pojo.class); assertThat(this.encoder.canEncode(pojoType, APPLICATION_JSON)).isTrue(); assertThat(this.encoder.canEncode(pojoType, APPLICATION_NDJSON)).isTrue(); @@ -87,7 +87,7 @@ class Jackson2JsonEncoderTests extends AbstractEncoderTests @Override @Test @SuppressWarnings("deprecation") - public void encode() throws Exception { + protected void encode() throws Exception { Flux input = Flux.just(new Pojo("foo", "bar"), new Pojo("foofoo", "barbar"), new Pojo("foofoofoo", "barbarbar")); @@ -101,7 +101,7 @@ class Jackson2JsonEncoderTests extends AbstractEncoderTests } @Test // SPR-15866 - public void canEncodeWithCustomMimeType() { + void canEncodeWithCustomMimeType() { MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8); Jackson2JsonEncoder encoder = new Jackson2JsonEncoder(new ObjectMapper(), textJavascript); @@ -174,7 +174,7 @@ class Jackson2JsonEncoderTests extends AbstractEncoderTests @Test // SPR-15727 - public void encodeStreamWithCustomStreamingType() { + void encodeStreamWithCustomStreamingType() { MediaType fooMediaType = new MediaType("application", "foo"); MediaType barMediaType = new MediaType("application", "bar"); this.encoder.setStreamingMediaTypes(Arrays.asList(fooMediaType, barMediaType)); @@ -247,7 +247,7 @@ class Jackson2JsonEncoderTests extends AbstractEncoderTests } @Test // gh-28045 - public void jacksonValueUnwrappedBeforeObjectMapperSelection() { + void jacksonValueUnwrappedBeforeObjectMapperSelection() { JacksonViewBean bean = new JacksonViewBean(); bean.setWithView1("with"); bean.setWithView2("with"); @@ -272,7 +272,7 @@ class Jackson2JsonEncoderTests extends AbstractEncoderTests } @Test // gh-22771 - public void encodeWithFlushAfterWriteOff() { + void encodeWithFlushAfterWriteOff() { ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationFeature.FLUSH_AFTER_WRITE_VALUE, false); Jackson2JsonEncoder encoder = new Jackson2JsonEncoder(mapper); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java index 7d6a2e339d7..00c0acbd097 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java @@ -252,7 +252,7 @@ class Jackson2TokenizerTests extends AbstractLeakCheckingTests { } @Test - void testLimit() { + void limit() { List source = asList( "[", "{", "\"id\":1,\"name\":\"Dan\"", "},", @@ -273,7 +273,7 @@ class Jackson2TokenizerTests extends AbstractLeakCheckingTests { } @Test - void testLimitTokenized() { + void limitTokenized() { List source = asList( "[", @@ -311,7 +311,7 @@ class Jackson2TokenizerTests extends AbstractLeakCheckingTests { } @Test // SPR-16521 - public void jsonEOFExceptionIsWrappedAsDecodingError() { + void jsonEOFExceptionIsWrappedAsDecodingError() { Flux source = Flux.just(stringBuffer("{\"status\": \"noClosingQuote}")); Flux tokens = Jackson2Tokenizer.tokenize(source, this.jsonFactory, this.objectMapper, false, false, -1); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonCsvEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonCsvEncoderTests.java index 4ed184d329c..16bae8dd4d4 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonCsvEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonCsvEncoderTests.java @@ -48,14 +48,14 @@ class JacksonCsvEncoderTests extends AbstractEncoderTests input = Flux.just(new Pojo("spring", "framework"), new Pojo("spring", "data"), new Pojo("spring", "boot")); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java index 6ae9bcffadb..1240ceea0b0 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonDecoderTests.java @@ -75,7 +75,7 @@ class JacksonJsonDecoderTests extends AbstractDecoderTests { @Test @Override - public void canDecode() { + protected void canDecode() { assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_JSON)).isTrue(); assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_NDJSON)).isTrue(); assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), null)).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java index 46b92439dfc..bb3b06bd064 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java @@ -72,7 +72,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests { @Test @Override @SuppressWarnings("removal") - public void canEncode() { + protected void canEncode() { ResolvableType pojoType = ResolvableType.forClass(Pojo.class); assertThat(this.encoder.canEncode(pojoType, APPLICATION_JSON)).isTrue(); assertThat(this.encoder.canEncode(pojoType, APPLICATION_NDJSON)).isTrue(); @@ -97,7 +97,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests { @Test @Override - public void encode() throws Exception { + protected void encode() throws Exception { Flux input = Flux.just(new Pojo("foo", "bar"), new Pojo("foofoo", "barbar"), new Pojo("foofoofoo", "barbarbar")); @@ -111,7 +111,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests { } @Test // SPR-15866 - public void canEncodeWithCustomMimeType() { + void canEncodeWithCustomMimeType() { MimeType textJavascript = new MimeType("text", "javascript", StandardCharsets.UTF_8); JacksonJsonEncoder encoder = new JacksonJsonEncoder(new JsonMapper(), textJavascript); @@ -181,7 +181,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests { @Test // SPR-15727 - public void encodeStreamWithCustomStreamingType() { + void encodeStreamWithCustomStreamingType() { MediaType fooMediaType = new MediaType("application", "foo"); MediaType barMediaType = new MediaType("application", "bar"); this.encoder.setStreamingMediaTypes(Arrays.asList(fooMediaType, barMediaType)); @@ -279,7 +279,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests { } @Test // gh-22771 - public void encodeWithFlushAfterWriteOff() { + void encodeWithFlushAfterWriteOff() { JsonMapper mapper = JsonMapper.builder().configure(SerializationFeature.FLUSH_AFTER_WRITE_VALUE, false).build(); JacksonJsonEncoder encoder = new JacksonJsonEncoder(mapper); 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 4d78f139595..2e2d71af976 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 @@ -182,7 +182,7 @@ class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { } @Test // gh-24582 - public void writeMultipartRelated() { + void writeMultipartRelated() { MediaType mediaType = MediaType.parseMediaType("multipart/related;type=foo"); MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder(); @@ -215,7 +215,7 @@ class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { } @Test // SPR-16402 - public void singleSubscriberWithResource() throws IOException { + void singleSubscriberWithResource() throws IOException { Sinks.Many sink = Sinks.many().unicast().onBackpressureBuffer(); Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg"); sink.tryEmitNext(logo); @@ -240,7 +240,7 @@ class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { } @Test // SPR-16402 - public void singleSubscriberWithStrings() { + void singleSubscriberWithStrings() { AtomicBoolean subscribed = new AtomicBoolean(); Flux publisher = Flux.just("foo", "bar", "baz") .doOnSubscribe(subscription -> @@ -259,7 +259,7 @@ class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { } @Test // SPR-16376 - public void customContentDisposition() throws IOException { + void customContentDisposition() throws IOException { Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg"); Flux buffers = DataBufferUtils.read(logo, DefaultDataBufferFactory.sharedInstance, 1024); long contentLength = logo.contentLength(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufDecoderTests.java index 1902358212d..a9ddb24d7c6 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/protobuf/ProtobufDecoderTests.java @@ -67,7 +67,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test @Override - public void canDecode() { + protected void canDecode() { assertThat(this.decoder.canDecode(forClass(Msg.class), null)).isTrue(); assertThat(this.decoder.canDecode(forClass(Msg.class), MediaType.APPLICATION_PROTOBUF)).isTrue(); assertThat(this.decoder.canDecode(forClass(Msg.class), MediaType.parseMediaType("application/vnd.example.public.v1+x-protobuf"))).isTrue(); @@ -78,7 +78,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test @Override - public void decodeToMono() { + protected void decodeToMono() { Mono input = dataBuffer(this.testMsg1); testDecodeToMonoAll(input, Msg.class, step -> step @@ -107,7 +107,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test @Override @SuppressWarnings("deprecation") - public void decode() { + protected void decode() { Flux input = Flux.just(this.testMsg1, this.testMsg2) .flatMap(msg -> Mono.defer(() -> { DataBuffer buffer = this.bufferFactory.allocateBuffer(); @@ -129,7 +129,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test @SuppressWarnings("deprecation") - public void decodeSplitChunks() { + void decodeSplitChunks() { Flux input = Flux.just(this.testMsg1, this.testMsg2) .flatMap(msg -> Mono.defer(() -> { DataBuffer buffer = this.bufferFactory.allocateBuffer(); @@ -161,7 +161,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test // SPR-17429 @SuppressWarnings("deprecation") - public void decodeSplitMessageSize() { + void decodeSplitMessageSize() { this.decoder.setMaxMessageSize(100009); Msg bigMessage = Msg.newBuilder().setFoo("azertyuiop".repeat(10000)) .setBlah(secondMsg2).build(); @@ -197,7 +197,7 @@ class ProtobufDecoderTests extends AbstractDecoderTests { @Test @SuppressWarnings("deprecation") - public void decodeMergedChunks() throws IOException { + void decodeMergedChunks() throws IOException { DataBuffer buffer = this.bufferFactory.allocateBuffer(); this.testMsg1.writeDelimitedTo(buffer.asOutputStream()); this.testMsg1.writeDelimitedTo(buffer.asOutputStream()); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java index 3da317a699d..e12d2438323 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java @@ -236,7 +236,7 @@ class ClientCodecConfigurerTests { } @Test // gh-24194 - public void cloneShouldNotDropMultipartCodecs() { + void cloneShouldNotDropMultipartCodecs() { ClientCodecConfigurer clone = this.configurer.clone(); List> writers = diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlEncoderTests.java index 3306e072153..d7a2d7ba8ca 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlEncoderTests.java @@ -46,7 +46,7 @@ class JacksonXmlEncoderTests extends AbstractLeakCheckingTests { @Test - protected void canEncode() { + void canEncode() { ResolvableType pojoType = ResolvableType.forClass(Pojo.class); assertThat(this.encoder.canEncode(pojoType, MediaType.APPLICATION_XML)).isTrue(); assertThat(this.encoder.canEncode(pojoType, MediaType.TEXT_XML)).isTrue(); @@ -58,7 +58,7 @@ class JacksonXmlEncoderTests extends AbstractLeakCheckingTests { } @Test - protected void encode() { + void encode() { Pojo value = new Pojo("foo", "bar"); DataBuffer result = encoder.encodeValue(value, this.bufferFactory, ResolvableType.forClass(Pojo.class), MediaType.APPLICATION_XML, null); diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java index dd6a00087cf..8df28da8b96 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java @@ -231,7 +231,7 @@ class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests { } @Test // gh-24622 - public void decodeErrorWithXmlNotWellFormed() { + void decodeErrorWithXmlNotWellFormed() { Mono source = toDataBufferMono("something"); Mono result = this.decoder.decodeToMono(source, ResolvableType.forClass(Pojo.class), null, HINTS); diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index ca54fbb8d9a..049340968a6 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -338,7 +338,7 @@ class FormHttpMessageConverterTests { } @Test // SPR-13309 - public void writeMultipartOrder() throws Exception { + void writeMultipartOrder() throws Exception { MyBean myBean = new MyBean(); myBean.setString("foo"); diff --git a/spring-web/src/test/java/org/springframework/http/converter/ObjectToStringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ObjectToStringHttpMessageConverterTests.java index e16ed9ecc7a..5553d15b9d5 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/ObjectToStringHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/ObjectToStringHttpMessageConverterTests.java @@ -168,7 +168,7 @@ class ObjectToStringHttpMessageConverterTests { } @Test - void testConversionServiceRequired() { + void conversionServiceRequired() { assertThatIllegalArgumentException().isThrownBy(() -> new ObjectToStringHttpMessageConverter(null)); } 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 db890399a3f..1158e7fb8db 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 @@ -89,7 +89,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-13443 - public void shouldReadInputStreamResource() throws IOException { + void shouldReadInputStreamResource() throws IOException { try (InputStream body = getClass().getResourceAsStream("logo.jpg") ) { MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); inputMessage.getHeaders().setContentType(MediaType.IMAGE_JPEG); @@ -105,7 +105,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-14882 - public void shouldNotReadInputStreamResource() throws IOException { + void shouldNotReadInputStreamResource() throws IOException { ResourceHttpMessageConverter noStreamConverter = new ResourceHttpMessageConverter(false); try (InputStream body = getClass().getResourceAsStream("logo.jpg") ) { MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); @@ -116,7 +116,7 @@ class ResourceHttpMessageConverterTests { } @Test // gh-36368 - public void shouldNotReadStreamResourceAsUnknownType() throws IOException { + void shouldNotReadStreamResourceAsUnknownType() throws IOException { try (InputStream body = getClass().getResourceAsStream("logo.jpg") ) { MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); inputMessage.getHeaders().setContentType(MediaType.IMAGE_JPEG); @@ -138,7 +138,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-10848 - public void writeByteArrayNullMediaType() throws IOException { + void writeByteArrayNullMediaType() throws IOException { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); byte[] byteArray = {1, 2, 3}; Resource body = new ByteArrayResource(byteArray); @@ -148,7 +148,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-12999 - public void writeContentNotGettingInputStream() throws Exception { + void writeContentNotGettingInputStream() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); Resource resource = mock(); given(resource.getInputStream()).willThrow(FileNotFoundException.class); @@ -158,7 +158,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-12999 - public void writeContentNotClosingInputStream() throws Exception { + void writeContentNotClosingInputStream() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); Resource resource = mock(); InputStream inputStream = mock(); @@ -171,7 +171,7 @@ class ResourceHttpMessageConverterTests { } @Test // SPR-13620 - public void writeContentInputStreamThrowingNullPointerException() throws Exception { + void writeContentInputStreamThrowingNullPointerException() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); Resource resource = mock(); InputStream in = mock(); 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 c97b82efc4e..01642dd0da0 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 @@ -182,7 +182,7 @@ class ResourceRegionHttpMessageConverterTests { } @Test // SPR-15041 - public void applicationOctetStreamDefaultContentType() throws Exception { + void applicationOctetStreamDefaultContentType() throws Exception { MockHttpOutputMessage outputMessage = new MockHttpOutputMessage(); ClassPathResource body = mock(); given(body.getFilename()).willReturn("spring.dat"); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java index 72fde48fd2d..96ed36dd162 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java @@ -87,7 +87,7 @@ class GsonHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readUntyped() throws IOException { + void readUntyped() throws IOException { String body = "{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," + "\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}"; MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8)); @@ -179,7 +179,7 @@ class GsonHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readAndWriteGenerics() throws Exception { + void readAndWriteGenerics() throws Exception { Field beansList = ListHolder.class.getField("listField"); String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," + @@ -206,7 +206,7 @@ class GsonHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readAndWriteParameterizedType() throws Exception { + void readAndWriteParameterizedType() throws Exception { ParameterizedTypeReference> beansList = new ParameterizedTypeReference<>() { }; @@ -233,7 +233,7 @@ class GsonHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void writeParameterizedBaseType() throws Exception { + void writeParameterizedBaseType() throws Exception { ParameterizedTypeReference> beansList = new ParameterizedTypeReference<>() {}; ParameterizedTypeReference> baseList = new ParameterizedTypeReference<>() {}; diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java index 3763042f841..8a35b2014a5 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java @@ -345,7 +345,7 @@ public class Jackson2ObjectMapperFactoryBeanTests { } @Test // SPR-14435 - public void setFactory() { + void setFactory() { this.factory.setFactory(new SmileFactory()); this.factory.afterPropertiesSet(); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java index b596934ab35..ebc6d06bd93 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java @@ -87,7 +87,7 @@ class JsonbHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readUntyped() throws IOException { + void readUntyped() throws IOException { String body = "{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," + "\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}"; MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8)); @@ -179,7 +179,7 @@ class JsonbHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readAndWriteGenerics() throws Exception { + void readAndWriteGenerics() throws Exception { Field beansList = ListHolder.class.getField("listField"); String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," + @@ -206,7 +206,7 @@ class JsonbHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readAndWriteParameterizedType() throws Exception { + void readAndWriteParameterizedType() throws Exception { ParameterizedTypeReference> beansList = new ParameterizedTypeReference<>() {}; String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," + @@ -232,7 +232,7 @@ class JsonbHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void writeParameterizedBaseType() throws Exception { + void writeParameterizedBaseType() throws Exception { ParameterizedTypeReference> beansList = new ParameterizedTypeReference<>() {}; ParameterizedTypeReference> baseList = new ParameterizedTypeReference<>() {}; diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index 3e868069a19..fbac8a029ac 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -80,7 +80,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlRootElementList() throws Exception { + void readXmlRootElementList() throws Exception { String content = ""; MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8)); List result = (List) converter.read(rootElementListType, null, inputMessage); @@ -92,7 +92,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlRootElementSet() throws Exception { + void readXmlRootElementSet() throws Exception { String content = ""; MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8)); Set result = (Set) converter.read(rootElementSetType, null, inputMessage); @@ -104,7 +104,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlTypeList() throws Exception { + void readXmlTypeList() throws Exception { String content = ""; MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8)); List result = (List) converter.read(typeListType, null, inputMessage); @@ -116,7 +116,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlTypeSet() throws Exception { + void readXmlTypeSet() throws Exception { String content = ""; MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8)); Set result = (Set) converter.read(typeSetType, null, inputMessage); @@ -128,7 +128,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlRootElementExternalEntityDisabled() throws Exception { + void readXmlRootElementExternalEntityDisabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); String content = "\n" + @@ -157,7 +157,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlRootElementExternalEntityEnabled() throws Exception { + void readXmlRootElementExternalEntityEnabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); String content = "\n" + @@ -180,7 +180,7 @@ class Jaxb2CollectionHttpMessageConverterTests { } @Test - void testXmlBomb() { + void xmlBomb() { // https://en.wikipedia.org/wiki/Billion_laughs // https://msdn.microsoft.com/en-us/magazine/ee335713.aspx String content = """ @@ -207,7 +207,7 @@ class Jaxb2CollectionHttpMessageConverterTests { @Test @SuppressWarnings("unchecked") - public void readXmlRootElementListHeaderCharset() throws Exception { + void readXmlRootElementListHeaderCharset() throws Exception { String content = ""; MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.ISO_8859_1)); inputMessage.getHeaders().setContentType(MediaType.parseMediaType("application/xml;charset=iso-8859-1")); diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java index 1ee7872232a..3f9662a3a09 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java @@ -155,7 +155,7 @@ class Jaxb2RootElementHttpMessageConverterTests { } @Test - void testXmlBomb() throws Exception { + void xmlBomb() throws Exception { // https://en.wikipedia.org/wiki/Billion_laughs // https://msdn.microsoft.com/en-us/magazine/ee335713.aspx String content = """ diff --git a/spring-web/src/test/java/org/springframework/http/server/DefaultPathContainerTests.java b/spring-web/src/test/java/org/springframework/http/server/DefaultPathContainerTests.java index d507e59a657..c590664c5d1 100644 --- a/spring-web/src/test/java/org/springframework/http/server/DefaultPathContainerTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/DefaultPathContainerTests.java @@ -119,25 +119,25 @@ class DefaultPathContainerTests { @Test void path() { // basic - testPath("/a/b/c", "/a/b/c", "/", "a", "/", "b", "/", "c"); + path("/a/b/c", "/a/b/c", "/", "a", "/", "b", "/", "c"); // root path - testPath("/", "/", "/"); + path("/", "/", "/"); // empty path - testPath("", ""); - testPath("%20%20", "%20%20", "%20%20"); + path("", ""); + path("%20%20", "%20%20", "%20%20"); // trailing slash - testPath("/a/b/", "/a/b/", "/", "a", "/", "b", "/"); - testPath("/a/b//", "/a/b//", "/", "a", "/", "b", "/", "/"); + path("/a/b/", "/a/b/", "/", "a", "/", "b", "/"); + path("/a/b//", "/a/b//", "/", "a", "/", "b", "/", "/"); // extra slashes and spaces - testPath("/%20", "/%20", "/", "%20"); - testPath("//%20/%20", "//%20/%20", "/", "/", "%20", "/", "%20"); + path("/%20", "/%20", "/", "%20"); + path("//%20/%20", "//%20/%20", "/", "/", "%20", "/", "%20"); } - private void testPath(String input, String value, String... expectedElements) { + private void path(String input, String value, String... expectedElements) { PathContainer path = PathContainer.parsePath(input, Options.HTTP_PATH); assertThat(path.value()).as("value: '" + input + "'").isEqualTo(value); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java index 52dcabd8377..4de6fbc72b2 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java @@ -119,7 +119,7 @@ class ContextPathCompositeHandlerTests { } @Test // SPR-17144 - public void notFoundWithCommitAction() { + void notFoundWithCommitAction() { AtomicBoolean commitInvoked = new AtomicBoolean(); 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 00422db06fa..7dda236b795 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 @@ -56,7 +56,7 @@ class ListenerReadPublisherTests { } @Test // SPR-17410 - public void discardDataOnError() { + void discardDataOnError() { this.subscriber.getSubscription().request(2); this.publisher.onDataAvailable(); @@ -67,7 +67,7 @@ class ListenerReadPublisherTests { } @Test // SPR-17410 - public void discardDataOnCancel() { + void discardDataOnCancel() { this.subscriber.getSubscription().request(2); this.subscriber.setCancelOnNext(true); 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 bca03683a73..80f7546fdc1 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 @@ -53,7 +53,7 @@ class ListenerWriteProcessorTests { @Test // SPR-17410 - public void writePublisherError() { + void writePublisherError() { // Turn off writing so next item will be cached this.processor.setWritePossible(false); @@ -68,7 +68,7 @@ class ListenerWriteProcessorTests { } @Test // SPR-17410 - public void ioExceptionDuringWrite() { + void ioExceptionDuringWrite() { // Fail on next write this.processor.setWritePossible(true); @@ -83,7 +83,7 @@ class ListenerWriteProcessorTests { } @Test // SPR-17410 - public void onNextWithoutDemand() { + void onNextWithoutDemand() { // Disable writing: next item will be cached. this.processor.setWritePossible(false); 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 2bd1cee166b..bfa4817483e 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 @@ -72,7 +72,7 @@ class ServerHttpRequestTests { } @Test // SPR-15140 - public void queryParamsWithEncodedValue() throws Exception { + void queryParamsWithEncodedValue() throws Exception { MultiValueMap params = createRequest("/path?a=%20%2B+%C3%A0").getQueryParams(); assertThat(params).hasSize(1); assertThat(params.get("a")).isEqualTo(Collections.singletonList(" + \u00e0")); @@ -121,7 +121,7 @@ class ServerHttpRequestTests { } @Test // SPR-16434 - public void mutatePathWithEncodedQueryParams() throws Exception { + void mutatePathWithEncodedQueryParams() throws Exception { ServerHttpRequest request = createRequest("/path?name=%E6%89%8E%E6%A0%B9"); request = request.mutate().path("/mutatedPath").build(); @@ -204,7 +204,7 @@ class ServerHttpRequestTests { } @Test // gh-26304 - public void mutateDoesNotPreventAccessToNativeRequest() throws Exception { + void mutateDoesNotPreventAccessToNativeRequest() throws Exception { ServerHttpRequest request = createRequest("/path"); request = request.mutate().header("key", "value").build(); diff --git a/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java b/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java index 9b57668e739..88c348d0973 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java @@ -62,7 +62,7 @@ class MappingMediaTypeFileExtensionResolverTests { } @Test // SPR-13747 - public void lookupMediaTypeCaseInsensitive() { + void lookupMediaTypeCaseInsensitive() { assertThat(new MappingMediaTypeFileExtensionResolver(DEFAULT_MAPPINGS).lookupMediaType("JSON")) .isEqualTo(MediaType.APPLICATION_JSON); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java index e62d989e0db..71a06307393 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; class EscapedErrorsTests { @Test - void testEscapedErrors() { + void escapedErrors() { TestBean tb = new TestBean(); tb.setName("empty &"); diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index ad8277bb3be..323f415676d 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ServletRequestDataBinderTests { @Test - void testBindingWithNestedObjectCreation() { + void bindingWithNestedObjectCreation() { TestBean tb = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); @@ -61,7 +61,7 @@ class ServletRequestDataBinderTests { } @Test - void testFieldPrefixCausesFieldReset() { + void fieldPrefixCausesFieldReset() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); @@ -77,7 +77,7 @@ class ServletRequestDataBinderTests { } @Test - void testFieldPrefixCausesFieldResetWithIgnoreUnknownFields() { + void fieldPrefixCausesFieldResetWithIgnoreUnknownFields() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); binder.setIgnoreUnknownFields(false); @@ -94,7 +94,7 @@ class ServletRequestDataBinderTests { } @Test - void testFieldDefault() { + void fieldDefault() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); @@ -110,7 +110,7 @@ class ServletRequestDataBinderTests { } @Test - void testFieldDefaultPreemptsFieldMarker() { + void fieldDefaultPreemptsFieldMarker() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); @@ -131,7 +131,7 @@ class ServletRequestDataBinderTests { } @Test - void testFieldDefaultNonBoolean() { + void fieldDefaultNonBoolean() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); @@ -147,7 +147,7 @@ class ServletRequestDataBinderTests { } @Test - void testWithCommaSeparatedStringArray() { + void withCommaSeparatedStringArray() { TestBean target = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(target); @@ -165,7 +165,7 @@ class ServletRequestDataBinderTests { } @Test - void testBindingWithNestedObjectCreationAndWrongOrder() { + void bindingWithNestedObjectCreationAndWrongOrder() { TestBean tb = new TestBean(); ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); @@ -186,7 +186,7 @@ class ServletRequestDataBinderTests { } @Test - void testNoPrefix() { + void noPrefix() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("forname", "Tony"); request.addParameter("surname", "Blair"); @@ -197,7 +197,7 @@ class ServletRequestDataBinderTests { } @Test - void testPrefix() { + void prefix() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("test_forname", "Tony"); request.addParameter("test_surname", "Blair"); @@ -213,14 +213,14 @@ class ServletRequestDataBinderTests { } @Test - void testNoParameters() { + void noParameters() { MockHttpServletRequest request = new MockHttpServletRequest(); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found no parameters").isEqualTo(0); } @Test - void testMultipleValuesForParameter() { + void multipleValuesForParameter() { MockHttpServletRequest request = new MockHttpServletRequest(); String[] original = new String[] {"Tony", "Rod"}; request.addParameter("forname", original); diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java index 27344de71cd..5f77833308e 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java @@ -34,7 +34,7 @@ class ServletRequestUtilsTests { @Test - void testIntParameter() throws ServletRequestBindingException { + void intParameter() throws ServletRequestBindingException { request.addParameter("param1", "5"); request.addParameter("param2", "e"); request.addParameter("paramEmpty", ""); @@ -57,7 +57,7 @@ class ServletRequestUtilsTests { } @Test - void testIntParameters() throws ServletRequestBindingException { + void intParameters() throws ServletRequestBindingException { request.addParameter("param", "1", "2", "3"); request.addParameter("param2", "1"); @@ -76,7 +76,7 @@ class ServletRequestUtilsTests { } @Test - void testLongParameter() throws ServletRequestBindingException { + void longParameter() throws ServletRequestBindingException { request.addParameter("param1", "5"); request.addParameter("param2", "e"); request.addParameter("paramEmpty", ""); @@ -99,7 +99,7 @@ class ServletRequestUtilsTests { } @Test - void testLongParameters() throws ServletRequestBindingException { + void longParameters() throws ServletRequestBindingException { request.setParameter("param", "1", "2", "3"); request.setParameter("param2", "0"); @@ -123,7 +123,7 @@ class ServletRequestUtilsTests { } @Test - void testFloatParameter() throws ServletRequestBindingException { + void floatParameter() throws ServletRequestBindingException { request.addParameter("param1", "5.5"); request.addParameter("param2", "e"); request.addParameter("paramEmpty", ""); @@ -146,7 +146,7 @@ class ServletRequestUtilsTests { } @Test - void testFloatParameters() throws ServletRequestBindingException { + void floatParameters() throws ServletRequestBindingException { request.addParameter("param", "1.5", "2.5", "3"); request.addParameter("param2", "1.5"); @@ -161,7 +161,7 @@ class ServletRequestUtilsTests { } @Test - void testDoubleParameter() throws ServletRequestBindingException { + void doubleParameter() throws ServletRequestBindingException { request.addParameter("param1", "5.5"); request.addParameter("param2", "e"); request.addParameter("paramEmpty", ""); @@ -184,7 +184,7 @@ class ServletRequestUtilsTests { } @Test - void testDoubleParameters() throws ServletRequestBindingException { + void doubleParameters() throws ServletRequestBindingException { request.addParameter("param", "1.5", "2.5", "3"); request.addParameter("param2", "1.5"); @@ -198,7 +198,7 @@ class ServletRequestUtilsTests { } @Test - void testBooleanParameter() throws ServletRequestBindingException { + void booleanParameter() throws ServletRequestBindingException { request.addParameter("param1", "true"); request.addParameter("param2", "e"); request.addParameter("param4", "yes"); @@ -226,7 +226,7 @@ class ServletRequestUtilsTests { } @Test - void testBooleanParameters() throws ServletRequestBindingException { + void booleanParameters() throws ServletRequestBindingException { request.addParameter("param", "true", "yes", "off", "1", "bogus"); request.addParameter("param2", "false"); @@ -249,7 +249,7 @@ class ServletRequestUtilsTests { } @Test - void testStringParameter() throws ServletRequestBindingException { + void stringParameter() throws ServletRequestBindingException { request.addParameter("param1", "str"); request.addParameter("paramEmpty", ""); diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java index 922d3a89ef9..a1d61945c52 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java @@ -68,7 +68,7 @@ class WebExchangeDataBinderTests { @Test - void testBindingWithNestedObjectCreation() { + void bindingWithNestedObjectCreation() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("spouse", "someValue"); formData.add("spouse.name", "test"); @@ -79,7 +79,7 @@ class WebExchangeDataBinderTests { } @Test - void testFieldPrefixCausesFieldReset() { + void fieldPrefixCausesFieldReset() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("_postProcessed", "visible"); formData.add("postProcessed", "on"); @@ -92,7 +92,7 @@ class WebExchangeDataBinderTests { } @Test - void testFieldPrefixCausesFieldResetWithIgnoreUnknownFields() { + void fieldPrefixCausesFieldResetWithIgnoreUnknownFields() { this.binder.setIgnoreUnknownFields(false); MultiValueMap formData = new LinkedMultiValueMap<>(); @@ -107,7 +107,7 @@ class WebExchangeDataBinderTests { } @Test // gh-25836 - public void testFieldWithEmptyArrayIndex() { + void fieldWithEmptyArrayIndex() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("stringArray[]", "ONE"); formData.add("stringArray[]", "TWO"); @@ -116,7 +116,7 @@ class WebExchangeDataBinderTests { } @Test - void testFieldDefault() { + void fieldDefault() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("!postProcessed", "off"); formData.add("postProcessed", "on"); @@ -129,7 +129,7 @@ class WebExchangeDataBinderTests { } @Test - void testFieldDefaultPreemptsFieldMarker() { + void fieldDefaultPreemptsFieldMarker() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("!postProcessed", "on"); formData.add("_postProcessed", "visible"); @@ -147,7 +147,7 @@ class WebExchangeDataBinderTests { } @Test - void testFieldDefaultNonBoolean() { + void fieldDefaultNonBoolean() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("!name", "anonymous"); formData.add("name", "Scott"); @@ -160,7 +160,7 @@ class WebExchangeDataBinderTests { } @Test - void testWithCommaSeparatedStringArray() { + void withCommaSeparatedStringArray() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("stringArray", "bar"); formData.add("stringArray", "abc"); @@ -175,7 +175,7 @@ class WebExchangeDataBinderTests { } @Test - void testBindingWithNestedObjectCreationAndWrongOrder() { + void bindingWithNestedObjectCreationAndWrongOrder() { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("spouse.name", "test"); formData.add("spouse", "someValue"); @@ -186,7 +186,7 @@ class WebExchangeDataBinderTests { } @Test - void testBindingWithQueryParams() { + void bindingWithQueryParams() { String url = "/path?spouse=someValue&spouse.name=test"; ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post(url)); this.binder.bind(exchange).block(Duration.ofSeconds(5)); @@ -196,7 +196,7 @@ class WebExchangeDataBinderTests { } @Test - void testMultipart() { + void multipart() { MultipartBean bean = new MultipartBean(); WebExchangeDataBinder binder = new WebExchangeDataBinder(bean); @@ -222,7 +222,7 @@ class WebExchangeDataBinderTests { } @Test - void testMultipartDataClass() { + void multipartDataClass() { WebExchangeDataBinder binder = new WebExchangeDataBinder(null); binder.setTargetType(ResolvableType.forClass(MultipartDataClass.class)); diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index 41b5c8a48d5..a3194bad383 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; class WebRequestDataBinderTests { @Test - void testBindingWithNestedObjectCreation() { + void bindingWithNestedObjectCreation() { TestBean tb = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person"); @@ -65,7 +65,7 @@ class WebRequestDataBinderTests { } @Test - void testBindingWithNestedObjectCreationThroughAutoGrow() { + void bindingWithNestedObjectCreationThroughAutoGrow() { TestBean tb = new TestBeanWithConcreteSpouse(); WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person"); @@ -80,7 +80,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldPrefixCausesFieldReset() { + void fieldPrefixCausesFieldReset() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -96,7 +96,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldPrefixCausesFieldResetWithIgnoreUnknownFields() { + void fieldPrefixCausesFieldResetWithIgnoreUnknownFields() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); binder.setIgnoreUnknownFields(false); @@ -113,7 +113,7 @@ class WebRequestDataBinderTests { } @Test // gh-25836 - public void testFieldWithEmptyArrayIndex() { + void fieldWithEmptyArrayIndex() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -125,7 +125,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldDefault() { + void fieldDefault() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -142,7 +142,7 @@ class WebRequestDataBinderTests { // SPR-13502 @Test - void testCollectionFieldsDefault() { + void collectionFieldsDefault() { TestBean target = new TestBean(); target.setSomeSet(null); target.setSomeList(null); @@ -161,7 +161,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldDefaultPreemptsFieldMarker() { + void fieldDefaultPreemptsFieldMarker() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -182,7 +182,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldDefaultWithNestedProperty() { + void fieldDefaultWithNestedProperty() { TestBean target = new TestBean(); target.setSpouse(new TestBean()); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -204,7 +204,7 @@ class WebRequestDataBinderTests { } @Test - void testFieldDefaultNonBoolean() { + void fieldDefaultNonBoolean() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -220,7 +220,7 @@ class WebRequestDataBinderTests { } @Test - void testWithCommaSeparatedStringArray() { + void withCommaSeparatedStringArray() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -238,7 +238,7 @@ class WebRequestDataBinderTests { } @Test - void testEnumBinding() { + void enumBinding() { EnumHolder target = new EnumHolder(); WebRequestDataBinder binder = new WebRequestDataBinder(target); @@ -249,7 +249,7 @@ class WebRequestDataBinderTests { } @Test - void testMultipartFileAsString() { + void multipartFileAsString() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); binder.registerCustomEditor(String.class, new StringMultipartFileEditor()); @@ -261,7 +261,7 @@ class WebRequestDataBinderTests { } @Test - void testMultipartFileAsStringArray() { + void multipartFileAsStringArray() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); binder.registerCustomEditor(String.class, new StringMultipartFileEditor()); @@ -274,7 +274,7 @@ class WebRequestDataBinderTests { } @Test - void testMultipartFilesAsStringArray() { + void multipartFilesAsStringArray() { TestBean target = new TestBean(); WebRequestDataBinder binder = new WebRequestDataBinder(target); binder.registerCustomEditor(String.class, new StringMultipartFileEditor()); @@ -289,7 +289,7 @@ class WebRequestDataBinderTests { } @Test - void testNoPrefix() { + void noPrefix() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("forname", "Tony"); request.addParameter("surname", "Blair"); @@ -300,7 +300,7 @@ class WebRequestDataBinderTests { } @Test - void testPrefix() { + void prefix() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter("test_forname", "Tony"); request.addParameter("test_surname", "Blair"); @@ -318,7 +318,7 @@ class WebRequestDataBinderTests { /** * Must contain: forname=Tony surname=Blair age=50 */ - protected void doTestTony(PropertyValues pvs) { + void doTestTony(PropertyValues pvs) { assertThat(pvs.getPropertyValues().length).as("Contains 3").isEqualTo(3); assertThat(pvs.contains("forname")).as("Contains forname").isTrue(); assertThat(pvs.contains("surname")).as("Contains surname").isTrue(); @@ -343,14 +343,14 @@ class WebRequestDataBinderTests { } @Test - void testNoParameters() { + void noParameters() { MockHttpServletRequest request = new MockHttpServletRequest(); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found no parameters").isEqualTo(0); } @Test - void testMultipleValuesForParameter() { + void multipleValuesForParameter() { MockHttpServletRequest request = new MockHttpServletRequest(); String[] original = new String[] {"Tony", "Rod"}; request.addParameter("forname", original); diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpStatusCodeExceptionTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpStatusCodeExceptionTests.java index 1e004a3557d..a8117163061 100644 --- a/spring-web/src/test/java/org/springframework/web/client/HttpStatusCodeExceptionTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/HttpStatusCodeExceptionTests.java @@ -42,7 +42,7 @@ class HttpStatusCodeExceptionTests { * serializable due to the addition of a non-serializable {@code Charset} field. */ @Test - void testSerializability() throws IOException, ClassNotFoundException { + void serializability() throws IOException, ClassNotFoundException { HttpStatusCodeException ex1 = new HttpClientErrorException( HttpStatus.BAD_REQUEST, null, null, StandardCharsets.US_ASCII); ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java index 03f6483e0de..81b8674975b 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class RequestAndSessionScopedBeanTests { @Test - void testPutBeanInRequest() { + void putBeanInRequest() { String targetBeanName = "target"; StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -70,7 +70,7 @@ class RequestAndSessionScopedBeanTests { } @Test - void testPutBeanInSession() { + void putBeanInSession() { String targetBeanName = "target"; HttpServletRequest request = new MockHttpServletRequest(); RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java index 4799cf5aa77..ca324890dc5 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java @@ -55,7 +55,7 @@ class RequestScopedProxyTests { @Test - void testGetFromScope() { + void getFromScope() { String name = "requestScopedObject"; TestBean bean = (TestBean) this.beanFactory.getBean(name); assertThat(AopUtils.isCglibProxy(bean)).isTrue(); @@ -80,7 +80,7 @@ class RequestScopedProxyTests { } @Test - void testGetFromScopeThroughDynamicProxy() { + void getFromScopeThroughDynamicProxy() { String name = "requestScopedProxy"; ITestBean bean = (ITestBean) this.beanFactory.getBean(name); // assertTrue(AopUtils.isJdkDynamicProxy(bean)); @@ -105,7 +105,7 @@ class RequestScopedProxyTests { } @Test - void testDestructionAtRequestCompletion() { + void destructionAtRequestCompletion() { String name = "requestScopedDisposableObject"; DerivedTestBean bean = (DerivedTestBean) this.beanFactory.getBean(name); assertThat(AopUtils.isCglibProxy(bean)).isTrue(); @@ -131,7 +131,7 @@ class RequestScopedProxyTests { } @Test - void testGetFromFactoryBeanInScope() { + void getFromFactoryBeanInScope() { String name = "requestScopedFactoryBean"; TestBean bean = (TestBean) this.beanFactory.getBean(name); assertThat(AopUtils.isCglibProxy(bean)).isTrue(); @@ -153,7 +153,7 @@ class RequestScopedProxyTests { } @Test - void testGetInnerBeanFromScope() { + void getInnerBeanFromScope() { TestBean bean = (TestBean) this.beanFactory.getBean("outerBean"); assertThat(AopUtils.isAopProxy(bean)).isFalse(); assertThat(AopUtils.isCglibProxy(bean.getSpouse())).isTrue(); @@ -177,7 +177,7 @@ class RequestScopedProxyTests { } @Test - void testGetAnonymousInnerBeanFromScope() { + void getAnonymousInnerBeanFromScope() { TestBean bean = (TestBean) this.beanFactory.getBean("outerBean"); assertThat(AopUtils.isAopProxy(bean)).isFalse(); assertThat(AopUtils.isCglibProxy(bean.getSpouse())).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java index 11e49394af8..f43e2e049a9 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java @@ -49,7 +49,7 @@ class WebApplicationContextScopeTests { } @Test - void testRequestScope() { + void requestScope() { WebApplicationContext ac = initApplicationContext(WebApplicationContext.SCOPE_REQUEST); MockHttpServletRequest request = new MockHttpServletRequest(); ServletRequestAttributes requestAttributes = new ServletRequestAttributes(request); @@ -68,7 +68,7 @@ class WebApplicationContextScopeTests { } @Test - void testSessionScope() { + void sessionScope() { WebApplicationContext ac = initApplicationContext(WebApplicationContext.SCOPE_SESSION); MockHttpServletRequest request = new MockHttpServletRequest(); ServletRequestAttributes requestAttributes = new ServletRequestAttributes(request); @@ -87,7 +87,7 @@ class WebApplicationContextScopeTests { } @Test - void testApplicationScope() { + void applicationScope() { WebApplicationContext ac = initApplicationContext(WebApplicationContext.SCOPE_APPLICATION); assertThat(ac.getServletContext().getAttribute(NAME)).isNull(); DerivedTestBean bean = ac.getBean(NAME, DerivedTestBean.class); 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 677a51a940e..e6656e2f072 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 @@ -150,7 +150,7 @@ class WebAsyncManagerTimeoutTests { @Test @SuppressWarnings({ "unchecked", "rawtypes" }) - public void startCallableProcessingTimeoutAndCheckThreadInterrupted() throws Exception { + void startCallableProcessingTimeoutAndCheckThreadInterrupted() throws Exception { StubCallable callable = new StubCallable(); Future future = mock(); diff --git a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java index ba52f9572ee..5b5308481be 100644 --- a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; class SpringBeanAutowiringSupportTests { @Test - void testProcessInjectionBasedOnServletContext() { + void processInjectionBasedOnServletContext() { StaticWebApplicationContext wac = new StaticWebApplicationContext(); AnnotationConfigUtils.registerAnnotationConfigProcessors(wac); diff --git a/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java b/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java index 0de9d60a017..7f667e5d111 100644 --- a/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java @@ -174,7 +174,7 @@ class DefaultCorsProcessorTests { } @Test // gh-26892 - public void actualRequestTrailingSlashOriginMatch() throws Exception { + void actualRequestTrailingSlashOriginMatch() throws Exception { this.request.setMethod(HttpMethod.GET.name()); this.request.addHeader(HttpHeaders.ORIGIN, "https://domain2.com/"); this.conf.addAllowedOrigin("https://domain2.com"); @@ -185,7 +185,7 @@ class DefaultCorsProcessorTests { } @Test //gh-33682 - public void actualRequestMalformedOriginRejected() throws Exception { + void actualRequestMalformedOriginRejected() throws Exception { this.request.setMethod(HttpMethod.GET.name()); this.request.addHeader(HttpHeaders.ORIGIN, "http://*@:;"); this.conf.addAllowedOrigin("https://domain2.com"); diff --git a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java index 1b01c25fe11..422f5d34813 100644 --- a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java @@ -67,7 +67,7 @@ class CorsUtilsTests { } @Test // SPR-16262 - public void isSameOriginWithXForwardedHeaders() { + void isSameOriginWithXForwardedHeaders() { String server = "mydomain1.example"; testWithXForwardedHeaders(server, -1, "https", null, -1, "https://mydomain1.example"); testWithXForwardedHeaders(server, 123, "https", null, -1, "https://mydomain1.example"); @@ -78,7 +78,7 @@ class CorsUtilsTests { } @Test // SPR-16262 - public void isSameOriginWithForwardedHeader() { + void isSameOriginWithForwardedHeader() { String server = "mydomain1.example"; testWithForwardedHeader(server, -1, "proto=https", "https://mydomain1.example"); testWithForwardedHeader(server, 123, "proto=https", "https://mydomain1.example"); @@ -89,7 +89,7 @@ class CorsUtilsTests { } @Test // SPR-16362 - public void isSameOriginWithDifferentSchemes() { + void isSameOriginWithDifferentSchemes() { MockServerHttpRequest request = MockServerHttpRequest .get("http://mydomain1.example") .header(HttpHeaders.ORIGIN, "https://mydomain1.example") diff --git a/spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java b/spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java index 6dfca7148d6..e8f9e2becc8 100644 --- a/spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java @@ -178,7 +178,7 @@ class DefaultCorsProcessorTests { } @Test // gh-26892 - public void actualRequestTrailingSlashOriginMatch() { + void actualRequestTrailingSlashOriginMatch() { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest .method(HttpMethod.GET, "http://localhost/test.html") .header(HttpHeaders.ORIGIN, "https://domain2.com/")); @@ -192,7 +192,7 @@ class DefaultCorsProcessorTests { } @Test // gh-33682 - public void actualRequestMalformedOriginRejected() { + void actualRequestMalformedOriginRejected() { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest .method(HttpMethod.GET, "http://localhost/test.html") .header(HttpHeaders.ORIGIN, "http://*@:;")); diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java index 15a36f29f00..33cd19d2725 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; class CompositeFilterTests { @Test - void testCompositeFilter() throws ServletException, IOException { + void compositeFilter() throws ServletException, IOException { ServletContext sc = new MockServletContext(); MockFilter targetFilter = new MockFilter(); MockFilterConfig proxyConfig = new MockFilterConfig(sc); diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java index ac8e34eaf55..157acd48f70 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java @@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; class DelegatingFilterProxyTests { @Test - void testDelegatingFilterProxy() throws ServletException, IOException { + void delegatingFilterProxy() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -74,7 +74,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyAndCustomContextAttribute() throws ServletException, IOException { + void delegatingFilterProxyAndCustomContextAttribute() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -103,7 +103,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithFilterDelegateInstance() throws ServletException, IOException { + void delegatingFilterProxyWithFilterDelegateInstance() throws ServletException, IOException { MockFilter targetFilter = new MockFilter(); DelegatingFilterProxy filterProxy = new DelegatingFilterProxy(targetFilter); @@ -121,7 +121,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithTargetBeanName() throws ServletException, IOException { + void delegatingFilterProxyWithTargetBeanName() throws ServletException, IOException { MockServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -147,7 +147,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithTargetBeanNameAndNotYetRefreshedApplicationContext() + void delegatingFilterProxyWithTargetBeanNameAndNotYetRefreshedApplicationContext() throws ServletException, IOException { MockServletContext sc = new MockServletContext(); @@ -175,7 +175,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithTargetBeanNameAndNoApplicationContext() + void delegatingFilterProxyWithTargetBeanNameAndNoApplicationContext() throws ServletException { MockServletContext sc = new MockServletContext(); @@ -190,7 +190,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithFilterName() throws ServletException, IOException { + void delegatingFilterProxyWithFilterName() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -217,7 +217,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithLazyContextStartup() throws ServletException, IOException { + void delegatingFilterProxyWithLazyContextStartup() throws ServletException, IOException { ServletContext sc = new MockServletContext(); MockFilterConfig proxyConfig = new MockFilterConfig(sc); @@ -245,7 +245,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithTargetFilterLifecycle() throws ServletException, IOException { + void delegatingFilterProxyWithTargetFilterLifecycle() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -275,7 +275,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyWithFrameworkServletContext() throws ServletException, IOException { + void delegatingFilterProxyWithFrameworkServletContext() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.setServletContext(sc); @@ -302,7 +302,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyInjectedPreferred() throws ServletException, IOException { + void delegatingFilterProxyInjectedPreferred() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.setServletContext(sc); @@ -331,7 +331,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyNotInjectedWacServletAttrPreferred() + void delegatingFilterProxyNotInjectedWacServletAttrPreferred() throws ServletException, IOException { ServletContext sc = new MockServletContext(); @@ -367,7 +367,7 @@ class DelegatingFilterProxyTests { } @Test - void testDelegatingFilterProxyNotInjectedWithRootPreferred() throws ServletException, IOException { + void delegatingFilterProxyNotInjectedWithRootPreferred() throws ServletException, IOException { ServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.setServletContext(sc); diff --git a/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java index b67170a310f..d28c1da1e9a 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java @@ -207,7 +207,7 @@ class FormContentFilterTests { } @Test // SPR-15835 - public void hiddenHttpMethodFilterFollowedByHttpPutFormContentFilter() throws Exception { + void hiddenHttpMethodFilterFollowedByHttpPutFormContentFilter() throws Exception { this.request.addParameter("_method", "PUT"); this.request.addParameter("hiddenField", "testHidden"); this.filter.doFilter(this.request, this.response, this.filterChain); diff --git a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java index ab2a206c527..2a2c85be235 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java @@ -101,7 +101,7 @@ class OncePerRequestFilterTests { } @Test // gh-23196 - public void filterNestedErrorDispatch() throws ServletException, IOException { + void filterNestedErrorDispatch() throws ServletException, IOException { // Opt in for ERROR dispatch this.filter.setShouldNotFilterErrorDispatch(false); diff --git a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java index 84e2c78c9dc..82f67364423 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java @@ -172,7 +172,7 @@ class ShallowEtagHeaderFilterTests { } @Test // SPR-12960 - public void filterWriterWithDisabledCaching() throws Exception { + void filterWriterWithDisabledCaching() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels"); MockHttpServletResponse response = new MockHttpServletResponse(); response.setContentType(TEXT_PLAIN_VALUE); @@ -257,7 +257,7 @@ class ShallowEtagHeaderFilterTests { } @Test // SPR-13717 - public void filterFlushResponse() throws Exception { + void filterFlushResponse() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels"); MockHttpServletResponse response = new MockHttpServletResponse(); 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 4de766835c0..820bd79f819 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 @@ -202,7 +202,7 @@ class ControllerAdviceBeanTests { @Test @SuppressWarnings({"rawtypes", "unchecked"}) - public void findAnnotatedBeansSortsBeans() { + void findAnnotatedBeansSortsBeans() { Class[] expectedTypes = { // Since ControllerAdviceBean currently treats PriorityOrdered the same as Ordered, // OrderedControllerAdvice is sorted before PriorityOrderedControllerAdvice. 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 f5c9abb81ea..365ecd00cff 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 @@ -247,7 +247,7 @@ class ModelAttributeMethodProcessorTests { } @Test // SPR-9378 - public void resolveArgumentOrdering() throws Exception { + void resolveArgumentOrdering() throws Exception { String name = "testBean"; Object testBean = new TestBean(name); this.container.addAttribute(name, testBean); @@ -282,7 +282,7 @@ class ModelAttributeMethodProcessorTests { } @Test // gh-25182 - public void resolveConstructorListArgumentFromCommaSeparatedRequestParameter() throws Exception { + void resolveConstructorListArgumentFromCommaSeparatedRequestParameter() throws Exception { MockHttpServletRequest mockRequest = new MockHttpServletRequest(); mockRequest.addParameter("listOfStrings", "1,2"); ServletWebRequest requestWithParam = new ServletWebRequest(mockRequest); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java index a0c338ae1e3..17c421d28b3 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java @@ -312,7 +312,7 @@ class RequestHeaderMethodArgumentResolverTests { } @Test - public void uuidPlaceholderConversionWithEmptyValue() { + void uuidPlaceholderConversionWithEmptyValue() { try { String expected = "name"; servletRequest.addHeader(expected, ""); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java index c0c1710a9d4..e580e1d73f8 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -108,7 +108,7 @@ class RequestParamMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveMapOfMultipartFile() throws Exception { + void resolveMapOfMultipartFile() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected1 = new MockMultipartFile("mfile", "Hello World".getBytes()); MultipartFile expected2 = new MockMultipartFile("other", "Hello World 3".getBytes()); @@ -129,7 +129,7 @@ class RequestParamMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveMultiValueMapOfMultipartFile() throws Exception { + void resolveMultiValueMapOfMultipartFile() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected1 = new MockMultipartFile("mfilelist", "Hello World 1".getBytes()); MultipartFile expected2 = new MockMultipartFile("mfilelist", "Hello World 2".getBytes()); @@ -152,7 +152,7 @@ class RequestParamMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveMapOfPart() throws Exception { + void resolveMapOfPart() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setContentType("multipart/form-data"); Part expected1 = new MockPart("mfile", "Hello World".getBytes()); @@ -174,7 +174,7 @@ class RequestParamMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveMultiValueMapOfPart() throws Exception { + void resolveMultiValueMapOfPart() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setContentType("multipart/form-data"); Part expected1 = new MockPart("mfilelist", "Hello World 1".getBytes()); 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 950d816ff7c..11d1bb646d6 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 @@ -371,7 +371,7 @@ class RequestParamMethodArgumentResolverTests { } @Test // SPR-9079 - public void isMultipartRequestHttpPut() throws Exception { + void isMultipartRequestHttpPut() throws Exception { MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest(); MultipartFile expected = new MockMultipartFile("multipartFileList", "Hello World".getBytes()); request.addFile(expected); @@ -431,7 +431,7 @@ class RequestParamMethodArgumentResolverTests { } @Test // SPR-10578 - public void missingRequestParamEmptyValueConvertedToNull() throws Exception { + void missingRequestParamEmptyValueConvertedToNull() throws Exception { WebDataBinder binder = new WebRequestDataBinder(null); binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); @@ -445,7 +445,7 @@ class RequestParamMethodArgumentResolverTests { } @Test // gh-31336 - public void missingRequestParamAfterConversionWithDefaultValue() throws Exception { + void missingRequestParamAfterConversionWithDefaultValue() throws Exception { WebDataBinder binder = new WebRequestDataBinder(null); WebDataBinderFactory binderFactory = mock(); @@ -472,7 +472,7 @@ class RequestParamMethodArgumentResolverTests { } @Test // gh-29550 - public void missingRequestParamEmptyValueNotRequiredWithDefaultValue() throws Exception { + void missingRequestParamEmptyValueNotRequiredWithDefaultValue() throws Exception { WebDataBinder binder = new WebRequestDataBinder(null); binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); @@ -494,14 +494,14 @@ class RequestParamMethodArgumentResolverTests { } @Test // SPR-8561 - public void resolveSimpleTypeParamToNull() throws Exception { + void resolveSimpleTypeParamToNull() throws Exception { MethodParameter param = this.testMethod.annotNotPresent(RequestParam.class).arg(String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); assertThat(result).isNull(); } @Test // SPR-10180 - public void resolveEmptyValueToDefault() throws Exception { + void resolveEmptyValueToDefault() throws Exception { request.addParameter("name", ""); MethodParameter param = this.testMethod.annot(requestParam().notRequired("bar")).arg(String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); @@ -526,7 +526,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void resolveOptionalParamValue() throws Exception { + void resolveOptionalParamValue() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); @@ -543,7 +543,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void missingOptionalParamValue() throws Exception { + void missingOptionalParamValue() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); @@ -559,7 +559,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings("rawtypes") - public void resolveOptionalParamArray() throws Exception { + void resolveOptionalParamArray() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); @@ -576,7 +576,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void missingOptionalParamArray() throws Exception { + void missingOptionalParamArray() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); @@ -592,7 +592,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void resolveOptionalParamList() throws Exception { + void resolveOptionalParamList() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); @@ -609,7 +609,7 @@ class RequestParamMethodArgumentResolverTests { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void missingOptionalParamList() throws Exception { + void missingOptionalParamList() throws Exception { ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultConversionService()); WebDataBinderFactory binderFactory = new DefaultDataBinderFactory(initializer); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java index a2d06b9bb1d..5716b1f8cf9 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java @@ -161,7 +161,7 @@ class InvocableHandlerMethodTests { } @Test // SPR-13917 - public void invocationErrorMessage() { + void invocationErrorMessage() { this.composite.addResolver(new StubArgumentResolver(double.class)); assertThatIllegalStateException() .isThrownBy(() -> getInvocable(double.class).invokeForRequest(this.request, null)) diff --git a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java index f41cf2981a1..5c7900b866a 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java @@ -66,7 +66,7 @@ class ModelAndViewContainerTests { } @Test // SPR-14045 - public void ignoreDefaultModelAndWithoutRedirectModel() { + void ignoreDefaultModelAndWithoutRedirectModel() { this.mavContainer.setRedirectModelScenario(true); this.mavContainer.addAttribute("name", "value"); diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java index 17117c7d504..248f807dc53 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java @@ -43,7 +43,7 @@ class DefaultMultipartHttpServletRequestTests { @Test // SPR-16590 - public void parameterValues() { + void parameterValues() { this.multipartParams.put("key", new String[] {"p"}); this.queryParams.add("key", "q"); @@ -54,7 +54,7 @@ class DefaultMultipartHttpServletRequestTests { } @Test // SPR-16590 - public void parameterMap() { + void parameterMap() { this.multipartParams.put("key1", new String[] {"p1"}); this.multipartParams.put("key2", new String[] {"p2"}); diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java index e45ba58579d..c6aa696dd0a 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java @@ -90,7 +90,7 @@ class RequestPartServletServerHttpRequestTests { } @Test // SPR-13317 - public void getBodyWithWrappedRequest() throws Exception { + void getBodyWithWrappedRequest() throws Exception { byte[] bytes = "content".getBytes(StandardCharsets.UTF_8); MultipartFile part = new MockMultipartFile("part", "", "application/json", bytes); this.mockRequest.addFile(part); @@ -102,7 +102,7 @@ class RequestPartServletServerHttpRequestTests { } @Test // SPR-13096 - public void getBodyViaRequestParameter() throws Exception { + void getBodyViaRequestParameter() throws Exception { MockMultipartHttpServletRequest mockRequest = new MockMultipartHttpServletRequest() { @Override public HttpHeaders getMultipartHeaders(String paramOrFileName) { @@ -139,7 +139,7 @@ class RequestPartServletServerHttpRequestTests { } @Test // gh-25829 - public void getBodyViaRequestPart() throws Exception { + void getBodyViaRequestPart() throws Exception { byte[] bytes = "content".getBytes(StandardCharsets.UTF_8); MockPart mockPart = new MockPart("part", bytes); mockPart.getHeaders().setContentType(MediaType.APPLICATION_JSON); diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java index 4dfc4b690f2..c5e4c71e08e 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java @@ -339,7 +339,7 @@ class WebHttpHandlerBuilderTests { static class ObservationConfig { @Bean - public TestObservationRegistry testObservationRegistry() { + public TestObservationRegistry observationRegistry() { return TestObservationRegistry.create(); } diff --git a/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java b/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java index 2c928696e43..fb18b7b4e1e 100644 --- a/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java +++ b/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java @@ -262,7 +262,7 @@ class HttpServiceMethodTests { ); } - protected void verifyReactorClientInvocation(String methodName, @Nullable ParameterizedTypeReference expectedBodyType) { + void verifyReactorClientInvocation(String methodName, @Nullable ParameterizedTypeReference expectedBodyType) { assertThat(this.reactorClient.getInvokedMethodName()).isEqualTo(methodName); assertThat(this.reactorClient.getBodyType()).isEqualTo(expectedBodyType); } diff --git a/spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java b/spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java index 6ace3ec53ff..27b908cc905 100644 --- a/spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/DefaultUriBuilderFactoryTests.java @@ -42,7 +42,7 @@ class DefaultUriBuilderFactoryTests { } @Test // SPR-17465 - public void defaultSettingsWithBuilder() { + void defaultSettingsWithBuilder() { DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(); URI uri = factory.builder().path("/foo/{id}").build("a/b"); assertThat(uri.toString()).isEqualTo("/foo/a%2Fb"); @@ -174,7 +174,7 @@ class DefaultUriBuilderFactoryTests { } @Test // SPR-15201 - public void pathWithTrailingSlash() { + void pathWithTrailingSlash() { DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(); URI uri = factory.expand("https://localhost:8080/spring/"); assertThat(uri.toString()).isEqualTo("https://localhost:8080/spring/"); diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java index 6e85785c8f3..50ecba2d742 100644 --- a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java @@ -38,7 +38,7 @@ class HtmlCharacterEntityReferencesTests { private static final String DTD_FILE = "HtmlCharacterEntityReferences.dtd"; @Test - void testSupportsAllCharacterEntityReferencesDefinedByHtml() { + void supportsAllCharacterEntityReferencesDefinedByHtml() { HtmlCharacterEntityReferences references = new HtmlCharacterEntityReferences(); Map charactersMap = getReferenceCharacterMap(); for (int character = 0; character < 10000; character++) { @@ -81,7 +81,7 @@ class HtmlCharacterEntityReferencesTests { // SPR-9293 @Test - void testConvertToReferenceUTF8() { + void convertToReferenceUTF8() { HtmlCharacterEntityReferences entityReferences = new HtmlCharacterEntityReferences(); String utf8 = "UTF-8"; assertThat(entityReferences.convertToReference('<', utf8)).isEqualTo("<"); diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java index 7b56869cffe..9bce3fd2520 100644 --- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java @@ -129,7 +129,7 @@ class TagUtilsTests { } @Test - void testAssertHasAncestorOfTypeDoesNotThrowExceptionOnPass() { + void assertHasAncestorOfTypeDoesNotThrowExceptionOnPass() { Tag a = new TagA(); Tag b = new TagB(); Tag c = new TagC(); diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index 7bce9132fc7..dccb60f72e6 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -775,7 +775,7 @@ class UriComponentsBuilderTests { } @Test // gh-25243 - void testCloneAndMerge() { + void cloneAndMerge() { UriComponentsBuilder builder1 = UriComponentsBuilder.newInstance(); builder1.scheme("http").host("e1.com").path("/p1").pathSegment("ps1").queryParam("q1", "x").fragment("f1").encode(); @@ -800,7 +800,7 @@ class UriComponentsBuilderTests { } @Test // gh-24772 - void testDeepClone() { + void deepClone() { HashMap vars = new HashMap<>(); vars.put("ps1", "foo"); vars.put("ps2", "bar"); diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternRouteMatcherTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternRouteMatcherTests.java index 3718c8fcf93..47126d662fe 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternRouteMatcherTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternRouteMatcherTests.java @@ -50,14 +50,14 @@ class PathPatternRouteMatcherTests { } @Test // gh-23310 - public void noDecodingAndNoParamParsing() { + void noDecodingAndNoParamParsing() { PathPatternRouteMatcher routeMatcher = new PathPatternRouteMatcher(); RouteMatcher.Route route = routeMatcher.parseRoute("projects.spring%20framework;p=1"); assertThat(routeMatcher.match("projects.spring%20framework;p=1", route)).isTrue(); } @Test // gh-23310 - public void separatorOnlyDecoded() { + void separatorOnlyDecoded() { PathPatternRouteMatcher routeMatcher = new PathPatternRouteMatcher(); RouteMatcher.Route route = routeMatcher.parseRoute("projects.spring%2Eframework"); Map vars = routeMatcher.matchAndExtract("projects.{project}", route); diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java index 46773f1d53d..01e645210b7 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java @@ -609,7 +609,7 @@ class PathPatternTests { } @Test // SPR-15264 - public void extractUriTemplateVariables() { + void extractUriTemplateVariables() { PathPattern pp; pp = new PathPatternParser().parse("/{foo}"); assertMatches(pp,"/abc"); @@ -1008,7 +1008,7 @@ class PathPatternTests { } @Test // SPR-13286 - public void caseInsensitive() { + void caseInsensitive() { PathPatternParser pp = new PathPatternParser(); pp.setCaseSensitive(false); PathPattern p = pp.parse("/group/{groupName}/members"); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/handler/AbstractResponseStatusExceptionHandlerTests.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/handler/AbstractResponseStatusExceptionHandlerTests.java index aab2743ac12..81579dfd640 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/handler/AbstractResponseStatusExceptionHandlerTests.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/handler/AbstractResponseStatusExceptionHandlerTests.java @@ -61,21 +61,21 @@ public abstract class AbstractResponseStatusExceptionHandlerTests { @Test - protected void handleResponseStatusException() { + void handleResponseStatusException() { Throwable ex = new ResponseStatusException(HttpStatus.BAD_REQUEST, ""); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); } @Test - protected void handleNestedResponseStatusException() { + void handleNestedResponseStatusException() { Throwable ex = new Exception(new ResponseStatusException(HttpStatus.BAD_REQUEST, "")); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); } @Test // gh-23741 - protected void handleMethodNotAllowed() { + void handleMethodNotAllowed() { Throwable ex = new MethodNotAllowedException(HttpMethod.PATCH, Arrays.asList(HttpMethod.POST, HttpMethod.PUT)); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); @@ -85,7 +85,7 @@ public abstract class AbstractResponseStatusExceptionHandlerTests { } @Test // gh-23741 - protected void handleResponseStatusExceptionWithHeaders() { + void handleResponseStatusExceptionWithHeaders() { Throwable ex = new NotAcceptableStatusException(Arrays.asList(MediaType.TEXT_PLAIN, MediaType.TEXT_HTML)); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); @@ -95,14 +95,14 @@ public abstract class AbstractResponseStatusExceptionHandlerTests { } @Test - protected void unresolvedException() { + void unresolvedException() { Throwable expected = new IllegalStateException(); Mono mono = this.handler.handle(this.exchange, expected); StepVerifier.create(mono).consumeErrorWith(actual -> assertThat(actual).isSameAs(expected)).verify(); } @Test // SPR-16231 - protected void responseCommitted() { + void responseCommitted() { Throwable ex = new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Oops"); this.exchange.getResponse().setStatusCode(HttpStatus.CREATED); Mono mono = this.exchange.getResponse().setComplete() diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index d94049d4288..5eecee6bf8b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -211,12 +211,12 @@ public class DispatcherHandlerErrorTests { static class TestConfig { @Bean - public RequestMappingHandlerMapping handlerMapping() { + RequestMappingHandlerMapping handlerMapping() { return new RequestMappingHandlerMapping(); } @Bean - public RequestMappingHandlerAdapter handlerAdapter() { + RequestMappingHandlerAdapter handlerAdapter() { return new RequestMappingHandlerAdapter(); } @@ -228,7 +228,7 @@ public class DispatcherHandlerErrorTests { } @Bean - public TestController testController() { + public TestController controller() { return new TestController(); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java index ed153dbfa08..3ae0335bf58 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java @@ -79,7 +79,7 @@ class ParameterContentTypeResolverTests { } @Test // SPR-13747 - public void resolveKeyIsCaseInsensitive() { + void resolveKeyIsCaseInsensitive() { ServerWebExchange exchange = createExchange("JSoN"); Map mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON); ParameterContentTypeResolver resolver = new ParameterContentTypeResolver(mapping); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java index 76370abec60..0b4fc5475f6 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java @@ -92,7 +92,7 @@ class ViewResolverRegistryTests { } @Test // SPR-16431 - public void scriptTemplate() { + void scriptTemplate() { this.registry.scriptTemplate().prefix("/").suffix(".html"); List viewResolvers = this.registry.getViewResolvers(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java index c0a87e81dfa..217f0c8b7d8 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java @@ -244,7 +244,7 @@ class BodyInsertersTests { } @Test // gh-24366 - public void ofResourceWithExplicitMediaType() throws IOException { + void ofResourceWithExplicitMediaType() throws IOException { Resource resource = new ClassPathResource("response.txt", getClass()); MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.POST, "/"); @@ -389,7 +389,7 @@ class BodyInsertersTests { } @Test // SPR-16350 - public void fromMultipartDataWithMultipleValues() { + void fromMultipartDataWithMultipleValues() { MultiValueMap map = new LinkedMultiValueMap<>(); map.put("name", Arrays.asList("value1", "value2")); BodyInserters.FormInserter inserter = BodyInserters.fromMultipartData(map); 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 ee4c14f0ae2..0a20c2e7b30 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 @@ -104,7 +104,7 @@ public class DefaultWebClientTests { } @Test // gh-22705 - public void uriBuilderWithUriTemplate() { + void uriBuilderWithUriTemplate() { this.builder.build().get() .uri("/path/{id}", builder -> builder.queryParam("q", "12").build("identifier")) .retrieve().bodyToMono(Void.class).block(Duration.ofSeconds(10)); @@ -404,7 +404,7 @@ public class DefaultWebClientTests { } @Test // gh-23880 - public void onStatusHandlersOrderIsPreserved() { + void onStatusHandlersOrderIsPreserved() { ClientResponse response = ClientResponse.create(HttpStatus.BAD_REQUEST).build(); given(exchangeFunction.exchange(any())).willReturn(Mono.just(response)); @@ -454,7 +454,7 @@ public class DefaultWebClientTests { } @Test // gh-23880 - public void onStatusHandlersDefaultHandlerIsLast() { + void onStatusHandlersDefaultHandlerIsLast() { ClientResponse response = ClientResponse.create(HttpStatus.BAD_REQUEST).build(); given(exchangeFunction.exchange(any())).willReturn(Mono.just(response)); @@ -479,7 +479,7 @@ public class DefaultWebClientTests { } @Test // gh-26069 - public void onStatusHandlersApplyForToEntityMethods() { + void onStatusHandlersApplyForToEntityMethods() { ClientResponse response = ClientResponse.create(HttpStatus.BAD_REQUEST).build(); given(exchangeFunction.exchange(any())).willReturn(Mono.just(response)); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java index 32a62524911..bf9cf36cdb9 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java @@ -41,7 +41,7 @@ class ExchangeStrategiesTests { @Test @SuppressWarnings("deprecation") - public void mutate() { + void mutate() { ExchangeStrategies strategies = ExchangeStrategies.empty().build(); assertThat(strategies.messageReaders()).isEmpty(); assertThat(strategies.messageWriters()).isEmpty(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java index 768e9fc2c06..62e37c50be5 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java @@ -247,7 +247,7 @@ class DefaultServerRequestTests { class BodyTests { @Test - public void body() { + void body() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -266,7 +266,7 @@ class DefaultServerRequestTests { } @Test - public void bodyToMono() { + void bodyToMono() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -284,7 +284,7 @@ class DefaultServerRequestTests { } @Test - public void bodyToMonoParameterizedTypeReference() { + void bodyToMonoParameterizedTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -304,7 +304,7 @@ class DefaultServerRequestTests { } @Test - public void bodyToMonoDecodingException() { + void bodyToMonoDecodingException() { byte[] bytes = "{\"invalid\":\"json\" ".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -325,7 +325,7 @@ class DefaultServerRequestTests { } @Test - public void bodyToFlux() { + void bodyToFlux() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -343,7 +343,7 @@ class DefaultServerRequestTests { } @Test - public void bodyToFluxParameterizedTypeReference() { + void bodyToFluxParameterizedTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); @@ -363,7 +363,7 @@ class DefaultServerRequestTests { } @Test - public void bodyUnacceptable() { + void bodyUnacceptable() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); Flux body = Flux.just(dataBuffer); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java index dd0abdf3b12..2696f99e6af 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java @@ -136,7 +136,7 @@ public class EncodedResourceResolverTests { } @Test // SPR-13149 - public void resolveWithNullRequest() { + void resolveWithNullRequest() { String file = "js/foo.js"; Resource resolved = this.resolver.resolveResource(null, file, this.locations).block(TIMEOUT); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java index 61d72d4154a..3b67e694bf1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java @@ -67,7 +67,7 @@ class FixedVersionStrategyTests { } @Test // SPR-13727 - public void addVersionRelativePath() { + void addVersionRelativePath() { String relativePath = "../" + PATH; assertThat(this.strategy.addVersion(relativePath, VERSION)).isEqualTo(relativePath); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java index 2e0bea107be..d3ea0cdff6f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java @@ -64,7 +64,7 @@ class PathResourceResolverTests { } @Test // gh-22272 - public void resolveWithEncodedPath() throws IOException { + void resolveWithEncodedPath() throws IOException { Resource classpathLocation = new ClassPathResource("test/", PathResourceResolver.class); testWithEncodedPath(classpathLocation); testWithEncodedPath(new FileUrlResource(classpathLocation.getURL())); @@ -105,7 +105,7 @@ class PathResourceResolverTests { } @Test // gh-23463 - public void ignoreInvalidEscapeSequence() throws IOException { + void ignoreInvalidEscapeSequence() throws IOException { UrlResource location = new UrlResource(getClass().getResource("./test/")); Resource resource = new UrlResource(location.getURL() + "test%file.txt"); @@ -130,7 +130,7 @@ class PathResourceResolverTests { } @Test // SPR-12624 - public void checkRelativeLocation() throws Exception { + void checkRelativeLocation() throws Exception { String location= new UrlResource(getClass().getResource("./test/")).getURL().toExternalForm(); location = location.replace("/test/org/springframework","/test/org/../org/springframework"); @@ -141,13 +141,13 @@ class PathResourceResolverTests { } @Test // SPR-12747 - public void checkFileLocation() throws Exception { + void checkFileLocation() throws Exception { Resource resource = getResource("main.css"); assertThat(this.resolver.checkResource(resource, resource)).isTrue(); } @Test // SPR-13241 - public void resolvePathRootResource() { + void resolvePathRootResource() { Resource webjarsLocation = new ClassPathResource("/META-INF/resources/webjars/", PathResourceResolver.class); String path = this.resolver.resolveUrlPathInternal( "", Collections.singletonList(webjarsLocation), null).block(TIMEOUT); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java index 0495e2717af..23c5f23a58d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java @@ -81,7 +81,7 @@ class ConsumesRequestConditionTests { } @Test // gh-28024 - public void matchWithParameters() { + void matchWithParameters() { String base = "application/hal+json"; ConsumesRequestCondition condition = new ConsumesRequestCondition(base + ";profile=\"a\""); MockServerWebExchange exchange = postExchange(base + ";profile=\"a\""); @@ -121,7 +121,7 @@ class ConsumesRequestConditionTests { } @Test // gh-22010 - public void consumesNoContent() { + void consumesNoContent() { ConsumesRequestCondition condition = new ConsumesRequestCondition("text/plain"); condition.setBodyRequired(false); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java index b0694bd5d3b..e4a12adf389 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java @@ -121,7 +121,7 @@ class HeadersRequestConditionTests { } @Test // SPR-16674 - public void compareToWithMoreSpecificMatchByValue() { + void compareToWithMoreSpecificMatchByValue() { ServerWebExchange exchange = MockServerWebExchange.from(get("/")); HeadersRequestCondition condition1 = new HeadersRequestCondition("foo=a"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java index b74bc6d673d..7d412fd4957 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java @@ -114,7 +114,7 @@ class PatternsRequestConditionTests { } @Test // gh-22543 - public void matchWithEmptyPatterns() { + void matchWithEmptyPatterns() { PatternsRequestCondition condition = new PatternsRequestCondition(); assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("")))).isNotNull(); assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/anything")))).isNull(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java index 80c35eabbde..4c76366bbe0 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java @@ -85,7 +85,7 @@ class ProducesRequestConditionTests { } @Test // gh-21670 - public void matchWithParameters() { + void matchWithParameters() { String base = "application/atom+xml"; ProducesRequestCondition condition = new ProducesRequestCondition(base + ";type=feed"); MockServerWebExchange exchange = MockServerWebExchange.from(get("/").header("Accept", base + ";type=feed")); @@ -121,7 +121,7 @@ class ProducesRequestConditionTests { } @Test // SPR-17550 - public void matchWithNegationAndMediaTypeAllWithQualityParameter() { + void matchWithNegationAndMediaTypeAllWithQualityParameter() { ProducesRequestCondition condition = new ProducesRequestCondition("!application/json"); MockServerWebExchange exchange = MockServerWebExchange.from(get("/").header("Accept", @@ -131,7 +131,7 @@ class ProducesRequestConditionTests { } @Test // gh-22853 - public void matchAndCompare() { + void matchAndCompare() { RequestedContentTypeResolverBuilder builder = new RequestedContentTypeResolverBuilder(); builder.headerResolver(); builder.fixedResolver(MediaType.TEXT_HTML); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java index 540e3b4758e..76f6b9926f1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java @@ -291,7 +291,7 @@ class RequestMappingInfoTests { @Test @Disabled - public void preFlightRequest() { + void preFlightRequest() { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.options("/foo") .header("Origin", "https://domain.com") .header(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS, "POST")); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java index 8360a1b97d7..ba7488c4bed 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java @@ -112,7 +112,7 @@ class HandlerMethodMappingTests { } @Test // gh-26490 - public void ambiguousMatchOnPreFlightRequestWithoutCorsConfig() { + void ambiguousMatchOnPreFlightRequestWithoutCorsConfig() { this.mapping.registerMapping("/f?o", this.handler, this.method1); this.mapping.registerMapping("/fo?", this.handler, this.method2); @@ -130,7 +130,7 @@ class HandlerMethodMappingTests { } @Test // gh-26490 - public void ambiguousMatchOnPreFlightRequestWithCorsConfig() throws Exception { + void ambiguousMatchOnPreFlightRequestWithCorsConfig() throws Exception { this.mapping.registerMapping("/f?o", this.handler, this.method1); this.mapping.registerMapping("/fo?", this.handler, this.handler.getClass().getMethod("corsHandlerMethod")); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java index 8ce9bff7012..16025392f4d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java @@ -102,7 +102,7 @@ class MessageReaderArgumentResolverTests { // More extensive "empty body" tests in RequestBody- and HttpEntityArgumentResolverTests @Test @SuppressWarnings("unchecked") // SPR-9942 - public void emptyBody() { + void emptyBody() { MockServerHttpRequest request = post("/path").contentType(MediaType.APPLICATION_JSON).build(); ServerWebExchange exchange = MockServerWebExchange.from(request); ResolvableType type = forClassWithGenerics(Mono.class, TestBean.class); @@ -114,7 +114,7 @@ class MessageReaderArgumentResolverTests { } @Test @SuppressWarnings("unchecked") - public void tooLargeBody() { + void tooLargeBody() { StringBuilder bodyBuilder = new StringBuilder(); while (bodyBuilder.toString().getBytes().length < 256 * 1024) { bodyBuilder.append("The default maximum input length is 256kb."); @@ -202,7 +202,7 @@ class MessageReaderArgumentResolverTests { } @Test - void testBean() { + void bean() { String body = "{\"bar\":\"b1\",\"foo\":\"f1\"}"; MethodParameter param = this.testMethod.arg(TestBean.class); TestBean value = resolveValue(param, body); @@ -277,7 +277,7 @@ class MessageReaderArgumentResolverTests { } @Test // SPR-9964 - public void parameterizedMethodArgument() throws Exception { + void parameterizedMethodArgument() throws Exception { Method method = AbstractParameterizedController.class.getMethod("handleDto", Identifiable.class); HandlerMethod handlerMethod = new HandlerMethod(new ConcreteParameterizedController(), method); MethodParameter methodParam = handlerMethod.getMethodParameters()[0]; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java index 2829422e3f4..7481a250bdb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java @@ -90,7 +90,7 @@ class MessageWriterResultHandlerTests { @Test // SPR-12894 - public void useDefaultContentType() { + void useDefaultContentType() { Resource body = new ClassPathResource("logo.png", getClass()); MethodParameter type = on(TestController.class).resolveReturnType(Resource.class); this.resultHandler.writeBody(body, type, this.exchange).block(Duration.ofSeconds(5)); @@ -99,7 +99,7 @@ class MessageWriterResultHandlerTests { } @Test // SPR-13631 - public void useDefaultCharset() { + void useDefaultCharset() { this.exchange.getAttributes().put(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, Collections.singleton(APPLICATION_JSON)); @@ -137,7 +137,7 @@ class MessageWriterResultHandlerTests { } @Test // SPR-13135 - public void unsupportedReturnType() { + void unsupportedReturnType() { ByteArrayOutputStream body = new ByteArrayOutputStream(); MethodParameter type = on(TestController.class).resolveReturnType(OutputStream.class); @@ -148,7 +148,7 @@ class MessageWriterResultHandlerTests { } @Test // SPR-12811 - public void jacksonTypeOfListElement() { + void jacksonTypeOfListElement() { MethodParameter returnType = on(TestController.class).resolveReturnType(List.class, ParentClass.class); List body = Arrays.asList(new Foo("foo"), new Bar("bar")); @@ -160,7 +160,7 @@ class MessageWriterResultHandlerTests { } @Test // SPR-13318 - public void jacksonTypeWithSubType() { + void jacksonTypeWithSubType() { SimpleBean body = new SimpleBean(123L, "foo"); MethodParameter type = on(TestController.class).resolveReturnType(Identifiable.class); this.resultHandler.writeBody(body, type, this.exchange).block(Duration.ofSeconds(5)); @@ -170,7 +170,7 @@ class MessageWriterResultHandlerTests { } @Test // SPR-13318 - public void jacksonTypeWithSubTypeOfListElement() { + void jacksonTypeWithSubTypeOfListElement() { MethodParameter returnType = on(TestController.class).resolveReturnType(List.class, Identifiable.class); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java index fc96c382d84..ed036374144 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java @@ -138,7 +138,7 @@ class RequestAttributeMethodArgumentResolverTests { } @Test // SPR-16158 - public void resolveMonoParameter() { + void resolveMonoParameter() { MethodParameter param = this.testMethod.annot(requestAttribute().noName()).arg(Mono.class, Foo.class); // Mono attribute diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolverTests.java index 8563e122fec..88564e9ace7 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolverTests.java @@ -109,7 +109,7 @@ class RequestBodyMethodArgumentResolverTests { } @Test // SPR-15758 - public void emptyBodyWithoutContentType() { + void emptyBodyWithoutContentType() { MethodParameter param = this.testMethod.annot(requestBody().notRequired()).arg(Map.class); String body = resolveValueWithEmptyBody(param); @@ -118,7 +118,7 @@ class RequestBodyMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void emptyBodyWithMono() { + void emptyBodyWithMono() { MethodParameter param = this.testMethod.annot(requestBody()).arg(Mono.class, String.class); StepVerifier.create((Mono) resolveValueWithEmptyBody(param)) .expectNextCount(0) @@ -134,7 +134,7 @@ class RequestBodyMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void emptyBodyWithFlux() { + void emptyBodyWithFlux() { MethodParameter param = this.testMethod.annot(requestBody()).arg(Flux.class, String.class); StepVerifier.create((Flux) resolveValueWithEmptyBody(param)) .expectNextCount(0) @@ -217,7 +217,7 @@ class RequestBodyMethodArgumentResolverTests { } @Test // gh-29565 - public void invalidContentType() { + void invalidContentType() { MethodParameter parameter = this.testMethod.annot(requestBody()).arg(String.class); ServerWebExchange exchange = MockServerWebExchange.from( diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 45be42a019f..23b261ed9fc 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -97,7 +97,7 @@ class RequestHeaderMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveMultiValueMapArgument() { + void resolveMultiValueMapArgument() { String name = "foo"; String value1 = "bar"; String value2 = "baz"; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java index 7d45ede9fc4..24932a791cb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java @@ -242,7 +242,7 @@ class RequestHeaderMethodArgumentResolverTests { @Test @SuppressWarnings("deprecation") - public void dateConversion() { + void dateConversion() { String rfc1123val = "Thu, 21 Apr 2016 17:11:08 +0100"; MockServerHttpRequest request = MockServerHttpRequest.get("/").header("name", rfc1123val).build(); ServerWebExchange exchange = MockServerWebExchange.from(request); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java index 08c025de334..2c1667b80ad 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -143,7 +143,7 @@ class RequestParamMethodArgumentResolverTests { } @Test // SPR-17050 - public void resolveAndConvertNullValue() { + void resolveAndConvertNullValue() { MethodParameter param = this.testMethod .annot(requestParam().notRequired()) .arg(Integer.class); @@ -172,13 +172,13 @@ class RequestParamMethodArgumentResolverTests { } @Test // SPR-8561 - public void resolveSimpleTypeParamToNull() { + void resolveSimpleTypeParamToNull() { MethodParameter param = this.testMethod.annotNotPresent(RequestParam.class).arg(String.class); assertThat(resolve(param, MockServerWebExchange.from(MockServerHttpRequest.get("/")))).isNull(); } @Test // SPR-10180 - public void resolveEmptyValueToDefault() { + void resolveEmptyValueToDefault() { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path?name=")); MethodParameter param = this.testMethod.annot(requestParam().notRequired("bar")).arg(String.class); Object result = resolve(param, exchange); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java index 9d5e55c4d00..f722032a02e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java @@ -51,13 +51,13 @@ class RequestContextTests { } @Test - void testGetContextUrl() { + void getContextUrl() { RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext); assertThat(context.getContextUrl("bar")).isEqualTo("/foo/bar"); } @Test - void testGetContextUrlWithMap() { + void getContextUrlWithMap() { RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext); Map map = new HashMap<>(); map.put("foo", "bar"); @@ -66,7 +66,7 @@ class RequestContextTests { } @Test - void testGetContextUrlWithMapEscaping() { + void getContextUrlWithMapEscaping() { RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext); Map map = new HashMap<>(); map.put("foo", "bar baz"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurerTests.java index 9a6d78fb3ba..0149823f9a1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurerTests.java @@ -74,7 +74,7 @@ class FreeMarkerConfigurerTests { @Test @SuppressWarnings("rawtypes") - public void freeMarkerConfigurerWithNonFileResourceLoaderPath() throws Exception { + void freeMarkerConfigurerWithNonFileResourceLoaderPath() throws Exception { freeMarkerConfigurer.setTemplateLoaderPath("file:/mydir"); Properties settings = new Properties(); settings.setProperty("localized_lookup", "false"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java index 3e5356435fa..ce974de2705 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java @@ -65,7 +65,7 @@ public class ScriptTemplateViewTests { @Test - public void missingTemplate() throws Exception { + void missingTemplate() throws Exception { this.context.refresh(); this.view.setResourceLoaderPath("classpath:org/springframework/web/reactive/result/view/script/"); this.view.setUrl("missing.txt"); @@ -76,14 +76,14 @@ public class ScriptTemplateViewTests { } @Test - public void missingScriptTemplateConfig() throws Exception { + void missingScriptTemplateConfig() throws Exception { assertThatExceptionOfType(ApplicationContextException.class).isThrownBy(() -> this.view.setApplicationContext(new StaticApplicationContext())) .withMessageContaining("ScriptTemplateConfig"); } @Test - public void detectScriptTemplateConfigWithEngine() { + void detectScriptTemplateConfigWithEngine() { InvocableScriptEngine engine = mock(InvocableScriptEngine.class); this.configurer.setEngine(engine); this.configurer.setRenderObject("Template"); @@ -101,7 +101,7 @@ public class ScriptTemplateViewTests { } @Test - public void detectScriptTemplateConfigWithEngineName() { + void detectScriptTemplateConfigWithEngineName() { this.configurer.setEngineName("jython"); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); @@ -116,7 +116,7 @@ public class ScriptTemplateViewTests { } @Test - public void customEngineAndRenderFunction() throws Exception { + void customEngineAndRenderFunction() throws Exception { ScriptEngine engine = mock(InvocableScriptEngine.class); given(engine.get("key")).willReturn("value"); this.view.setEngine(engine); @@ -132,7 +132,7 @@ public class ScriptTemplateViewTests { } @Test - public void nonSharedEngine() throws Exception { + void nonSharedEngine() throws Exception { int iterations = 20; this.view.setEngineName("jython"); this.view.setRenderFunction("render"); @@ -151,13 +151,13 @@ public class ScriptTemplateViewTests { } @Test - public void nonInvocableScriptEngine() throws Exception { + void nonInvocableScriptEngine() throws Exception { this.view.setEngine(mock(ScriptEngine.class)); this.view.setApplicationContext(this.context); } @Test - public void nonInvocableScriptEngineWithRenderFunction() throws Exception { + void nonInvocableScriptEngineWithRenderFunction() throws Exception { this.view.setEngine(mock(ScriptEngine.class)); this.view.setRenderFunction("render"); assertThatIllegalArgumentException().isThrownBy(() -> @@ -165,7 +165,7 @@ public class ScriptTemplateViewTests { } @Test - public void engineAndEngineNameBothDefined() { + void engineAndEngineNameBothDefined() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setEngineName("test"); this.view.setRenderFunction("render"); @@ -175,7 +175,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineAndEngineSupplierBothDefined() { + void engineAndEngineSupplierBothDefined() { ScriptEngine engine = mock(InvocableScriptEngine.class); this.view.setEngineSupplier(() -> engine); this.view.setEngine(engine); @@ -186,7 +186,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineNameAndEngineSupplierBothDefined() { + void engineNameAndEngineSupplierBothDefined() { this.view.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.view.setEngineName("test"); this.view.setRenderFunction("render"); @@ -196,7 +196,7 @@ public class ScriptTemplateViewTests { } @Test - public void engineSetterAndNonSharedEngine() { + void engineSetterAndNonSharedEngine() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setRenderFunction("render"); this.view.setSharedEngine(false); @@ -206,7 +206,7 @@ public class ScriptTemplateViewTests { } @Test - public void resourceLoaderPath() { + void resourceLoaderPath() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setApplicationContext(this.context); DirectFieldAccessor viewAccessor = new DirectFieldAccessor(this.view); @@ -223,7 +223,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineSupplierWithSharedEngine() { + void engineSupplierWithSharedEngine() { this.configurer.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); @@ -242,7 +242,7 @@ public class ScriptTemplateViewTests { @SuppressWarnings("unchecked") @Test // gh-23258 - public void engineSupplierWithNonSharedEngine() { + void engineSupplierWithNonSharedEngine() { this.configurer.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java index 227e61f8af9..eb548ce94db 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; class HttpRequestHandlerTests { @Test - void testHttpRequestHandlerServletPassThrough() throws Exception { + void httpRequestHandlerServletPassThrough() throws Exception { MockServletContext servletContext = new MockServletContext(); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java index 7f73dd5eb9c..4e68ff550ce 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class ServletContextSupportTests { @Test - void testServletContextAttributeFactoryBean() { + void servletContextAttributeFactoryBean() { MockServletContext sc = new MockServletContext(); sc.setAttribute("myAttr", "myValue"); @@ -60,7 +60,7 @@ class ServletContextSupportTests { } @Test - void testServletContextAttributeFactoryBeanWithAttributeNotFound() { + void servletContextAttributeFactoryBeanWithAttributeNotFound() { MockServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -76,7 +76,7 @@ class ServletContextSupportTests { } @Test - void testServletContextParameterFactoryBean() { + void servletContextParameterFactoryBean() { MockServletContext sc = new MockServletContext(); sc.addInitParameter("myParam", "myValue"); @@ -92,7 +92,7 @@ class ServletContextSupportTests { } @Test - void testServletContextParameterFactoryBeanWithAttributeNotFound() { + void servletContextParameterFactoryBeanWithAttributeNotFound() { MockServletContext sc = new MockServletContext(); StaticWebApplicationContext wac = new StaticWebApplicationContext(); @@ -108,7 +108,7 @@ class ServletContextSupportTests { } @Test - void testServletContextAttributeExporter() { + void servletContextAttributeExporter() { TestBean tb = new TestBean(); Map attributes = new HashMap<>(); attributes.put("attr1", "value1"); @@ -124,7 +124,7 @@ class ServletContextSupportTests { } @Test - void testServletContextResourceLoader() { + void servletContextResourceLoader() { MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context"); ServletContextResourceLoader rl = new ServletContextResourceLoader(sc); assertThat(rl.getResource("/WEB-INF/web.xml").exists()).isTrue(); @@ -134,7 +134,7 @@ class ServletContextSupportTests { } @Test - void testServletContextResourcePatternResolver() throws IOException { + void servletContextResourcePatternResolver() throws IOException { final Set paths = new HashSet<>(); paths.add("/WEB-INF/context1.xml"); paths.add("/WEB-INF/context2.xml"); @@ -161,7 +161,7 @@ class ServletContextSupportTests { } @Test - void testServletContextResourcePatternResolverWithPatternPath() throws IOException { + void servletContextResourcePatternResolverWithPatternPath() throws IOException { final Set dirs = new HashSet<>(); dirs.add("/WEB-INF/mydir1/"); dirs.add("/WEB-INF/mydir2/"); @@ -194,7 +194,7 @@ class ServletContextSupportTests { } @Test - void testServletContextResourcePatternResolverWithUnboundedPatternPath() throws IOException { + void servletContextResourcePatternResolverWithUnboundedPatternPath() throws IOException { final Set dirs = new HashSet<>(); dirs.add("/WEB-INF/mydir1/"); dirs.add("/WEB-INF/mydir2/"); @@ -235,7 +235,7 @@ class ServletContextSupportTests { } @Test - void testServletContextResourcePatternResolverWithAbsolutePaths() throws IOException { + void servletContextResourcePatternResolverWithAbsolutePaths() throws IOException { final Set paths = new HashSet<>(); paths.add("C:/webroot/WEB-INF/context1.xml"); paths.add("C:/webroot/WEB-INF/context2.xml"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java index 8e6d576a03f..4b5f6e2d5ea 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; class WebApplicationObjectSupportTests { @Test - void testWebApplicationObjectSupport() { + void webApplicationObjectSupport() { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.setServletContext(new MockServletContext()); File tempDir = new File(""); @@ -49,7 +49,7 @@ class WebApplicationObjectSupportTests { } @Test - void testWebApplicationObjectSupportWithWrongContext() { + void webApplicationObjectSupportWithWrongContext() { StaticApplicationContext ac = new StaticApplicationContext(); ac.registerBeanDefinition("test", new RootBeanDefinition(TestWebApplicationObject.class)); WebApplicationObjectSupport wao = (WebApplicationObjectSupport) ac.getBean("test"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index 926c2270d6b..1979588034b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -63,7 +63,7 @@ class AnnotationDrivenBeanDefinitionParserTests { private final GenericWebApplicationContext appContext = new GenericWebApplicationContext(); @Test - void testMessageCodesResolver() { + void messageCodesResolver() { loadBeanDefinitions("mvc-config-message-codes-resolver.xml"); RequestMappingHandlerAdapter adapter = this.appContext.getBean(RequestMappingHandlerAdapter.class); assertThat(adapter).isNotNull(); @@ -77,7 +77,7 @@ class AnnotationDrivenBeanDefinitionParserTests { @SuppressWarnings("removal") @Test - public void testPathMatchingConfiguration() { + void pathMatchingConfiguration() { loadBeanDefinitions("mvc-config-path-matching.xml"); RequestMappingHandlerMapping hm = this.appContext.getBean(RequestMappingHandlerMapping.class); assertThat(hm).isNotNull(); @@ -87,7 +87,7 @@ class AnnotationDrivenBeanDefinitionParserTests { } @Test - void testMessageConverters() { + void messageConverters() { loadBeanDefinitions("mvc-config-message-converters.xml"); verifyMessageConverters(this.appContext.getBean(RequestMappingHandlerAdapter.class), true); verifyMessageConverters(this.appContext.getBean(ExceptionHandlerExceptionResolver.class), true); @@ -96,14 +96,14 @@ class AnnotationDrivenBeanDefinitionParserTests { } @Test - void testMessageConvertersWithoutDefaultRegistrations() { + void messageConvertersWithoutDefaultRegistrations() { loadBeanDefinitions("mvc-config-message-converters-defaults-off.xml"); verifyMessageConverters(this.appContext.getBean(RequestMappingHandlerAdapter.class), false); verifyMessageConverters(this.appContext.getBean(ExceptionHandlerExceptionResolver.class), false); } @Test - void testArgumentResolvers() { + void argumentResolvers() { loadBeanDefinitions("mvc-config-argument-resolvers.xml"); testArgumentResolvers(this.appContext.getBean(RequestMappingHandlerAdapter.class)); testArgumentResolvers(this.appContext.getBean(ExceptionHandlerExceptionResolver.class)); @@ -124,7 +124,7 @@ class AnnotationDrivenBeanDefinitionParserTests { } @Test - void testReturnValueHandlers() { + void returnValueHandlers() { loadBeanDefinitions("mvc-config-return-value-handlers.xml"); testReturnValueHandlers(this.appContext.getBean(RequestMappingHandlerAdapter.class)); testReturnValueHandlers(this.appContext.getBean(ExceptionHandlerExceptionResolver.class)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 6f960f64a1d..cfbdf858af0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -194,7 +194,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testDefaultConfig() throws Exception { + void defaultConfig() throws Exception { loadBeanDefinitions("mvc-config.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -270,7 +270,7 @@ public class MvcNamespaceTests { } @Test // gh-25290 - void testDefaultConfigWithBeansInParentContext() { + void defaultConfigWithBeansInParentContext() { StaticApplicationContext parent = new StaticApplicationContext(); parent.registerSingleton("localeResolver", CookieLocaleResolver.class); parent.registerSingleton("viewNameTranslator", DefaultRequestToViewNameTranslator.class); @@ -285,7 +285,7 @@ public class MvcNamespaceTests { } @Test - void testCustomConversionService() throws Exception { + void customConversionService() throws Exception { loadBeanDefinitions("mvc-config-custom-conversion-service.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -312,7 +312,7 @@ public class MvcNamespaceTests { } @Test - void testCustomValidator() throws Exception { + void customValidator() throws Exception { doTestCustomValidator("mvc-config-custom-validator.xml"); } @@ -338,7 +338,7 @@ public class MvcNamespaceTests { } @Test - void testInterceptors() throws Exception { + void interceptors() throws Exception { loadBeanDefinitions("mvc-config-interceptors.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -370,7 +370,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testResources() throws Exception { + void resources() throws Exception { loadBeanDefinitions("mvc-config-resources.xml"); HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class); @@ -414,7 +414,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testUseDeprecatedPathMatcher() throws Exception { + void useDeprecatedPathMatcher() throws Exception { loadBeanDefinitions("mvc-config-deprecated-path-matcher.xml"); Map handlerMappings = appContext.getBeansOfType(AbstractHandlerMapping.class); AntPathMatcher mvcPathMatcher = appContext.getBean("pathMatcher", AntPathMatcher.class); @@ -427,7 +427,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testUsePathPatternParser() throws Exception { + void usePathPatternParser() throws Exception { loadBeanDefinitions("mvc-config-custom-pattern-parser.xml"); PathPatternParser patternParser = appContext.getBean("patternParser", PathPatternParser.class); @@ -440,7 +440,7 @@ public class MvcNamespaceTests { } @Test - void testResourcesWithOptionalAttributes() { + void resourcesWithOptionalAttributes() { loadBeanDefinitions("mvc-config-resources-optional-attrs.xml"); SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class); @@ -456,7 +456,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testResourcesWithResolversTransformers() { + void resourcesWithResolversTransformers() { loadBeanDefinitions("mvc-config-resources-chain.xml"); SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class); @@ -501,7 +501,7 @@ public class MvcNamespaceTests { } @Test - void testResourcesWithResolversTransformersCustom() { + void resourcesWithResolversTransformersCustom() { loadBeanDefinitions("mvc-config-resources-chain-no-auto.xml"); SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class); @@ -533,7 +533,7 @@ public class MvcNamespaceTests { } @Test - void testDefaultServletHandler() throws Exception { + void defaultServletHandler() throws Exception { loadBeanDefinitions("mvc-config-default-servlet.xml"); HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class); @@ -559,7 +559,7 @@ public class MvcNamespaceTests { } @Test - void testDefaultServletHandlerWithOptionalAttributes() throws Exception { + void defaultServletHandlerWithOptionalAttributes() throws Exception { loadBeanDefinitions("mvc-config-default-servlet-optional-attrs.xml"); HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class); @@ -585,7 +585,7 @@ public class MvcNamespaceTests { } @Test - void testBeanDecoration() throws Exception { + void beanDecoration() throws Exception { loadBeanDefinitions("mvc-config-bean-decoration.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -604,7 +604,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testViewControllers() throws Exception { + void viewControllers() throws Exception { loadBeanDefinitions("mvc-config-view-controllers.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -684,7 +684,7 @@ public class MvcNamespaceTests { /** WebSphere gives trailing servlet path slashes by default!! */ @Test - void testViewControllersOnWebSphere() throws Exception { + void viewControllersOnWebSphere() throws Exception { loadBeanDefinitions("mvc-config-view-controllers.xml"); SimpleUrlHandlerMapping mapping2 = appContext.getBean(SimpleUrlHandlerMapping.class); @@ -726,7 +726,7 @@ public class MvcNamespaceTests { } @Test - void testViewControllersDefaultConfig() { + void viewControllersDefaultConfig() { loadBeanDefinitions("mvc-config-view-controllers-minimal.xml"); SimpleUrlHandlerMapping hm = this.appContext.getBean(SimpleUrlHandlerMapping.class); @@ -749,7 +749,7 @@ public class MvcNamespaceTests { } @Test - void testContentNegotiationManager() throws Exception { + void contentNegotiationManager() throws Exception { loadBeanDefinitions("mvc-config-content-negotiation-manager.xml"); RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -774,7 +774,7 @@ public class MvcNamespaceTests { } @Test - void testAsyncSupportOptions() { + void asyncSupportOptions() { loadBeanDefinitions("mvc-config-async-support.xml"); RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class); @@ -794,7 +794,7 @@ public class MvcNamespaceTests { } @Test - void testViewResolution() { + void viewResolution() { loadBeanDefinitions("mvc-config-view-resolution.xml"); ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); @@ -859,7 +859,7 @@ public class MvcNamespaceTests { } @Test - void testViewResolutionWithContentNegotiation() { + void viewResolutionWithContentNegotiation() { loadBeanDefinitions("mvc-config-view-resolution-content-negotiation.xml"); ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); @@ -883,7 +883,7 @@ public class MvcNamespaceTests { } @Test - void testViewResolutionWithOrderSet() { + void viewResolutionWithOrderSet() { loadBeanDefinitions("mvc-config-view-resolution-custom-order.xml"); ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); @@ -894,7 +894,7 @@ public class MvcNamespaceTests { @Test @SuppressWarnings("removal") - void testPathMatchingHandlerMappings() { + void pathMatchingHandlerMappings() { loadBeanDefinitions("mvc-config-path-matching-mappings.xml"); RequestMappingHandlerMapping requestMapping = appContext.getBean(RequestMappingHandlerMapping.class); @@ -915,7 +915,7 @@ public class MvcNamespaceTests { } @Test - void testCorsMinimal() { + void corsMinimal() { loadBeanDefinitions("mvc-config-cors-minimal.xml"); String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class); @@ -940,7 +940,7 @@ public class MvcNamespaceTests { } @Test - void testCors() { + void cors() { loadBeanDefinitions("mvc-config-cors.xml"); String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java index 3b633c6b5a8..5f32bee65df 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java @@ -95,7 +95,7 @@ class DefaultServletHandlerConfigurerTests { } @Test // gh-30113 - public void handleIncludeRequest() throws Exception { + void handleIncludeRequest() throws Exception { configurer.enable(); SimpleUrlHandlerMapping mapping = configurer.buildHandlerMapping(); HttpRequestHandler handler = (DefaultServletHttpRequestHandler) mapping.getUrlMap().get("/**"); 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 285c2f7d547..698bf33e186 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 @@ -198,7 +198,7 @@ public class DelegatingWebMvcConfigurationTests { } @Test - public void addErrorResponseInterceptors() { + void addErrorResponseInterceptors() { ErrorResponse.Interceptor interceptor = (detail, errorResponse) -> {}; WebMvcConfigurer configurer = new WebMvcConfigurer() { @Override @@ -227,7 +227,7 @@ public class DelegatingWebMvcConfigurationTests { @SuppressWarnings("removal") @Test - public void configurePathMatcher() { + void configurePathMatcher() { PathMatcher pathMatcher = mock(); UrlPathHelper pathHelper = mock(); 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 14e9effe2e5..64cc84c60d3 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 @@ -145,7 +145,7 @@ public class InterceptorRegistryTests { } @Test // SPR-11130 - public void addInterceptorWithExcludePathPatternOnly() { + void addInterceptorWithExcludePathPatternOnly() { this.registry.addInterceptor(this.interceptor1).excludePathPatterns("/path1/secret"); this.registry.addInterceptor(this.interceptor2).addPathPatterns("/path2"); 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 7fd1a9ed6c4..24f5f5c99ba 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 @@ -263,7 +263,7 @@ class WebMvcConfigurationSupportExtensionTests { } @Test - public void contentNegotiation() throws Exception { + void contentNegotiation() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo"); NativeWebRequest webRequest = new ServletWebRequest(request); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index a070b99b53a..a28d822ac27 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -245,7 +245,7 @@ class WebMvcConfigurationSupportTests { @Test @SuppressWarnings("unchecked") - public void handlerExceptionResolver() { + void handlerExceptionResolver() { ApplicationContext context = initContext(WebConfig.class); HandlerExceptionResolverComposite compositeResolver = context.getBean("handlerExceptionResolver", HandlerExceptionResolverComposite.class); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java index fc3f5c60db5..668407d0214 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java @@ -117,7 +117,7 @@ public class HandlerMethodMappingTests { } @Test // gh-26490 - public void ambiguousMatchOnPreFlightRequestWithoutCorsConfig() throws Exception { + void ambiguousMatchOnPreFlightRequestWithoutCorsConfig() throws Exception { this.mapping.registerMapping("/foo", this.handler, this.method1); this.mapping.registerMapping("/f??", this.handler, this.method2); @@ -141,7 +141,7 @@ public class HandlerMethodMappingTests { } @Test // gh-26490 - public void ambiguousMatchOnPreFlightRequestWithCorsConfig() throws Exception { + void ambiguousMatchOnPreFlightRequestWithCorsConfig() throws Exception { this.mapping.registerMapping("/f?o", this.handler, this.method1); this.mapping.registerMapping("/fo?", this.handler, this.handler.getClass().getMethod("corsHandlerMethod")); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java index c5d7508a464..93feb9ab00e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java @@ -111,7 +111,7 @@ class ResponseStatusExceptionResolverTests { } @Test // SPR-12903 - public void nestedException() { + void nestedException() { Exception cause = new StatusCodeAndReasonMessageException(); TypeMismatchException ex = new TypeMismatchException("value", ITestBean.class, cause); ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex); @@ -126,7 +126,7 @@ class ResponseStatusExceptionResolverTests { } @Test // SPR-15524 - public void responseStatusExceptionWithReason() { + void responseStatusExceptionWithReason() { ResponseStatusException ex = new ResponseStatusException(HttpStatus.BAD_REQUEST, "The reason"); ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex); assertResolved(mav, 400, "The reason"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java index f3105379e61..fb70774c2f1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java @@ -89,7 +89,7 @@ class ConsumesRequestConditionTests { } @Test // gh-28024 - public void matchWithParameters() { + void matchWithParameters() { String base = "application/hal+json"; ConsumesRequestCondition condition = new ConsumesRequestCondition(base + ";profile=\"a\""); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -134,7 +134,7 @@ class ConsumesRequestConditionTests { } @Test // gh-22010 - public void consumesNoContent() { + void consumesNoContent() { ConsumesRequestCondition condition = new ConsumesRequestCondition("text/plain"); condition.setBodyRequired(false); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java index a15f8e6e9a6..b8f9a873480 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java @@ -131,7 +131,7 @@ class HeadersRequestConditionTests { } @Test // SPR-16674 - public void compareToWithMoreSpecificMatchByValue() { + void compareToWithMoreSpecificMatchByValue() { MockHttpServletRequest request = new MockHttpServletRequest(); HeadersRequestCondition condition1 = new HeadersRequestCondition("foo=a"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java index 1dafc9a0f26..5d8f38e7a3c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java @@ -95,7 +95,7 @@ class ProducesRequestConditionTests { } @Test // gh-21670 - public void matchWithParameters() { + void matchWithParameters() { String base = "application/atom+xml"; ProducesRequestCondition condition = new ProducesRequestCondition(base + ";type=feed"); HttpServletRequest request = createRequest(base + ";type=entry"); @@ -141,7 +141,7 @@ class ProducesRequestConditionTests { } @Test // SPR-17550 - public void matchWithNegationAndMediaTypeAllWithQualityParameter() { + void matchWithNegationAndMediaTypeAllWithQualityParameter() { ProducesRequestCondition condition = new ProducesRequestCondition("!application/json"); HttpServletRequest request = createRequest( "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"); @@ -150,7 +150,7 @@ class ProducesRequestConditionTests { } @Test // gh-22853 - public void matchAndCompare() { + void matchAndCompare() { ContentNegotiationManager manager = new ContentNegotiationManager( new HeaderContentNegotiationStrategy(), new FixedContentNegotiationStrategy(MediaType.TEXT_HTML)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java index 98a673de503..681fd253af2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java @@ -85,7 +85,7 @@ class RequestMethodsRequestConditionTests { } @Test // SPR-14410 - public void getMatchingConditionWithHttpOptionsInErrorDispatch() { + void getMatchingConditionWithHttpOptionsInErrorDispatch() { MockHttpServletRequest request = new MockHttpServletRequest("OPTIONS", "/path"); request.setDispatcherType(DispatcherType.ERROR); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java index 52d2435e7c2..34ce91fa1e1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java @@ -63,7 +63,7 @@ class DeferredResultReturnValueHandlerTests { @Test - public void supportsReturnType() throws Exception { + void supportsReturnType() throws Exception { assertThat(this.handler.supportsReturnType( on(TestController.class).resolveReturnType(DeferredResult.class, String.class))).isTrue(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java index 90e31d37f39..27e63f1ef8f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java @@ -117,7 +117,7 @@ public class HttpEntityMethodProcessorTests { } @Test // SPR-12861 - public void resolveArgumentWithEmptyBody() throws Exception { + void resolveArgumentWithEmptyBody() throws Exception { this.servletRequest.setContent(new byte[0]); this.servletRequest.setContentType("application/json"); @@ -196,7 +196,7 @@ public class HttpEntityMethodProcessorTests { } @Test // SPR-12811 - public void jacksonTypeInfoList() throws Exception { + void jacksonTypeInfoList() throws Exception { Method method = JacksonController.class.getMethod("handleList"); HandlerMethod handlerMethod = new HandlerMethod(new JacksonController(), method); MethodParameter methodReturnType = handlerMethod.getReturnType(); @@ -214,7 +214,7 @@ public class HttpEntityMethodProcessorTests { } @Test // SPR-13423 - public void handleReturnValueCharSequence() throws Exception { + void handleReturnValueCharSequence() throws Exception { List>converters = new ArrayList<>(); converters.add(new ByteArrayHttpMessageConverter()); converters.add(new StringHttpMessageConverter()); @@ -231,7 +231,7 @@ public class HttpEntityMethodProcessorTests { } @Test // SPR-13423 - public void handleReturnValueWithETagAndETagFilter() throws Exception { + void handleReturnValueWithETagAndETagFilter() throws Exception { String eTagValue = "\"deadb33f8badf00d\""; String content = "body"; @@ -265,7 +265,7 @@ public class HttpEntityMethodProcessorTests { } @Test // gh-24539 - public void handleReturnValueWithMalformedAcceptHeader() throws Exception { + void handleReturnValueWithMalformedAcceptHeader() throws Exception { webRequest.getNativeRequest(MockHttpServletRequest.class).addHeader("Accept", "null"); List>converters = new ArrayList<>(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java index af78c51f3d2..496192a9a74 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java @@ -169,7 +169,7 @@ class ModelAndViewMethodReturnValueHandlerTests { } @Test // SPR-14045 - public void handleRedirectWithIgnoreDefaultModel() throws Exception { + void handleRedirectWithIgnoreDefaultModel() throws Exception { RedirectView redirectView = new RedirectView(); ModelAndView mav = new ModelAndView(redirectView, "name", "value"); handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java index a52bcb94c5b..3467a5f9f03 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java @@ -252,14 +252,14 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-12977 - public void fromMethodNameWithBridgedMethod() { + void fromMethodNameWithBridgedMethod() { UriComponents uriComponents = fromMethodName(PersonCrudController.class, "get", (long) 42).build(); assertThat(uriComponents.toUriString()).isEqualTo("http://localhost/42"); } @Test // SPR-11391 - public void fromMethodNameTypeLevelPathVariableWithoutArgumentValue() { + void fromMethodNameTypeLevelPathVariableWithoutArgumentValue() { UriComponents uriComponents = fromMethodName(UserContactController.class, "showCreate", 123).build(); assertThat(uriComponents.getPath()).isEqualTo("/user/123/contacts/create"); @@ -273,7 +273,7 @@ public class MvcUriComponentsBuilderTests { } @Test // gh-29897 - public void fromMethodNameInUnmappedControllerMethod() { + void fromMethodNameInUnmappedControllerMethod() { UriComponents uriComponents = fromMethodName(UnmappedControllerMethod.class, "getMethod").build(); assertThat(uriComponents.toUriString()).isEqualTo("http://localhost/path"); @@ -301,7 +301,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-14405 - public void fromMethodNameWithOptionalParam() { + void fromMethodNameWithOptionalParam() { UriComponents uriComponents = fromMethodName(ControllerWithMethods.class, "methodWithOptionalParam", new Object[] {null}).build(); @@ -309,7 +309,7 @@ public class MvcUriComponentsBuilderTests { } @Test // gh-22656 - public void fromMethodNameWithOptionalNamedParam() { + void fromMethodNameWithOptionalNamedParam() { UriComponents uriComponents = fromMethodName(ControllerWithMethods.class, "methodWithOptionalNamedParam", Optional.of("foo")).build(); @@ -458,7 +458,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-16710 - public void fromMethodCallWithModelAndViewReturnType() { + void fromMethodCallWithModelAndViewReturnType() { UriComponents uriComponents = fromMethodCall( on(BookingControllerWithModelAndView.class).getBooking(21L)).buildAndExpand(42); @@ -466,7 +466,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-16710 - public void fromMethodCallWithObjectReturnType() { + void fromMethodCallWithObjectReturnType() { UriComponents uriComponents = fromMethodCall( on(BookingControllerWithObject.class).getBooking(21L)).buildAndExpand(42); @@ -474,7 +474,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-16710 - public void fromMethodCallWithStringReturnType() { + void fromMethodCallWithStringReturnType() { assertThatIllegalStateException().isThrownBy(() -> { UriComponents uriComponents = fromMethodCall( on(BookingControllerWithString.class).getBooking(21L)).buildAndExpand(42); @@ -483,7 +483,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-16710 - public void fromMethodNameWithStringReturnType() { + void fromMethodNameWithStringReturnType() { UriComponents uriComponents = fromMethodName( BookingControllerWithString.class, "getBooking", 21L).buildAndExpand(42); @@ -491,7 +491,7 @@ public class MvcUriComponentsBuilderTests { } @Test // gh-30210 - public void fromMethodCallWithCharSequenceReturnType() { + void fromMethodCallWithCharSequenceReturnType() { UriComponents uriComponents = fromMethodCall( on(BookingControllerWithCharSequence.class).getBooking(21L)).buildAndExpand(42); @@ -499,7 +499,7 @@ public class MvcUriComponentsBuilderTests { } @Test // gh-30210 - public void fromMethodCallWithJdbc30115ReturnType() { + void fromMethodCallWithJdbc30115ReturnType() { UriComponents uriComponents = fromMethodCall( on(BookingControllerWithJdbcSavepoint.class).getBooking(21L)).buildAndExpand(42); @@ -530,7 +530,7 @@ public class MvcUriComponentsBuilderTests { } @Test // SPR-17027 - public void fromMappingNameWithEncoding() { + void fromMappingNameWithEncoding() { initWebApplicationContext(WebConfig.class); this.request.setServerName("example.org"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java index 7f8a95e58c9..005d5426baa 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java @@ -89,7 +89,7 @@ class PathVariableMapMethodArgumentResolverTests { @Test @SuppressWarnings("unchecked") - public void resolveArgumentNoUriVars() throws Exception { + void resolveArgumentNoUriVars() throws Exception { Map map = (Map) resolver.resolveArgument(paramMap, mavContainer, webRequest, null); assertThat(map).isEqualTo(Collections.emptyMap()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java index 3a0a3744439..123168ca25e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java @@ -281,7 +281,7 @@ class RequestMappingHandlerAdapterTests { @Test // gh-15486 @SuppressWarnings("removal") // TODO Migrate from MappingJackson2HttpMessageConverter and MappingJacksonValue to JacksonJsonHttpMessageConverter. - public void responseBodyAdvice() throws Exception { + void responseBodyAdvice() throws Exception { List> converters = new ArrayList<>(); converters.add(new MappingJackson2HttpMessageConverter()); this.handlerAdapter.setMessageConverters(converters); @@ -301,7 +301,7 @@ class RequestMappingHandlerAdapterTests { } @Test // gh-30522 - public void responseBodyAdviceWithEmptyBody() throws Exception { + void responseBodyAdviceWithEmptyBody() throws Exception { this.webAppContext.registerBean("rba", EmptyBodyAdvice.class); this.webAppContext.refresh(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java index 1282eccaa51..bc781962083 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java @@ -203,7 +203,7 @@ class ResponseEntityExceptionHandlerTests { } @Test // gh-30300 - public void reasonAsDetailShouldBeUpdatedViaMessageSource() { + void reasonAsDetailShouldBeUpdatedViaMessageSource() { Locale locale = Locale.UK; LocaleContextHolder.setLocale(locale); @@ -261,7 +261,7 @@ class ResponseEntityExceptionHandlerTests { } @Test - public void httpMessageNotReadable() { + void httpMessageNotReadable() { testException(new HttpMessageNotReadableException("message", new MockHttpInputMessage(new byte[0]))); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 6b9e18651a7..6d4366d1cad 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -1563,7 +1563,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl } @PathPatternsParameterizedTest - void testMatchWithoutMethodLevelPath(boolean usePathPatterns) throws Exception { + void matchWithoutMethodLevelPath(boolean usePathPatterns) throws Exception { initDispatcherServlet(NoPathGetAndM2PostController.class, usePathPatterns); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/t1/m2"); @@ -1573,7 +1573,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl } @PathPatternsParameterizedTest // SPR-8536 - void testHeadersCondition(boolean usePathPatterns) throws Exception { + void headersCondition(boolean usePathPatterns) throws Exception { initDispatcherServlet(HeadersConditionController.class, usePathPatterns); // No "Accept" header diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java index 4f021299fc9..d1da8862f9a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java @@ -80,7 +80,7 @@ class ServletCookieValueMethodArgumentResolverTests { } @Test // gh-26989 - public void resolveCookieWithEncodingTurnedOff() throws Exception { + void resolveCookieWithEncodingTurnedOff() throws Exception { Cookie cookie = new Cookie("name", "Tl=Q/0AUSOx[n)2z4(t]20FZv#?[Ge%H"); request.setCookies(cookie); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java index 7d6dec7b6b9..53144478e17 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java @@ -175,7 +175,7 @@ class ServletInvocableHandlerMethodTests { } @Test // SPR-9159 - public void invokeAndHandle_NotVoidWithResponseStatusAndReason() throws Exception { + void invokeAndHandle_NotVoidWithResponseStatusAndReason() throws Exception { ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new Handler(), "responseStatusWithReason"); handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer); @@ -218,7 +218,7 @@ class ServletInvocableHandlerMethodTests { } @Test // gh-23775, gh-24635 - public void invokeAndHandle_ETagFilterHasNoImpactWhenETagPresent() throws Exception { + void invokeAndHandle_ETagFilterHasNoImpactWhenETagPresent() throws Exception { String eTagValue = "\"deadb33f8badf00d\""; @@ -326,7 +326,7 @@ class ServletInvocableHandlerMethodTests { } @Test // SPR-12287 - public void wrapConcurrentResult_ResponseEntityNullBody() throws Exception { + void wrapConcurrentResult_ResponseEntityNullBody() throws Exception { this.returnValueHandlers.addHandler(new HttpEntityMethodProcessor(this.converters)); ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new ResponseEntityHandler(), "handleDeferred"); handlerMethod = handlerMethod.wrapConcurrentResult(new ResponseEntity<>(HttpStatus.OK)); @@ -390,7 +390,7 @@ class ServletInvocableHandlerMethodTests { } @Test // SPR-15478 - public void wrapConcurrentResult_CollectedValuesListWithResponseEntity() throws Exception { + void wrapConcurrentResult_CollectedValuesListWithResponseEntity() throws Exception { List> converters = Collections.singletonList(new JacksonJsonHttpMessageConverter()); ResolvableType elementType = ResolvableType.forClass(Bar.class); ReactiveTypeHandler.CollectedValuesList result = new ReactiveTypeHandler.CollectedValuesList(elementType); @@ -408,7 +408,7 @@ class ServletInvocableHandlerMethodTests { } @Test // SPR-12287 (16/Oct/14 comments) - public void responseEntityRawTypeWithNullBody() throws Exception { + void responseEntityRawTypeWithNullBody() throws Exception { this.returnValueHandlers.addHandler(new HttpEntityMethodProcessor(this.converters)); ServletInvocableHandlerMethod handlerMethod = getHandlerMethod(new ResponseEntityHandler(), "handleRawType"); handlerMethod.invokeAndHandle(this.webRequest, this.mavContainer); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessorTests.java index 992d5baed86..7313f67e20e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessorTests.java @@ -108,7 +108,7 @@ class ServletModelAttributeMethodProcessorTests { @Test @SuppressWarnings("unchecked") - public void createAttributeUriTemplateVarWithOptional() throws Exception { + void createAttributeUriTemplateVarWithOptional() throws Exception { Map uriTemplateVars = new HashMap<>(); uriTemplateVars.put("testBean3", "Patty"); request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVars); @@ -143,7 +143,7 @@ class ServletModelAttributeMethodProcessorTests { @Test @SuppressWarnings("unchecked") - public void createAttributeRequestParameterWithOptional() throws Exception { + void createAttributeRequestParameterWithOptional() throws Exception { request.addParameter("testBean3", "Patty"); Optional testBean = (Optional) processor.resolveArgument( @@ -154,7 +154,7 @@ class ServletModelAttributeMethodProcessorTests { @Test @SuppressWarnings("unchecked") - public void attributesAsNullValues() throws Exception { + void attributesAsNullValues() throws Exception { request.addParameter("name", "Patty"); mavContainer.getModel().put("testBean1", null); @@ -174,7 +174,7 @@ class ServletModelAttributeMethodProcessorTests { @Test @SuppressWarnings("unchecked") - public void attributesAsOptionalEmpty() throws Exception { + void attributesAsOptionalEmpty() throws Exception { request.addParameter("name", "Patty"); mavContainer.getModel().put("testBean1", Optional.empty()); 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 176f5e5ae32..1cc6970f871 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 @@ -127,7 +127,7 @@ class ServletRequestMethodArgumentResolverTests { } @Test // gh-25780 - public void annotatedPrincipal() throws Exception { + void annotatedPrincipal() throws Exception { Principal principal = () -> "Foo"; servletRequest.setUserPrincipal(principal); Method principalMethod = getClass().getMethod("supportedParamsWithAnnotatedPrincipal", Principal.class); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java index 049cbe6ad8f..15e689d58e3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java @@ -72,7 +72,7 @@ class ServletResponseMethodArgumentResolverTests { } @Test // SPR-8983 - public void servletResponseNoMavContainer() throws Exception { + void servletResponseNoMavContainer() throws Exception { MethodParameter servletResponseParameter = new MethodParameter(method, 0); assertThat(resolver.supportsParameter(servletResponseParameter)).as("ServletResponse not supported").isTrue(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java index bfd81a23867..d26fbab1b56 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java @@ -154,7 +154,7 @@ class DefaultHandlerExceptionResolverTests { } @Test - public void handleHttpMessageNotReadable() { + void handleHttpMessageNotReadable() { HttpMessageNotReadableException ex = new HttpMessageNotReadableException("foo", new MockHttpInputMessage(new byte[0])); ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex); assertThat(mav).as("No ModelAndView returned").isNotNull(); @@ -230,7 +230,7 @@ class DefaultHandlerExceptionResolverTests { } @Test // SPR-14669 - public void handleAsyncRequestTimeoutException() { + void handleAsyncRequestTimeoutException() { Exception ex = new AsyncRequestTimeoutException(); ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex); assertThat(mav).as("No ModelAndView returned").isNotNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java index 95d46e596a0..0bb28713ea6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java @@ -124,7 +124,7 @@ public class EncodedResourceResolverTests { } @Test // SPR-13149 - public void resolveWithNullRequest() { + void resolveWithNullRequest() { String file = "js/foo.js"; Resource resolved = this.resolver.resolveResource(null, file, this.locations); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java index 35ecffcb775..7bf36d1b054 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java @@ -67,7 +67,7 @@ class FixedVersionStrategyTests { } @Test // SPR-13727 - public void addVersionRelativePath() { + void addVersionRelativePath() { String relativePath = "../" + PATH; assertThat(this.strategy.addVersion(relativePath, VERSION)).isEqualTo(relativePath); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java index a147b0bd921..09812c8ecd0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java @@ -66,30 +66,30 @@ class PathResourceResolverTests { @Test void checkResource() { Resource location = new ClassPathResource("test/", PathResourceResolver.class); - testCheckResource(location, "../testsecret/secret.txt"); - testCheckResource(location, "test/../../testsecret/secret.txt"); + checkResource(location, "../testsecret/secret.txt"); + checkResource(location, "test/../../testsecret/secret.txt"); location = new UrlResource(getClass().getResource("./test/")); String secretPath = new UrlResource(getClass().getResource("testsecret/secret.txt")).getURL().getPath(); - testCheckResource(location, "file:" + secretPath); - testCheckResource(location, "/file:" + secretPath); - testCheckResource(location, "/" + secretPath); - testCheckResource(location, "////../.." + secretPath); - testCheckResource(location, "/%2E%2E/testsecret/secret.txt"); - testCheckResource(location, "/%2e%2e/testsecret/secret.txt"); - testCheckResource(location, " " + secretPath); - testCheckResource(location, "/ " + secretPath); - testCheckResource(location, "url:" + secretPath); + checkResource(location, "file:" + secretPath); + checkResource(location, "/file:" + secretPath); + checkResource(location, "/" + secretPath); + checkResource(location, "////../.." + secretPath); + checkResource(location, "/%2E%2E/testsecret/secret.txt"); + checkResource(location, "/%2e%2e/testsecret/secret.txt"); + checkResource(location, " " + secretPath); + checkResource(location, "/ " + secretPath); + checkResource(location, "url:" + secretPath); } - private void testCheckResource(Resource location, String requestPath) { + private void checkResource(Resource location, String requestPath) { List locations = Collections.singletonList(location); Resource actual = this.resolver.resolveResource(null, requestPath, locations, null); assertThat(actual).isNull(); } @Test // gh-23463 - public void ignoreInvalidEscapeSequence() throws IOException { + void ignoreInvalidEscapeSequence() throws IOException { UrlResource location = new UrlResource(getClass().getResource("./test/")); Resource resource = new UrlResource(location.getURL() + "test%file.txt"); @@ -113,7 +113,7 @@ class PathResourceResolverTests { } @Test // SPR-12432 - public void checkServletContextResource() throws Exception { + void checkServletContextResource() throws Exception { Resource classpathLocation = new ClassPathResource("test/", PathResourceResolver.class); MockServletContext context = new MockServletContext(); @@ -125,7 +125,7 @@ class PathResourceResolverTests { } @Test // SPR-12624 - public void checkRelativeLocation() throws Exception { + void checkRelativeLocation() throws Exception { String location= new UrlResource(getClass().getResource("./test/")).getURL().toExternalForm(); location = location.replace("/test/org/springframework","/test/org/../org/springframework"); @@ -136,13 +136,13 @@ class PathResourceResolverTests { } @Test // SPR-12747 - public void checkFileLocation() throws Exception { + void checkFileLocation() throws Exception { Resource resource = getResource("main.css"); assertThat(this.resolver.checkResource(resource, resource)).isTrue(); } @Test // SPR-13241 - public void resolvePathRootResource() { + void resolvePathRootResource() { Resource webjarsLocation = new ClassPathResource("/META-INF/resources/webjars/", PathResourceResolver.class); String path = this.resolver.resolveUrlPathInternal("", Collections.singletonList(webjarsLocation), null); 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 eeae66ae5f5..fcf135cdb44 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 @@ -190,7 +190,7 @@ class ResourceHttpRequestHandlerTests { } @Test - void testResourceNotFound() { + void resourceNotFound() { for (HttpMethod method : HttpMethod.values()) { this.request = new MockHttpServletRequest("GET", ""); this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "not-there.css"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java index 93c7365da59..74d496f3ad1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java @@ -104,7 +104,7 @@ class ResourceUrlEncodingFilterTests { } @Test // SPR-13757 - public void encodeContextPathUrlWithoutSuffix() throws Exception { + void encodeContextPathUrlWithoutSuffix() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context"); request.setContextPath("/context"); @@ -122,7 +122,7 @@ class ResourceUrlEncodingFilterTests { } @Test // SPR-13018 - public void encodeEmptyUrlWithContext() throws Exception { + void encodeEmptyUrlWithContext() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/foo"); request.setContextPath("/context"); @@ -130,7 +130,7 @@ class ResourceUrlEncodingFilterTests { } @Test // SPR-13374 - public void encodeUrlWithRequestParams() throws Exception { + void encodeUrlWithRequestParams() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo"); request.setContextPath("/"); @@ -139,7 +139,7 @@ class ResourceUrlEncodingFilterTests { } @Test // SPR-13847 - public void encodeUrlPreventStringOutOfBounds() throws Exception { + void encodeUrlPreventStringOutOfBounds() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context-path/index"); request.setContextPath("/context-path"); request.setServletPath(""); @@ -148,7 +148,7 @@ class ResourceUrlEncodingFilterTests { } @Test // SPR-17535 - public void encodeUrlWithFragment() throws Exception { + void encodeUrlWithFragment() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo"); request.setContextPath("/"); @@ -161,7 +161,7 @@ class ResourceUrlEncodingFilterTests { } @Test // gh-23508 - public void invalidLookupPath() throws Exception { + void invalidLookupPath() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRequestURI("/a/b/../logo.png"); request.setServletPath("/a/logo.png"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java index eeb270aca8c..dd1f94941ea 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java @@ -108,7 +108,7 @@ class ResourceUrlProviderJavaConfigTests { static class WebConfig extends WebMvcConfigurationSupport { @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { + protected void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/resources/**") .addResourceLocations("classpath:org/springframework/web/servlet/resource/test/") .resourceChain(true).addResolver(new VersionResourceResolver().addContentVersionStrategy("/**")); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java index 78d6f2c3950..e529e942bcd 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java @@ -67,7 +67,7 @@ class FlashMapManagerTests { } @Test // SPR-8779 - public void retrieveAndUpdateMatchByOriginatingPath() { + void retrieveAndUpdateMatchByOriginatingPath() { FlashMap flashMap = new FlashMap(); flashMap.put("key", "value"); flashMap.setTargetRequestPath("/accounts"); @@ -125,7 +125,7 @@ class FlashMapManagerTests { } @Test // SPR-8798 - public void retrieveAndUpdateMatchWithMultiValueParam() { + void retrieveAndUpdateMatchWithMultiValueParam() { FlashMap flashMap = new FlashMap(); flashMap.put("name", "value"); flashMap.addTargetRequestParam("id", "1"); @@ -255,7 +255,7 @@ class FlashMapManagerTests { } @Test // gh-23240 - public void saveOutputFlashMapAndNormalizeEmptyTargetPath() { + void saveOutputFlashMapAndNormalizeEmptyTargetPath() { FlashMap flashMap = new FlashMap(); flashMap.put("key", "value"); @@ -266,7 +266,7 @@ class FlashMapManagerTests { } @Test // SPR-9657, SPR-11504 - public void saveOutputFlashMapDecodeParameters() { + void saveOutputFlashMapDecodeParameters() { FlashMap flashMap = new FlashMap(); flashMap.put("key", "value"); flashMap.setTargetRequestPath("/path"); @@ -293,7 +293,7 @@ class FlashMapManagerTests { } @Test // SPR-12569 - public void flashAttributesWithQueryParamsWithSpace() { + void flashAttributesWithQueryParamsWithSpace() { String encodedValue = URLEncoder.encode("1 2", StandardCharsets.UTF_8); FlashMap flashMap = new FlashMap(); @@ -315,7 +315,7 @@ class FlashMapManagerTests { } @Test // SPR-15505 - public void retrieveAndUpdateMatchByOriginatingPathAndQueryString() { + void retrieveAndUpdateMatchByOriginatingPathAndQueryString() { FlashMap flashMap = new FlashMap(); flashMap.put("key", "value"); flashMap.setTargetRequestPath("/accounts"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java index b888580fc30..d772f3e5358 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java @@ -53,14 +53,14 @@ class RequestContextTests { } @Test - void testGetContextUrl() { + void getContextUrl() { request.setContextPath("foo/"); RequestContext context = new RequestContext(request, response, servletContext, model); assertThat(context.getContextUrl("bar")).isEqualTo("foo/bar"); } @Test - void testGetContextUrlWithMap() { + void getContextUrlWithMap() { request.setContextPath("foo/"); RequestContext context = new RequestContext(request, response, servletContext, model); Map map = new HashMap<>(); @@ -70,7 +70,7 @@ class RequestContextTests { } @Test - void testGetContextUrlWithMapEscaping() { + void getContextUrlWithMapEscaping() { request.setContextPath("foo/"); RequestContext context = new RequestContext(request, response, servletContext, model); Map map = new HashMap<>(); @@ -80,7 +80,7 @@ class RequestContextTests { } @Test - void testPathToServlet() { + void pathToServlet() { request.setContextPath("/app"); request.setServletPath("/servlet"); RequestContext context = new RequestContext(request, response, servletContext, model); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java index 7476a3d285b..2c981e47fad 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java @@ -109,7 +109,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-16650 - public void fromRequestWithForwardedPrefix() throws Exception { + void fromRequestWithForwardedPrefix() throws Exception { this.request.addHeader("X-Forwarded-Prefix", "/prefix"); this.request.setContextPath("/mvc-showcase"); this.request.setRequestURI("/mvc-showcase/bar"); @@ -121,7 +121,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-16650 - public void fromRequestWithForwardedPrefixTrailingSlash() throws Exception { + void fromRequestWithForwardedPrefixTrailingSlash() throws Exception { this.request.addHeader("X-Forwarded-Prefix", "/foo/"); this.request.setContextPath("/spring-mvc-showcase"); this.request.setRequestURI("/spring-mvc-showcase/bar"); @@ -133,7 +133,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-16650 - public void fromRequestWithForwardedPrefixRoot() throws Exception { + void fromRequestWithForwardedPrefixRoot() throws Exception { this.request.addHeader("X-Forwarded-Prefix", "/"); this.request.setContextPath("/mvc-showcase"); this.request.setRequestURI("/mvc-showcase/bar"); @@ -153,7 +153,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-16650 - public void fromContextPathWithForwardedPrefix() throws Exception { + void fromContextPathWithForwardedPrefix() throws Exception { this.request.addHeader("X-Forwarded-Prefix", "/prefix"); this.request.setContextPath("/mvc-showcase"); this.request.setRequestURI("/mvc-showcase/simple"); @@ -174,7 +174,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-16650 - public void fromServletMappingWithForwardedPrefix() throws Exception { + void fromServletMappingWithForwardedPrefix() throws Exception { this.request.addHeader("X-Forwarded-Prefix", "/prefix"); this.request.setContextPath("/mvc-showcase"); this.request.setServletPath("/app"); @@ -201,7 +201,7 @@ class ServletUriComponentsBuilderTests { } @Test // SPR-10272 - public void pathExtension() { + void pathExtension() { this.request.setRequestURI("/rest/books/6.json"); ServletUriComponentsBuilder builder = ServletUriComponentsBuilder.fromRequestUri(this.request); String extension = builder.removePathExtension(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java index f93c352a95f..048175698f8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java @@ -139,7 +139,7 @@ class EvalTagTests extends AbstractTagTests { } @Test // SPR-6923 - public void nestedPropertyWithAttributeName() throws Exception { + void nestedPropertyWithAttributeName() throws Exception { tag.setExpression("bean.bean"); tag.setVar("foo"); int action = tag.doStartTag(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index a07a6b065c3..9efac426627 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -42,7 +42,7 @@ class HtmlEscapeTagTests extends AbstractTagTests { tag.doStartTag(); HtmlEscapingAwareTag testTag = new HtmlEscapingAwareTag() { @Override - public int doStartTagInternal() { + protected int doStartTagInternal() { return EVAL_BODY_INCLUDE; } }; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index d10e318104f..2d494c8aad7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -415,7 +415,7 @@ class UrlTagTests extends AbstractTagTests { } @Test // SPR-11401 - public void replaceUriTemplateParamsTemplateWithPathSegment() throws JspException { + void replaceUriTemplateParamsTemplateWithPathSegment() throws JspException { List params = new ArrayList<>(); Set usedParams = new HashSet<>(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java index a7a7885d6ec..b358cf2dfe7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java @@ -58,7 +58,7 @@ class OptionTagEnumTests extends AbstractHtmlElementTagTests { @Test @SuppressWarnings("rawtypes") - public void withJavaEnum() throws Exception { + void withJavaEnum() throws Exception { GenericBean testBean = new GenericBean(); testBean.setCustomEnum(CustomEnum.VALUE_1); getPageContext().getRequest().setAttribute("testBean", testBean); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java index 077565edf00..52f5260447a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java @@ -77,7 +77,7 @@ class PasswordInputTagTests extends InputTagTests { @Test @Override - public void dynamicTypeAttribute() { + void dynamicTypeAttribute() { assertThatIllegalArgumentException() .isThrownBy(() -> getTag().setDynamicAttribute(null, "type", "email")) .withMessage("Attribute type=\"email\" is not allowed"); 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 503fb5713a5..f76bf5c9985 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 @@ -196,7 +196,7 @@ class RedirectViewTests { } @Test // SPR-13693 - public void remoteHost() { + void remoteHost() { RedirectView rv = new RedirectView(); assertThat(rv.isRemoteHost("https://url.somewhere.com")).isFalse(); @@ -211,7 +211,7 @@ class RedirectViewTests { } @Test // SPR-16752 - public void contextRelativeWithValidatedContextPath() throws Exception { + void contextRelativeWithValidatedContextPath() throws Exception { String url = "/myUrl"; this.request.setContextPath("//context"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java index 88439e716e4..3e4a906c5fd 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java @@ -51,7 +51,7 @@ class XlsViewTests { @Test - void testXls() throws Exception { + void xls() throws Exception { View excelView = new AbstractXlsView() { @Override protected void buildExcelDocument(Map model, Workbook workbook, @@ -74,7 +74,7 @@ class XlsViewTests { } @Test - void testXlsxView() throws Exception { + void xlsxView() throws Exception { View excelView = new AbstractXlsxView() { @Override protected void buildExcelDocument(Map model, Workbook workbook, @@ -97,7 +97,7 @@ class XlsViewTests { } @Test - void testXlsxStreamingView() throws Exception { + void xlsxStreamingView() throws Exception { View excelView = new AbstractXlsxStreamingView() { @Override protected void buildExcelDocument(Map model, Workbook workbook, diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index 4d7e10f00cf..0eda91a99a6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -66,7 +66,7 @@ class FreeMarkerConfigurerTests { @Test @SuppressWarnings("rawtypes") - public void freeMarkerConfigurerWithNonFileResourceLoaderPath() throws Exception { + void freeMarkerConfigurerWithNonFileResourceLoaderPath() throws Exception { freeMarkerConfigurer.setTemplateLoaderPath("file:/mydir"); Properties settings = new Properties(); settings.setProperty("localized_lookup", "false"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java index 625586aab46..d905ac92e29 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java @@ -91,7 +91,7 @@ public class FreeMarkerMacroTests { @Test - void testExposeSpringMacroHelpers() throws Exception { + void exposeSpringMacroHelpers() throws Exception { FreeMarkerView fv = new FreeMarkerView() { @Override @SuppressWarnings("rawtypes") @@ -114,7 +114,7 @@ public class FreeMarkerMacroTests { } @Test - void testSpringMacroRequestContextAttributeUsed() { + void springMacroRequestContextAttributeUsed() { final String helperTool = "wrongType"; FreeMarkerView fv = new FreeMarkerView() { @@ -139,89 +139,89 @@ public class FreeMarkerMacroTests { } @Test - void testName() throws Exception { + void name() throws Exception { assertThat(getMacroOutput("NAME")).isEqualTo("Darren"); } @Test - void testMessage() throws Exception { + void message() throws Exception { assertThat(getMacroOutput("MESSAGE")).isEqualTo("Howdy Mundo"); } @Test - void testDefaultMessage() throws Exception { + void defaultMessage() throws Exception { assertThat(getMacroOutput("DEFAULTMESSAGE")).isEqualTo("hi planet"); } @Test - void testMessageArgs() throws Exception { + void messageArgs() throws Exception { assertThat(getMacroOutput("MESSAGEARGS")).isEqualTo("Howdy[World]"); } @Test - void testMessageArgsWithDefaultMessage() throws Exception { + void messageArgsWithDefaultMessage() throws Exception { assertThat(getMacroOutput("MESSAGEARGSWITHDEFAULTMESSAGE")).isEqualTo("Hi"); } @Test - void testUrl() throws Exception { + void url() throws Exception { assertThat(getMacroOutput("URL")).isEqualTo("/springtest/aftercontext.html"); } @Test - void testUrlParams() throws Exception { + void urlParams() throws Exception { assertThat(getMacroOutput("URLPARAMS")).isEqualTo("/springtest/aftercontext/bar?spam=bucket"); } @Test - void testForm1() throws Exception { + void form1() throws Exception { assertThat(getMacroOutput("FORM1")).isEqualTo(""); } @Test - void testForm2() throws Exception { + void form2() throws Exception { assertThat(getMacroOutput("FORM2")).isEqualTo(""); } @Test - void testForm3() throws Exception { + void form3() throws Exception { assertThat(getMacroOutput("FORM3")).isEqualTo(""); } @Test - void testForm4() throws Exception { + void form4() throws Exception { assertThat(getMacroOutput("FORM4")).isEqualTo(""); } // TODO verify remaining output for forms 5, 6, 7, 8, and 14 (fix whitespace) @Test - void testForm9() throws Exception { + void form9() throws Exception { assertThat(getMacroOutput("FORM9")).isEqualTo(""); } @Test - void testForm10() throws Exception { + void form10() throws Exception { assertThat(getMacroOutput("FORM10")).isEqualTo(""); } @Test - void testForm11() throws Exception { + void form11() throws Exception { assertThat(getMacroOutput("FORM11")).isEqualTo(""); } @Test - void testForm12() throws Exception { + void form12() throws Exception { assertThat(getMacroOutput("FORM12")).isEqualTo(""); } @Test - void testForm13() throws Exception { + void form13() throws Exception { assertThat(getMacroOutput("FORM13")).isEqualTo(""); } @Test - void testForm15() throws Exception { + void form15() throws Exception { String output = getMacroOutput("FORM15"); assertThat(output).as("Wrong output: " + output) .startsWith(""); @@ -230,7 +230,7 @@ public class FreeMarkerMacroTests { } @Test - void testForm16() throws Exception { + void form16() throws Exception { String output = getMacroOutput("FORM16"); assertThat(output).as("Wrong output: " + output) .startsWith(""); @@ -239,12 +239,12 @@ public class FreeMarkerMacroTests { } @Test - void testForm17() throws Exception { + void form17() throws Exception { assertThat(getMacroOutput("FORM17")).isEqualTo(""); } @Test - void testForm18() throws Exception { + void form18() throws Exception { String output = getMacroOutput("FORM18"); assertThat(output).as("Wrong output: " + output) .startsWith(""); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java index 28e020151cd..0557d38d985 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java @@ -75,7 +75,7 @@ public class ScriptTemplateViewTests { @Test - public void missingTemplate() throws Exception { + void missingTemplate() throws Exception { MockServletContext servletContext = new MockServletContext(); this.wac.setServletContext(servletContext); this.wac.refresh(); @@ -88,14 +88,14 @@ public class ScriptTemplateViewTests { } @Test - public void missingScriptTemplateConfig() { + void missingScriptTemplateConfig() { assertThatExceptionOfType(ApplicationContextException.class).isThrownBy(() -> this.view.setApplicationContext(new StaticApplicationContext())) .withMessageContaining("ScriptTemplateConfig"); } @Test - public void detectScriptTemplateConfigWithEngine() { + void detectScriptTemplateConfigWithEngine() { InvocableScriptEngine engine = mock(InvocableScriptEngine.class); this.configurer.setEngine(engine); this.configurer.setRenderObject("Template"); @@ -115,7 +115,7 @@ public class ScriptTemplateViewTests { } @Test - public void detectScriptTemplateConfigWithEngineName() { + void detectScriptTemplateConfigWithEngineName() { this.configurer.setEngineName("jython"); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); @@ -131,7 +131,7 @@ public class ScriptTemplateViewTests { } @Test - public void customEngineAndRenderFunction() { + void customEngineAndRenderFunction() { ScriptEngine engine = mock(InvocableScriptEngine.class); given(engine.get("key")).willReturn("value"); this.view.setEngine(engine); @@ -147,7 +147,7 @@ public class ScriptTemplateViewTests { } @Test - public void nonSharedEngine() throws Exception { + void nonSharedEngine() throws Exception { int iterations = 20; this.view.setEngineName("jython"); this.view.setRenderFunction("render"); @@ -166,13 +166,13 @@ public class ScriptTemplateViewTests { } @Test - public void nonInvocableScriptEngine() { + void nonInvocableScriptEngine() { this.view.setEngine(mock(ScriptEngine.class)); this.view.setApplicationContext(this.wac); } @Test - public void nonInvocableScriptEngineWithRenderFunction() { + void nonInvocableScriptEngineWithRenderFunction() { this.view.setEngine(mock(ScriptEngine.class)); this.view.setRenderFunction("render"); assertThatIllegalArgumentException().isThrownBy(() -> @@ -180,7 +180,7 @@ public class ScriptTemplateViewTests { } @Test - public void engineAndEngineNameBothDefined() { + void engineAndEngineNameBothDefined() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setEngineName("test"); this.view.setRenderFunction("render"); @@ -190,7 +190,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineAndEngineSupplierBothDefined() { + void engineAndEngineSupplierBothDefined() { ScriptEngine engine = mock(InvocableScriptEngine.class); this.view.setEngineSupplier(() -> engine); this.view.setEngine(engine); @@ -201,7 +201,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineNameAndEngineSupplierBothDefined() { + void engineNameAndEngineSupplierBothDefined() { this.view.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.view.setEngineName("test"); this.view.setRenderFunction("render"); @@ -211,7 +211,7 @@ public class ScriptTemplateViewTests { } @Test - public void engineSetterAndNonSharedEngine() { + void engineSetterAndNonSharedEngine() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setRenderFunction("render"); this.view.setSharedEngine(false); @@ -221,7 +221,7 @@ public class ScriptTemplateViewTests { } @Test // SPR-14210 - public void resourceLoaderPath() throws Exception { + void resourceLoaderPath() throws Exception { MockServletContext servletContext = new MockServletContext(); this.wac.setServletContext(servletContext); this.wac.refresh(); @@ -259,7 +259,7 @@ public class ScriptTemplateViewTests { } @Test // SPR-13379 - public void contentType() throws Exception { + void contentType() throws Exception { MockServletContext servletContext = new MockServletContext(); this.wac.setServletContext(servletContext); this.wac.refresh(); @@ -292,7 +292,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineSupplierWithSharedEngine() { + void engineSupplierWithSharedEngine() { this.configurer.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); @@ -310,7 +310,7 @@ public class ScriptTemplateViewTests { } @Test // gh-23258 - public void engineSupplierWithNonSharedEngine() { + void engineSupplierWithNonSharedEngine() { this.configurer.setEngineSupplier(() -> mock(InvocableScriptEngine.class)); this.configurer.setRenderObject("Template"); this.configurer.setRenderFunction("render"); 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 5d98d526374..34ecb889d25 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 @@ -192,7 +192,7 @@ class MarshallingViewTests { } @Test - void testRenderUnsupportedModel() { + void renderUnsupportedModel() { Object toBeMarshalled = new Object(); String modelKey = "key"; Map model = new HashMap<>(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java index f7f54bde897..66e9533a210 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java @@ -81,34 +81,34 @@ class XsltViewTests { } @Test - void testSimpleTransformWithDocument() throws Exception { + void simpleTransformWithDocument() throws Exception { org.w3c.dom.Document document = getDomDocument(); doTestWithModel(singletonMap("someKey", document)); } @Test - void testSimpleTransformWithNode() throws Exception { + void simpleTransformWithNode() throws Exception { org.w3c.dom.Document document = getDomDocument(); doTestWithModel(singletonMap("someKey", document.getDocumentElement())); } @Test - void testSimpleTransformWithInputStream() throws Exception { + void simpleTransformWithInputStream() throws Exception { doTestWithModel(singletonMap("someKey", getProductDataResource().getInputStream())); } @Test - void testSimpleTransformWithReader() throws Exception { + void simpleTransformWithReader() throws Exception { doTestWithModel(singletonMap("someKey", new InputStreamReader(getProductDataResource().getInputStream()))); } @Test - void testSimpleTransformWithResource() throws Exception { + void simpleTransformWithResource() throws Exception { doTestWithModel(singletonMap("someKey", getProductDataResource())); } @Test - void testWithSourceKey() throws Exception { + void withSourceKey() throws Exception { XsltView view = getXsltView(HTML_OUTPUT); view.setSourceKey("actualData"); @@ -121,7 +121,7 @@ class XsltViewTests { } @Test - void testContentTypeCarriedFromTemplate() throws Exception { + void contentTypeCarriedFromTemplate() throws Exception { XsltView view = getXsltView(HTML_OUTPUT); Source source = new StreamSource(getProductDataResource().getInputStream()); @@ -131,7 +131,7 @@ class XsltViewTests { } @Test - void testModelParametersCarriedAcross() throws Exception { + void modelParametersCarriedAcross() throws Exception { Map model = new HashMap<>(); model.put("someKey", getProductDataResource()); model.put("title", "Product List"); @@ -140,7 +140,7 @@ class XsltViewTests { } @Test - void testStaticAttributesCarriedAcross() throws Exception { + void staticAttributesCarriedAcross() throws Exception { XsltView view = getXsltView(HTML_OUTPUT); view.setSourceKey("actualData"); view.addStaticAttribute("title", "Product List"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index 62472ef5492..177a21c787a 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -384,7 +384,7 @@ class MessageBrokerBeanDefinitionParserTests { } @Test // SPR-11623 - public void customChannelsWithDefaultExecutor() { + void customChannelsWithDefaultExecutor() { loadBeanDefinitions("websocket-config-broker-customchannels-default-executor.xml"); testExecutor("clientInboundChannel", Runtime.getRuntime().availableProcessors() * 2, Integer.MAX_VALUE, 60); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java index 85678fce779..f2466726bf7 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java @@ -129,7 +129,7 @@ class ConcurrentWebSocketSessionDecoratorTests { } @Test // SPR-17140 - public void overflowStrategyDrop() throws IOException, InterruptedException { + void overflowStrategyDrop() throws IOException, InterruptedException { BlockingWebSocketSession session = new BlockingWebSocketSession(); session.setId("123"); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java index c020c0cb4f1..5b205492d3b 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java @@ -157,7 +157,7 @@ public class SubProtocolWebSocketHandlerTests { @Test @SuppressWarnings("unchecked") - public void checkSession() throws Exception { + void checkSession() throws Exception { TestWebSocketSession session1 = new TestWebSocketSession("id1"); TestWebSocketSession session2 = new TestWebSocketSession("id2"); session1.setOpen(true); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/TransportTypeTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/TransportTypeTests.java index 96f3d98e995..98bf4cf6832 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/TransportTypeTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/TransportTypeTests.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; class TransportTypeTests { @Test - void testFromValue() { + void fromValue() { assertThat(TransportType.fromValue("websocket")).isEqualTo(TransportType.WEBSOCKET); assertThat(TransportType.fromValue("xhr")).isEqualTo(TransportType.XHR); assertThat(TransportType.fromValue("xhr_send")).isEqualTo(TransportType.XHR_SEND);